smiksky
diff --git a/‎Marlin/Configuration.h
Lines changed: 12 additions & 14 deletions b/‎Marlin/Configuration.h
Lines changed: 12 additions & 14 deletions
diff --git a/‎Marlin/Configuration_adv.h
Lines changed: 3 additions & 0 deletions b/‎Marlin/Configuration_adv.h
Lines changed: 3 additions & 0 deletions
diff --git a/‎Marlin/Version.h
Lines changed: 1 addition & 1 deletion b/‎Marlin/Version.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎Marlin/src/HAL/HC32/endstop_interrupts.cpp
Lines changed: 19 additions & 1 deletion b/‎Marlin/src/HAL/HC32/endstop_interrupts.cpp
Lines changed: 19 additions & 1 deletion
diff --git a/‎Marlin/src/HAL/STM32/inc/SanityCheck.h
Lines changed: 3 additions & 2 deletions b/‎Marlin/src/HAL/STM32/inc/SanityCheck.h
Lines changed: 3 additions & 2 deletions
diff --git a/‎Marlin/src/core/drivers.h
Lines changed: 9 additions & 6 deletions b/‎Marlin/src/core/drivers.h
Lines changed: 9 additions & 6 deletions
diff --git a/‎Marlin/src/feature/fwretract.cpp
Lines changed: 6 additions & 0 deletions b/‎Marlin/src/feature/fwretract.cpp
Lines changed: 6 additions & 0 deletions
diff --git a/‎Marlin/src/gcode/bedlevel/G26.cpp
Lines changed: 12 additions & 12 deletions b/‎Marlin/src/gcode/bedlevel/G26.cpp
Lines changed: 12 additions & 12 deletions
diff --git a/‎Marlin/src/gcode/bedlevel/G35.cpp
Lines changed: 1 addition & 1 deletion b/‎Marlin/src/gcode/bedlevel/G35.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎Marlin/src/gcode/bedlevel/M420.cpp
Lines changed: 5 additions & 4 deletions b/‎Marlin/src/gcode/bedlevel/M420.cpp
Lines changed: 5 additions & 4 deletions
@@ -1006,9 +1006,6 @@
     // 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 https://www.morgan3dp.com/morgan-calibration-guide/
-    #define PSI_HOMING_OFFSET    0  // Calculated from Calibration Guide and M364 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
-
   #elif ENABLED(MP_SCARA)
 
     #define SCARA_OFFSET_THETA1  12 // degrees
@@ -1027,23 +1024,19 @@
   #define DEFAULT_SEGMENTS_PER_SECOND 200
 
   // Length of inner and outer support arms. Measure arm lengths precisely.
-  #define TPARA_LINKAGE_1 120       // (mm)
-  #define TPARA_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 TPARA_OFFSET_X    0       // (mm)
-  #define TPARA_OFFSET_Y    0       // (mm)
-  #define TPARA_OFFSET_Z    0       // (mm)
+  // TPARA tower offset (position of Tower relative to bed zero position)
+  // This needs to be reasonably accurate as it defines the printbed position in the TPARA space.
+  #define TPARA_OFFSET_X    0     // (mm)
+  #define TPARA_OFFSET_Y    0     // (mm)
+  #define TPARA_OFFSET_Z    0     // (mm)
 
   #define 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 https://www.morgan3dp.com/morgan-calibration-guide/
-  #define THETA_HOMING_OFFSET  0
-  #define PSI_HOMING_OFFSET    0
 #endif
 
 // @section polar
@@ -1241,6 +1234,11 @@
  */
 #define EDITABLE_STEPS_PER_UNIT
 
+/**
+ * Enable support for M92. Disable to save at least ~530 bytes of flash.
+ */
+#define EDITABLE_STEPS_PER_UNIT
+
 /**
  * Default Max Feed Rate (linear=mm/s, rotational=°/s)
  * Override with M203
 
@@ -4531,3 +4531,6 @@
 
 // Report uncleaned reset reason from register r2 instead of MCUSR. Supported by Optiboot on AVR.
 //#define OPTIBOOT_RESET_REASON
+
+// Shrink the build for smaller boards by sacrificing some serial feedback
+//#define MARLIN_SMALL_BUILD
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2024-02-04"
+//#define STRING_DISTRIBUTION_DATE "2024-02-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
 
@@ -40,9 +40,15 @@ void endstopIRQHandler() {
   CHECK(X_MAX);
   CHECK(X_MIN);
 
+  CHECK(X2_MAX);
+  CHECK(X2_MIN);
+
   CHECK(Y_MAX);
   CHECK(Y_MIN);
 
+  CHECK(Y2_MAX);
+  CHECK(Y2_MIN);
+
   CHECK(Z_MAX);
   CHECK(Z_MIN);
 
@@ -52,6 +58,9 @@ void endstopIRQHandler() {
   CHECK(Z3_MAX);
   CHECK(Z3_MIN);
 
+  CHECK(Z4_MAX);
+  CHECK(Z4_MIN);
+
   CHECK(Z_MIN_PROBE);
 
   // Update endstops
@@ -69,9 +78,15 @@ void setup_endstop_interrupts() {
   SETUP(X_MAX);
   SETUP(X_MIN);
 
+  SETUP(X2_MAX);
+  SETUP(X2_MIN);
+
   SETUP(Y_MAX);
   SETUP(Y_MIN);
 
+  SETUP(Y2_MAX);
+  SETUP(Y2_MIN);
+
   SETUP(Z_MAX);
   SETUP(Z_MIN);
 
@@ -81,14 +96,17 @@ void setup_endstop_interrupts() {
   SETUP(Z3_MAX);
   SETUP(Z3_MIN);
 
+  SETUP(Z4_MAX);
+  SETUP(Z4_MIN);
+
   SETUP(Z_MIN_PROBE);
 
   #undef SETUP
 }
 
 // Ensure 1 - 10 IRQs are registered
 // Disable some endstops if you encounter this error
-#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_Y_MAX, USE_Y_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z_MIN_PROBE)
+#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_X2_MAX, USE_X2_MIN, USE_Y_MAX, USE_Y_MIN, USE_Y2_MAX, USE_Y2_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z4_MAX, USE_Z4_MIN, USE_Z_MIN_PROBE)
 #if ENDSTOPS_INTERRUPTS_COUNT > 10
   #error "Too many endstop interrupts! HC32F460 only supports 10 endstop interrupts."
 #elif ENDSTOPS_INTERRUPTS_COUNT == 0
 
@@ -58,8 +58,9 @@
  * Check for common serial pin conflicts
  */
 #define _CHECK_SERIAL_PIN(N) (( \
-    BTN_EN1 == N || DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
-    SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N \
+    BTN_EN1 == N || BTN_EN2 == N ||DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
+    SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N || \
+    Y_STEP_PIN == N || Y_ENABLE_PIN == N || E0_ENABLE_PIN == N || POWER_LOSS_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)
 
@@ -120,6 +120,10 @@
   #define HAS_TMC220x 1
 #endif
 
+#if HAS_DRIVER(TMC26X)
+  #define HAS_TMC26X 1
+#endif
+
 #define AXIS_IS_TMC(A)   (    AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
                            || AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) \
                            || AXIS_DRIVER_TYPE(A,TMC2660) \
@@ -184,10 +188,9 @@
 #if ANY_AXIS_HAS(SPI)
   #define HAS_TMC_SPI 1
 #endif
-
-//
-// TMC26XX Stepper Drivers
-//
-#if HAS_DRIVER(TMC26X)
-  #define HAS_TMC26X 1
+#if HAS_STALLGUARD || HAS_DRIVER(TMC2160_STANDALONE) || HAS_DRIVER(TMC2130_STANDALONE) \
+                   || HAS_DRIVER(TMC2209_STANDALONE) || HAS_DRIVER(TMC26X)             \
+                   || HAS_DRIVER(TMC26X_STANDALONE)  || HAS_DRIVER(TMC2660_STANDALONE) \
+                   || HAS_DRIVER(TMC5130_STANDALONE) || HAS_DRIVER(TMC5160_STANDALONE)
+  #define HAS_DIAG_PINS 1
 #endif
@@ -212,6 +212,8 @@ void FWRetract::M207() {
 }
 
 void FWRetract::M207_report() {
+  TERN_(MARLIN_SMALL_BUILD, return);
+
   SERIAL_ECHOLNPGM_P(
       PSTR("  M207 S"), LINEAR_UNIT(settings.retract_length)
     , PSTR(" W"), LINEAR_UNIT(settings.swap_retract_length)
@@ -237,6 +239,8 @@ void FWRetract::M208() {
 }
 
 void FWRetract::M208_report() {
+  TERN_(MARLIN_SMALL_BUILD, return);
+
   SERIAL_ECHOLNPGM(
       "  M208 S", LINEAR_UNIT(settings.retract_recover_extra)
     , " W", LINEAR_UNIT(settings.swap_retract_recover_extra)
@@ -258,6 +262,8 @@ void FWRetract::M208_report() {
   }
 
   void FWRetract::M209_report() {
+    TERN_(MARLIN_SMALL_BUILD, return);
+
     SERIAL_ECHOLNPGM("  M209 S", AS_DIGIT(autoretract_enabled));
   }
 
 
@@ -532,7 +532,7 @@ void GcodeSuite::G26() {
 
     if (bedtemp) {
       if (!WITHIN(bedtemp, 40, BED_MAX_TARGET)) {
-        SERIAL_ECHOLNPGM("?Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C).");
+        SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C)."));
         return;
       }
       g26.bed_temp = bedtemp;
@@ -543,7 +543,7 @@ void GcodeSuite::G26() {
   if (parser.seenval('L')) {
     g26.layer_height = parser.value_linear_units();
     if (!WITHIN(g26.layer_height, 0.0, 2.0)) {
-      SERIAL_ECHOLNPGM("?Specified layer height not plausible.");
+      SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified layer height not plausible."));
       return;
     }
   }
@@ -552,20 +552,20 @@ void GcodeSuite::G26() {
     if (parser.has_value()) {
       g26.retraction_multiplier = parser.value_float();
       if (!WITHIN(g26.retraction_multiplier, 0.05, 15.0)) {
-        SERIAL_ECHOLNPGM("?Specified Retraction Multiplier not plausible.");
+        SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified Retraction Multiplier not plausible."));
         return;
       }
     }
     else {
-      SERIAL_ECHOLNPGM("?Retraction Multiplier must be specified.");
+      SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Retraction Multiplier must be specified."));
       return;
     }
   }
 
   if (parser.seenval('S')) {
     g26.nozzle = parser.value_float();
     if (!WITHIN(g26.nozzle, 0.1, 2.0)) {
-      SERIAL_ECHOLNPGM("?Specified nozzle size not plausible.");
+      SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified nozzle size not plausible."));
       return;
     }
   }
@@ -575,15 +575,15 @@ void GcodeSuite::G26() {
       #if HAS_MARLINUI_MENU
         g26.prime_flag = -1;
       #else
-        SERIAL_ECHOLNPGM("?Prime length must be specified when not using an LCD.");
+        SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Prime length must be specified when not using an LCD."));
         return;
       #endif
     }
     else {
       g26.prime_flag++;
       g26.prime_length = parser.value_linear_units();
       if (!WITHIN(g26.prime_length, 0.0, 25.0)) {
-        SERIAL_ECHOLNPGM("?Specified prime length not plausible.");
+        SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified prime length not plausible."));
         return;
       }
     }
@@ -592,7 +592,7 @@ void GcodeSuite::G26() {
   if (parser.seenval('F')) {
     g26.filament_diameter = parser.value_linear_units();
     if (!WITHIN(g26.filament_diameter, 1.0, 4.0)) {
-      SERIAL_ECHOLNPGM("?Specified filament size not plausible.");
+      SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified filament size not plausible."));
       return;
     }
   }
@@ -616,7 +616,7 @@ void GcodeSuite::G26() {
   // If any preset or temperature was specified
   if (noztemp) {
     if (!WITHIN(noztemp, 165, thermalManager.hotend_max_target(active_extruder))) {
-      SERIAL_ECHOLNPGM("?Specified nozzle temperature not plausible.");
+      SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified nozzle temperature not plausible."));
       return;
     }
     g26.hotend_temp = noztemp;
@@ -637,20 +637,20 @@ void GcodeSuite::G26() {
     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.");
+      SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(R)epeat must be specified when not using an LCD."));
       return;
     }
   #endif
   if (g26_repeats < 1) {
-    SERIAL_ECHOLNPGM("?(R)epeat value not plausible; must be at least 1.");
+    SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(R)epeat value not plausible; must be at least 1."));
     return;
   }
 
   // Set a position with 'X' and/or 'Y'. Default: current_position
   g26.xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
                  parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
   if (!position_is_reachable(g26.xy_pos)) {
-    SERIAL_ECHOLNPGM("?Specified X,Y coordinate out of bounds.");
+    SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified X,Y coordinate out of bounds."));
     return;
   }
 
 
@@ -64,7 +64,7 @@ void GcodeSuite::G35() {
 
   const uint8_t screw_thread = parser.byteval('S', TRAMMING_SCREW_THREAD);
   if (!WITHIN(screw_thread, 30, 51) || screw_thread % 10 > 1) {
-    SERIAL_ECHOLNPGM("?(S)crew thread must be 30, 31, 40, 41, 50, or 51.");
+    SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(S)crew thread must be 30, 31, 40, 41, 50, or 51."));
     return;
   }
 
 
@@ -105,13 +105,12 @@ void GcodeSuite::M420() {
         const int16_t a = settings.calc_num_meshes();
 
         if (!a) {
-          SERIAL_ECHOLNPGM("?EEPROM storage not available.");
+          SERIAL_ECHOLNPGM(GCODE_ERR_MSG("EEPROM storage not available."));
           return;
         }
 
         if (!WITHIN(storage_slot, 0, a - 1)) {
-          SERIAL_ECHOLNPGM("?Invalid storage slot.");
-          SERIAL_ECHOLNPGM("?Use 0 to ", a - 1);
+          SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Invalid storage slot. Use 0 to ", a - 1));
           return;
         }
 
@@ -120,7 +119,7 @@ void GcodeSuite::M420() {
 
       #else
 
-        SERIAL_ECHOLNPGM("?EEPROM storage not available.");
+        SERIAL_ECHOLNPGM(GCODE_ERR_MSG("EEPROM storage not available."));
         return;
 
       #endif
@@ -245,6 +244,8 @@ void GcodeSuite::M420() {
 }
 
 void GcodeSuite::M420_report(const bool forReplay/*=true*/) {
+  TERN_(MARLIN_SMALL_BUILD, return);
+
   report_heading_etc(forReplay, F(
     TERN(MESH_BED_LEVELING, "Mesh Bed Leveling", TERN(AUTO_BED_LEVELING_UBL, "Unified Bed Leveling", "Auto Bed Leveling"))
   ));
Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,8 @@ void FWRetract::M207() {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`void FWRetract::M207_report() {`
	`215`	`+ TERN_(MARLIN_SMALL_BUILD, return);`
	`216`	`+`
`215`	`217`	`SERIAL_ECHOLNPGM_P(`
`216`	`218`	`PSTR(" M207 S"), LINEAR_UNIT(settings.retract_length)`
`217`	`219`	`, PSTR(" W"), LINEAR_UNIT(settings.swap_retract_length)`
`@@ -237,6 +239,8 @@ void FWRetract::M208() {`
`237`	`239`	`}`
`238`	`240`
`239`	`241`	`void FWRetract::M208_report() {`
	`242`	`+ TERN_(MARLIN_SMALL_BUILD, return);`
	`243`	`+`
`240`	`244`	`SERIAL_ECHOLNPGM(`
`241`	`245`	`" M208 S", LINEAR_UNIT(settings.retract_recover_extra)`
`242`	`246`	`, " W", LINEAR_UNIT(settings.swap_retract_recover_extra)`
`@@ -258,6 +262,8 @@ void FWRetract::M208_report() {`
`258`	`262`	`}`
`259`	`263`
`260`	`264`	`void FWRetract::M209_report() {`
	`265`	`+ TERN_(MARLIN_SMALL_BUILD, return);`
	`266`	`+`
`261`	`267`	`SERIAL_ECHOLNPGM(" M209 S", AS_DIGIT(autoretract_enabled));`
`262`	`268`	`}`
`263`	`269`
Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ void GcodeSuite::G26() {`
`532`	`532`
`533`	`533`	`if (bedtemp) {`
`534`	`534`	`if (!WITHIN(bedtemp, 40, BED_MAX_TARGET)) {`
`535`		`- SERIAL_ECHOLNPGM("?Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C).");`
	`535`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C)."));`
`536`	`536`	`return;`
`537`	`537`	`}`
`538`	`538`	`g26.bed_temp = bedtemp;`
`@@ -543,7 +543,7 @@ void GcodeSuite::G26() {`
`543`	`543`	`if (parser.seenval('L')) {`
`544`	`544`	`g26.layer_height = parser.value_linear_units();`
`545`	`545`	`if (!WITHIN(g26.layer_height, 0.0, 2.0)) {`
`546`		`- SERIAL_ECHOLNPGM("?Specified layer height not plausible.");`
	`546`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified layer height not plausible."));`
`547`	`547`	`return;`
`548`	`548`	`}`
`549`	`549`	`}`
`@@ -552,20 +552,20 @@ void GcodeSuite::G26() {`
`552`	`552`	`if (parser.has_value()) {`
`553`	`553`	`g26.retraction_multiplier = parser.value_float();`
`554`	`554`	`if (!WITHIN(g26.retraction_multiplier, 0.05, 15.0)) {`
`555`		`- SERIAL_ECHOLNPGM("?Specified Retraction Multiplier not plausible.");`
	`555`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified Retraction Multiplier not plausible."));`
`556`	`556`	`return;`
`557`	`557`	`}`
`558`	`558`	`}`
`559`	`559`	`else {`
`560`		`- SERIAL_ECHOLNPGM("?Retraction Multiplier must be specified.");`
	`560`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Retraction Multiplier must be specified."));`
`561`	`561`	`return;`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`if (parser.seenval('S')) {`
`566`	`566`	`g26.nozzle = parser.value_float();`
`567`	`567`	`if (!WITHIN(g26.nozzle, 0.1, 2.0)) {`
`568`		`- SERIAL_ECHOLNPGM("?Specified nozzle size not plausible.");`
	`568`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified nozzle size not plausible."));`
`569`	`569`	`return;`
`570`	`570`	`}`
`571`	`571`	`}`
`@@ -575,15 +575,15 @@ void GcodeSuite::G26() {`
`575`	`575`	`#if HAS_MARLINUI_MENU`
`576`	`576`	`g26.prime_flag = -1;`
`577`	`577`	`#else`
`578`		`- SERIAL_ECHOLNPGM("?Prime length must be specified when not using an LCD.");`
	`578`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Prime length must be specified when not using an LCD."));`
`579`	`579`	`return;`
`580`	`580`	`#endif`
`581`	`581`	`}`
`582`	`582`	`else {`
`583`	`583`	`g26.prime_flag++;`
`584`	`584`	`g26.prime_length = parser.value_linear_units();`
`585`	`585`	`if (!WITHIN(g26.prime_length, 0.0, 25.0)) {`
`586`		`- SERIAL_ECHOLNPGM("?Specified prime length not plausible.");`
	`586`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified prime length not plausible."));`
`587`	`587`	`return;`
`588`	`588`	`}`
`589`	`589`	`}`
`@@ -592,7 +592,7 @@ void GcodeSuite::G26() {`
`592`	`592`	`if (parser.seenval('F')) {`
`593`	`593`	`g26.filament_diameter = parser.value_linear_units();`
`594`	`594`	`if (!WITHIN(g26.filament_diameter, 1.0, 4.0)) {`
`595`		`- SERIAL_ECHOLNPGM("?Specified filament size not plausible.");`
	`595`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified filament size not plausible."));`
`596`	`596`	`return;`
`597`	`597`	`}`
`598`	`598`	`}`
`@@ -616,7 +616,7 @@ void GcodeSuite::G26() {`
`616`	`616`	`// If any preset or temperature was specified`
`617`	`617`	`if (noztemp) {`
`618`	`618`	`if (!WITHIN(noztemp, 165, thermalManager.hotend_max_target(active_extruder))) {`
`619`		`- SERIAL_ECHOLNPGM("?Specified nozzle temperature not plausible.");`
	`619`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified nozzle temperature not plausible."));`
`620`	`620`	`return;`
`621`	`621`	`}`
`622`	`622`	`g26.hotend_temp = noztemp;`
`@@ -637,20 +637,20 @@ void GcodeSuite::G26() {`
`637`	`637`	`if (parser.seen('R'))`
`638`	`638`	`g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;`
`639`	`639`	`else {`
`640`		`- SERIAL_ECHOLNPGM("?(R)epeat must be specified when not using an LCD.");`
	`640`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(R)epeat must be specified when not using an LCD."));`
`641`	`641`	`return;`
`642`	`642`	`}`
`643`	`643`	`#endif`
`644`	`644`	`if (g26_repeats < 1) {`
`645`		`- SERIAL_ECHOLNPGM("?(R)epeat value not plausible; must be at least 1.");`
	`645`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(R)epeat value not plausible; must be at least 1."));`
`646`	`646`	`return;`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`// Set a position with 'X' and/or 'Y'. Default: current_position`
`650`	`650`	`g26.xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,`
`651`	`651`	`parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);`
`652`	`652`	`if (!position_is_reachable(g26.xy_pos)) {`
`653`		`- SERIAL_ECHOLNPGM("?Specified X,Y coordinate out of bounds.");`
	`653`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified X,Y coordinate out of bounds."));`
`654`	`654`	`return;`
`655`	`655`	`}`
`656`	`656`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ void GcodeSuite::G35() {`
`64`	`64`
`65`	`65`	`const uint8_t screw_thread = parser.byteval('S', TRAMMING_SCREW_THREAD);`
`66`	`66`	`if (!WITHIN(screw_thread, 30, 51) \|\| screw_thread % 10 > 1) {`
`67`		`- SERIAL_ECHOLNPGM("?(S)crew thread must be 30, 31, 40, 41, 50, or 51.");`
	`67`	`+ SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(S)crew thread must be 30, 31, 40, 41, 50, or 51."));`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`	`70`