Merge branch 'bugfix-2.1.x' into mike-config

* bugfix-2.1.x: (25 commits)
  [cron] Bump distribution date (2023-08-26)
  ✨ Mellow Fly E3 V2 (STM32F407VG) (MarlinFirmware#26081)
  🚸 Fixes for ProUI, JyersUI, backlight, etc. (MarlinFirmware#26086)
  🧑‍💻 Encapsulate ProUI G-code preview
  [cron] Bump distribution date (2023-08-25)
  🧑‍💻 Adjust LCD string draw (MarlinFirmware#26154)
  [cron] Bump distribution date (2023-08-24)
  📝 Thermistor info updates (MarlinFirmware#26202)
  [cron] Bump distribution date (2023-08-23)
  ✨ G-code 'T' report current tool (MarlinFirmware#26151)
  🔧 Allow arbitrary BLOCK_BUFFER_SIZE
  🔧 Fix Linear Leveling grid size sanity check (MarlinFirmware#26199)
  🚸 Avoid LCD messages starting with "Error:" (MarlinFirmware#26164)
  🩹 Fix FT Motion menu Back item (MarlinFirmware#26175)
  [cron] Bump distribution date (2023-08-22)
  ✅ Fix unused test
  🐛 Fixes for G2/G3 arcs (MarlinFirmware#26170)
  [cron] Bump distribution date (2023-08-21)
  🎨 FTDI cleanup
  [cron] Bump distribution date (2023-08-20)
  ...

Author: mikezs

Marlin/Configuration.h

@@ -470,6 +470,7 @@
  *    13 : 100kΩ Hisens up to 300°C - for "Simple ONE" & "All In ONE" hotend - beta 3950, 1%
  *    14 : 100kΩ  (R25), 4092K (beta25), 4.7kΩ pull-up, bed thermistor as used in Ender-5 S1
  *    15 : 100kΩ Calibrated for JGAurora A5 hotend
+ *    17 : 100kΩ Dagoma NTC white thermistor
  *    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
@@ -481,6 +482,7 @@
  *    68 : PT100 Smplifier board from Dyze Design
  *    70 : 100kΩ bq Hephestos 2
  *    75 : 100kΩ Generic Silicon Heat Pad with NTC100K MGB18-104F39050L32
+ *   666 : 200kΩ Einstart S custom thermistor with 10k pullup.
  *  2000 : 100kΩ Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor
  *
  * ================================================================

Marlin/Configuration_adv.h

@@ -1746,9 +1746,10 @@
 
   // SD Card Sorting options
   #if ENABLED(SDCARD_SORT_ALPHA)
+    #define SDSORT_REVERSE     false  // Default to sorting file names in reverse order.
     #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
-    #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
-    #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 G-code.
+    #define SDSORT_FOLDERS     -1     // -1=above  0=none  1=below
+    #define SDSORT_GCODE       false  // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
@@ -2528,7 +2529,6 @@
 // @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)
 #if ALL(HAS_MEDIA, DIRECT_STEPPING)
   #define BLOCK_BUFFER_SIZE  8
 #elif HAS_MEDIA

Marlin/Marlin.ino

@@ -2,7 +2,7 @@
 
   Marlin Firmware
 
-  (c) 2011-2020 MarlinFirmware
+  (c) 2011-2023 MarlinFirmware
   Portions of Marlin are (c) by their respective authors.
   All code complies with GPLv2 and/or GPLv3
 

Marlin/Version.h

@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2023-08-14"
+//#define STRING_DISTRIBUTION_DATE "2023-08-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/core/boards.h

@@ -459,6 +459,7 @@
 #define BOARD_CREALITY_F401RE         5245  // Creality CR4NS200141C13 (STM32F401RE) as found in the Ender-5 S1
 #define BOARD_BLACKPILL_CUSTOM        5246  // Custom board based on STM32F401CDU6.
 #define BOARD_I3DBEEZ9_V1             5247  // I3DBEEZ9 V1 (STM32F407ZG)
+#define BOARD_MELLOW_FLY_E3_V2        5248  // Mellow Fly E3 V2 (STM32F407VG)
 
 //
 // ARM Cortex-M7

Marlin/src/core/language.h

@@ -154,7 +154,7 @@
 #define STR_ERR_ARC_ARGS                    "G2/G3 bad parameters"
 #define STR_ERR_PROTECTED_PIN               "Protected Pin"
 #define STR_ERR_M420_FAILED                 "Failed to enable Bed Leveling"
-#define STR_ERR_M428_TOO_FAR                "Too far from reference point"
+#define STR_ERR_M428_TOO_FAR                "Too far from MIN/MAX"
 #define STR_ERR_M303_DISABLED               "PIDTEMP disabled"
 #define STR_M119_REPORT                     "Reporting endstop status"
 #define STR_ON                              "ON"
@@ -254,7 +254,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_THERMAL_MALFUNCTION           "Thermal Malfunction"
 #define STR_T_MAXTEMP                       "MAXTEMP triggered"
 #define STR_T_MINTEMP                       "MINTEMP triggered"
 #define STR_ERR_PROBING_FAILED              "Probing Failed"

Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

@@ -772,6 +772,7 @@ void unified_bed_leveling::shift_mesh_height() {
       const grid_count_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(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
+      TERN_(LCD_BACKLIGHT_TIMEOUT_MINS, ui.refresh_backlight_timeout());
 
       #if HAS_MARLINUI_MENU
         if (ui.button_pressed()) {

Marlin/src/feature/caselight.h

@@ -30,7 +30,7 @@
 class CaseLight {
 public:
   static bool on;
-  #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+  #if CASELIGHT_USES_BRIGHTNESS
     static uint8_t brightness;
   #endif
 

Marlin/src/feature/max7219.cpp

@@ -706,7 +706,7 @@ void Max7219::idle_tasks() {
 
   #ifdef MAX7219_DEBUG_PLANNER_QUEUE
     static int16_t last_depth = 0;
-    const int16_t current_depth = (head - tail + BLOCK_BUFFER_SIZE) & (BLOCK_BUFFER_SIZE - 1) & 0xF;
+    const int16_t current_depth = BLOCK_MOD(head - tail + (BLOCK_BUFFER_SIZE)) & 0xF;
     if (current_depth != last_depth) {
       quantity16(MAX7219_DEBUG_PLANNER_QUEUE, last_depth, current_depth, &row_change_mask);
       last_depth = current_depth;

Marlin/src/gcode/control/T.cpp

@@ -41,13 +41,21 @@
  *   S1           Don't move the tool in XY after change
  *
  * For PRUSA_MMU2(S) and EXTENDABLE_EMU_MMU2(S)
- *   T[n] Gcode to extrude at least 38.10 mm at feedrate 19.02 mm/s must follow immediately to load to extruder wheels.
- *   T?   Gcode to extrude shouldn't have to follow. Load to extruder wheels is done automatically.
+ *   T[n] G-code to extrude at least 38.10 mm at feedrate 19.02 mm/s must follow immediately to load to extruder wheels.
+ *   T?   G-code to extrude shouldn't have to follow. Load to extruder wheels is done automatically.
  *   Tx   Same as T?, but nozzle doesn't have to be preheated. Tc requires a preheated nozzle to finish filament load.
  *   Tc   Load to nozzle after filament was prepared by Tc and nozzle is already heated.
  */
 void GcodeSuite::T(const int8_t tool_index) {
 
+  #if HAS_MULTI_EXTRUDER
+    // For 'T' with no parameter report the current tool.
+    if (parser.string_arg && *parser.string_arg == '*') {
+      SERIAL_ECHOLNPGM(STR_ACTIVE_EXTRUDER, active_extruder);
+      return;
+    }
+  #endif
+
   DEBUG_SECTION(log_T, "T", DEBUGGING(LEVELING));
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("...(", tool_index, ")");