Fix for mesh inset / settings.cpp

Marlin/Configuration.h

@@ -2089,7 +2089,7 @@
 
 /**
  * Commands to execute at the end of G29 probing.
- * Useful to retract or move the Z probe out of the way.
+ * Useful to retract or move the Z-Probe out of the way.
  */
 //#define EVENT_GCODE_AFTER_G29 "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10"
 
@@ -2312,9 +2312,9 @@
 //#define MANUAL_W_HOME_POS 0
 
 /**
- * Use "Z Safe Homing" to avoid homing with a Z probe outside the 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.
+ * - 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.
  */

Marlin/Configuration_adv.h

@@ -1509,7 +1509,7 @@
 
 /**
  * Probe Offset Wizard
- * Add a Probe Z Offset calibration option to the LCD menu.
+ * Add a Probe Z-Offset calibration option to the LCD menu.
  * Use this helper to get a perfect 'M851 Z' probe offset.
  * When launched this powerful wizard:
  * - Measures the bed height at the configured position with the probe.
@@ -2376,7 +2376,7 @@
 
 /**
  * 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.
+ * 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

Marlin/src/core/language.h

@@ -141,7 +141,7 @@
 #define STR_ACTIVE_EXTRUDER "Active Extruder: "
 #define STR_ERR_FANSPEED "Fan speed E"
 
-#define STR_PROBE_OFFSET  "Probe Offset"
+#define STR_Z_PROBE_OFFSET "Z-Probe Offset"
 #define STR_SKEW_MIN "min_skew_factor: "
 #define STR_SKEW_MAX "max_skew_factor: "
 #define STR_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-1)"
@@ -161,8 +161,8 @@
 #define STR_FILAMENT_PRESENT "PRESENT"
 #define STR_RUNOUT_DETECTED "Runout Detected"
 #define STR_DUPLICATION_MODE "Duplication mode: "
-#define STR_SOFT_MIN " Min: "
-#define STR_SOFT_MAX " Max: "
+#define STR_SOFT_MIN "  Min: "
+#define STR_SOFT_MAX "  Max: "
 
 #define STR_SAVED_POSITION "Saved position #"
 #define STR_RESTORING_POSITION "Restoring position #"
@@ -294,14 +294,20 @@
 #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_HOTEND_OFFSETS "Hotend Offsets"
+#define STR_MBL "Mesh Bed Leveling"
+#define STR_UBL "Unified Bed Leveling"
+#define STR_ABL "Auto Bed Leveling"
+#define STR_X_TWIST_CORRECTION "X-Twist Correction"
 #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_NONLINEAR_EXTRUSION "Nonlinear Extrusion"
+#define STR_INPUT_SHAPING "Input Shaping"
+#define STR_HOTEND_TIMEOUT "Hotend Idle Timeout"
 #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>)"
@@ -315,17 +321,19 @@
 #define STR_TMC_STEALTH "StealthChop"
 #define STR_HYBRID_THRESHOLD "Hybrid Threshold"
 #define STR_STALLGUARD_THRESHOLD "StallGuard Threshold"
-#define STR_HOME_OFFSET "Home offset"
+#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_DISPLAY_SLEEP "Display Sleep"
 #define STR_UI_LANGUAGE "UI Language"
-#define STR_Z_PROBE_OFFSET "Z-Probe Offset"
+#define STR_PROBE_OFFSET  "Probe Offset"
 #define STR_TEMPERATURE_UNITS "Temperature Units"
 #define STR_USER_THERMISTORS "User thermistors"
 #define STR_DELAYED_POWEROFF "Delayed poweroff"
+#define STR_MPC "Model Predictive Control"
+#define STR_MM3_STATS "MMU3 Operational Stats"
 
 //
 // Endstop Names used by Endstops::report_states

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

@@ -321,7 +321,7 @@ void unified_bed_leveling::G29() {
  #endif
  probe.use_probing_tool();
 
- // Position bed horizontally and Z probe vertically.
+ // Position bed horizontally and Z-Probe vertically.
  #if HAS_SAFE_BED_LEVELING
  xyze_pos_t safe_position = current_position;
  #ifdef SAFE_BED_LEVELING_START_X

Marlin/src/feature/powerloss.cpp

@@ -89,7 +89,7 @@ PrintJobRecovery recovery;
  #define POWER_LOSS_PURGE_LEN 0
 #endif
 
-// Allow power-loss recovery to be aborted
+// Allow Power-Loss Recovery to be aborted
 #define PLR_CAN_ABORT
 #define PROCESS_SUBCOMMANDS_NOW(cmd) do{ \
  if (TERN0(PLR_CAN_ABORT, card.flag.abort_sd_printing)) return; \
@@ -179,7 +179,7 @@ void PrintJobRecovery::prepare() {
 }
 
 /**
- * Save the current machine state to the power-loss recovery file
+ * Save the current machine state to the Power-Loss Recovery file
  */
 void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POWER_LOSS_ZRAISE*/, const bool raised/*=false*/) {
 

Marlin/src/gcode/bedlevel/M420.cpp

@@ -250,7 +250,7 @@ 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"))
+ TERN(MESH_BED_LEVELING, STR_MBL, TERN(AUTO_BED_LEVELING_UBL, STR_UBL, STR_ABL))
  ));
  SERIAL_ECHO(
  F(" M420 S"), planner.leveling_active

Marlin/src/gcode/bedlevel/abl/G29.cpp

@@ -152,7 +152,7 @@ class G29_State {
 #endif
 
 /**
- * G29: Detailed Z probe, probes the bed at 3 or more points.
+ * G29: Detailed Z-Probe, probes the bed at 3 or more points.
  * Will fail if the printer has not been homed with G28.
  *
  * Enhanced G29 Auto Bed Leveling Probe Routine
@@ -202,7 +202,7 @@ class G29_State {
  *
  * Parameters with BILINEAR leveling only:
  *
- * Z Supply an additional Z probe offset
+ * Z Supply an additional Z-Probe Offset
  *
  * Extra parameters with PROBE_MANUALLY:
  *
@@ -224,9 +224,9 @@ class G29_State {
  *
  * Without PROBE_MANUALLY:
  *
- * E By default G29 will engage the Z probe, test the bed, then disengage.
- * Include "E" to engage/disengage the Z probe for each sample.
- * There's no extra effect if you have a fixed Z probe.
+ * E By default G29 will engage the Z-Probe, test the bed, then disengage.
+ * Include "E" to engage/disengage the Z-Probe for each sample.
+ * There's no extra effect if you have a fixed Z-Probe.
  */
 G29_TYPE GcodeSuite::G29() {
 
@@ -461,7 +461,7 @@ G29_TYPE GcodeSuite::G29() {
  #endif
  }
 
- // Position bed horizontally and Z probe vertically.
+ // Position bed horizontally and Z-Probe vertically.
  #if HAS_SAFE_BED_LEVELING
  xyze_pos_t safe_position = current_position;
  #ifdef SAFE_BED_LEVELING_START_X

Marlin/src/gcode/bedlevel/mbl/G29.cpp

@@ -49,7 +49,7 @@
 inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM(" not entered."); }
 
 /**
- * G29: Mesh-based Z probe, probes a grid and produces a
+ * G29: Mesh-based Z-Probe, probes a grid and produces a
  * mesh to compensate for variable bed height
  *
  * Parameters With MESH_BED_LEVELING:
@@ -105,7 +105,7 @@ void GcodeSuite::G29() {
  if (parser.seen_test('N'))
  queue.inject(F("G28" TERN_(CAN_SET_LEVELING_AFTER_G28, "L0")));
 
- // Position bed horizontally and Z probe vertically.
+ // Position bed horizontally and Z-Probe vertically.
  #if HAS_SAFE_BED_LEVELING
  xyze_pos_t safe_position = current_position;
  #ifdef SAFE_BED_LEVELING_START_X

Marlin/src/gcode/calibrate/G28.cpp

@@ -135,7 +135,7 @@
  sync_plan_position();
 
  /**
- * Move the Z probe (or just the nozzle) to the safe homing point
+ * Move the Z-Probe (or just the nozzle) to the safe homing point
  * (Z is already at the right height)
  */
  IF_DISABLED(PROUI_EX, constexpr) xy_float_t safe_homing_xy = { Z_SAFE_HOMING_X_POINT, Z_SAFE_HOMING_Y_POINT };

Marlin/src/gcode/calibrate/M48.cpp

@@ -39,15 +39,15 @@
 #endif
 
 /**
- * M48: Z probe repeatability measurement function.
+ * M48: Z-Probe repeatability measurement function.
  *
  * Usage:
  * 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
  * V = Verbose level (0-4, default=1)
- * E = Engage Z probe for each reading
+ * 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)

Marlin/src/gcode/feature/input_shaping/M593.cpp

@@ -30,7 +30,7 @@
 void GcodeSuite::M593_report(const bool forReplay/*=true*/) {
  TERN_(MARLIN_SMALL_BUILD, return);
 
- report_heading_etc(forReplay, F("Input Shaping"));
+ report_heading_etc(forReplay, F(STR_INPUT_SHAPING));
  #if ENABLED(INPUT_SHAPING_X)
  SERIAL_ECHOLNPGM(" M593 X"
  " F", stepper.get_shaping_frequency(X_AXIS),

Marlin/src/gcode/feature/powerloss/M413.cpp

@@ -30,7 +30,7 @@
 #include "../../../lcd/marlinui.h"
 
 /**
- * M413: Enable / Disable power-loss recovery
+ * M413: Enable / Disable Power-Loss Recovery
  *
  * Parameters
  * S[bool] - Flag to enable / disable.

Marlin/src/gcode/feature/prusa_MMU2/M704-M709.cpp

@@ -184,7 +184,7 @@ void GcodeSuite::M709() {
  */
 void GcodeSuite::MMU3_report(const bool forReplay/*=true*/) {
  using namespace MMU3;
- report_heading(forReplay, F("MMU3 Operational Stats"));
+ report_heading(forReplay, F(STR_MM3_STATS));
  SERIAL_ECHOPGM(" MMU "); serialprintln_onoff(mmu3.mmu_hw_enabled);
  SERIAL_ECHOPGM(" Stealth Mode "); serialprintln_onoff(mmu3.stealth_mode);
  #if ENABLED(MMU_HAS_CUTTER)

Marlin/src/gcode/gcode.cpp

@@ -202,7 +202,7 @@ void GcodeSuite::get_destination_from_command() {
  #endif
 
  #if ENABLED(POWER_LOSS_RECOVERY) && !PIN_EXISTS(POWER_LOSS)
- // Only update power-loss recovery on moves with E
+ // Only update Power-Loss Recovery on moves with E
  if (recovery.enabled && IS_SD_PRINTING() && seen.e && (seen.x || seen.y))
  recovery.save();
  #endif
@@ -421,7 +421,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
  #endif
 
  #if HAS_BED_PROBE
- case 30: G30(); break; // G30: Single Z probe
+ case 30: G30(); break; // G30: Single Z-Probe
  #if ENABLED(Z_PROBE_SLED)
  case 31: G31(); break; // G31: dock the sled
  case 32: G32(); break; // G32: undock the sled
@@ -570,7 +570,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
  #endif
 
  #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
- case 48: M48(); break; // M48: Z probe repeatability test
+ case 48: M48(); break; // M48: Z-Probe repeatability test
  #endif
 
  #if ENABLED(SET_PROGRESS_MANUALLY)
@@ -1030,7 +1030,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
  #endif
 
  #if HAS_BED_PROBE
- case 851: M851(); break; // M851: Set Z Probe Z Offset
+ case 851: M851(); break; // M851: Set Z-Probe Offset
  #endif
 
  #if ENABLED(SKEW_CORRECTION_GCODE)

Marlin/src/gcode/gcode.h

@@ -56,7 +56,7 @@
  * G27 - Park Nozzle (Requires NOZZLE_PARK_FEATURE)
  * G28 - Home one or more axes
  * G29 - Start or continue the bed leveling probe procedure (Requires bed leveling)
- * G30 - Single Z probe, probes bed at X Y location (defaults to current XY location)
+ * G30 - Single Z-Probe, probes bed at X Y location (defaults to current XY location)
  * G31 - Dock sled (Z_PROBE_SLED only)
  * G32 - Undock sled (Z_PROBE_SLED only)
  * G33 - Delta Auto-Calibration (Requires DELTA_AUTO_CALIBRATION)
@@ -112,7 +112,7 @@
  *
  * 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)
+ * 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 SET_PROGRESS_MANUALLY)
  * M75 - Start the print job timer.
@@ -226,8 +226,8 @@
  * 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)
+ * M401 - Deploy and activate Z-Probe. (Requires a probe)
+ * M402 - Deactivate and stow Z-Probe. (Requires a probe)
  * M403 - Set filament type for PRUSA MMU2
  * M404 - Display or set the Nominal Filament Width: "W<diameter>". (Requires FILAMENT_WIDTH_SENSOR)
  * M405 - Enable Filament Sensor flow control. "M405 D<delay_cm>". (Requires FILAMENT_WIDTH_SENSOR)
@@ -282,7 +282,7 @@
  *
  * 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)
+ * 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, plus SKEW_CORRECTION_FOR_Z for IJ)
  *
  *** I2C_POSITION_ENCODERS ***

Marlin/src/gcode/motion/M290.cpp

@@ -42,12 +42,12 @@
  FORCE_INLINE void mod_probe_offset(const_float_t offs) {
  if (TERN1(BABYSTEP_HOTEND_Z_OFFSET, active_extruder == 0)) {
  probe.offset.z += offs;
- SERIAL_ECHO_MSG(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
+ SERIAL_ECHO_MSG(STR_Z_PROBE_OFFSET, probe.offset.z);
  }
  else {
  #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
  hotend_offset[active_extruder].z -= offs;
- SERIAL_ECHO_MSG(STR_PROBE_OFFSET STR_Z ": ", hotend_offset[active_extruder].z);
+ SERIAL_ECHO_MSG(STR_Z_PROBE_OFFSET ": ", hotend_offset[active_extruder].z);
  #endif
  }
  }
@@ -65,7 +65,7 @@
  * S<linear> - Distance to step Z (alias for Z)
  *
  * With BABYSTEP_ZPROBE_OFFSET:
- * P0 - Don't adjust the Z probe offset
+ * P0 - Don't adjust the Z-Probe Offset
  */
 void GcodeSuite::M290() {
  #if ENABLED(BABYSTEP_XY)
@@ -91,7 +91,7 @@ void GcodeSuite::M290() {
  SERIAL_ECHO_START();
 
  #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
- SERIAL_ECHOLNPGM(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
+ SERIAL_ECHOLNPGM(STR_Z_PROBE_OFFSET, probe.offset.z);
  #endif
 
  #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)

Marlin/src/gcode/probe/G30.cpp

@@ -39,7 +39,7 @@
 #endif
 
 /**
- * G30: Do a single Z probe at the given XY (default: current)
+ * G30: Do a single Z-Probe at the given XY (default: current)
  *
  * Parameters:
  *

Marlin/src/gcode/probe/G31_G32.cpp

@@ -28,12 +28,12 @@
 #include "../../module/probe.h"
 
 /**
- * G31: Deploy the Z probe
+ * G31: Deploy the Z-Probe
  */
 void GcodeSuite::G31() { probe.deploy(); }
 
 /**
- * G32: Stow the Z probe
+ * G32: Stow the Z-Probe
  */
 void GcodeSuite::G32() { probe.stow(); }
 

Marlin/src/gcode/probe/M401_M402.cpp

@@ -33,7 +33,7 @@
 #endif
 
 /**
- * M401: Deploy and activate the Z probe
+ * M401: Deploy and activate the Z-Probe
  *
  * With BLTOUCH_HS_MODE:
  * H Report the current BLTouch HS mode state and exit
@@ -60,7 +60,7 @@ void GcodeSuite::M401() {
 }
 
 /**
- * M402: Deactivate and stow the Z probe
+ * M402: Deactivate and stow the Z-Probe
  * R<bool> Remain in place after stowing (and before deactivating) the probe
  */
 void GcodeSuite::M402() {