From 2738cc75e30904042136591747808e0b9adfe5f5 Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:25:02 -0400 Subject: [PATCH] Update - Fix for mesh inset / settings.cpp (#151) #143 --- Marlin/Configuration.h | 6 +- Marlin/Configuration_adv.h | 4 +- Marlin/src/core/language.h | 20 +- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 2 +- Marlin/src/feature/powerloss.cpp | 4 +- Marlin/src/gcode/bedlevel/M420.cpp | 2 +- Marlin/src/gcode/bedlevel/abl/G29.cpp | 12 +- Marlin/src/gcode/bedlevel/mbl/G29.cpp | 4 +- Marlin/src/gcode/calibrate/G28.cpp | 2 +- Marlin/src/gcode/calibrate/M48.cpp | 4 +- .../src/gcode/feature/input_shaping/M593.cpp | 2 +- Marlin/src/gcode/feature/powerloss/M413.cpp | 2 +- .../gcode/feature/prusa_MMU2/M704-M709.cpp | 2 +- Marlin/src/gcode/gcode.cpp | 8 +- Marlin/src/gcode/gcode.h | 10 +- Marlin/src/gcode/motion/M290.cpp | 8 +- Marlin/src/gcode/probe/G30.cpp | 2 +- Marlin/src/gcode/probe/G31_G32.cpp | 4 +- Marlin/src/gcode/probe/M401_M402.cpp | 4 +- Marlin/src/gcode/probe/M423.cpp | 2 +- Marlin/src/gcode/temp/M306.cpp | 2 +- Marlin/src/gcode/temp/M86_M87.cpp | 2 +- Marlin/src/lcd/e3v2/proui/dwin.cpp | 48 +- Marlin/src/lcd/e3v2/proui/dwin.h | 12 + Marlin/src/lcd/e3v2/proui/dwin_defines.h | 20 - Marlin/src/lcd/e3v2/proui/menus.cpp | 12 +- Marlin/src/lcd/e3v2/proui/proui.h | 6 - .../lcd/extui/dgus/DGUSScreenHandlerBase.h | 2 +- Marlin/src/lcd/extui/ui_api.cpp | 2 +- Marlin/src/lcd/extui/ui_api.h | 2 +- Marlin/src/lcd/language/language_en.h | 20 +- Marlin/src/lcd/language/language_it.h | 4 +- Marlin/src/lcd/language/language_jp_kana.h | 2 +- Marlin/src/lcd/language/language_nl.h | 4 +- Marlin/src/lcd/language/language_zh_CN.h | 2 +- Marlin/src/lcd/language/language_zh_TW.h | 2 +- Marlin/src/lcd/menu/menu_probe_level.cpp | 4 +- .../src/lcd/tft/ui_move_axis_screen_1024.cpp | 2 +- .../src/lcd/tft/ui_move_axis_screen_320.cpp | 2 +- .../src/lcd/tft/ui_move_axis_screen_480.cpp | 2 +- Marlin/src/module/motion.cpp | 4 +- Marlin/src/module/probe.cpp | 22 +- Marlin/src/module/settings.cpp | 548 ++++++++++-------- Marlin/src/module/settings.h | 2 +- configurations/Andrew427/Configuration-MP.h | 6 +- configurations/Andrew427/Configuration.h | 6 +- configurations/Andrew427/Configuration_adv.h | 4 +- .../BTT_SKR-Mini-E3-V2/MM/Configuration.h | 6 +- .../BTT_SKR-Mini-E3-V2/MM/Configuration_adv.h | 4 +- .../BTT_SKR-Mini-E3-V2/UBL/Configuration.h | 6 +- .../UBL/Configuration_adv.h | 4 +- .../BTT_SKR-Mini-E3-V3/MM/Configuration.h | 6 +- .../BTT_SKR-Mini-E3-V3/MM/Configuration_adv.h | 4 +- .../BTT_SKR-Mini-E3-V3/UBL/Configuration.h | 6 +- .../UBL/Configuration_adv.h | 4 +- .../Creality Ender/BLT/Configuration.h | 6 +- .../Creality Ender/BLT/Configuration_adv.h | 4 +- .../Creality Ender/Default/Configuration.h | 6 +- .../Default/Configuration_adv.h | 4 +- .../E3-Free-runs/MM/Configuration.h | 6 +- .../E3-Free-runs/MM/Configuration_adv.h | 4 +- .../E3-Free-runs/UBL/Configuration.h | 6 +- .../E3-Free-runs/UBL/Configuration_adv.h | 4 +- .../Creality Ender/MM/Configuration.h | 6 +- .../Creality Ender/MM/Configuration_adv.h | 4 +- .../Creality Ender/S1/UBL/Configuration.h | 6 +- .../Creality Ender/S1/UBL/Configuration_adv.h | 4 +- .../Creality Ender/UBL/Configuration.h | 6 +- .../Creality Ender/UBL/Configuration_adv.h | 4 +- .../Voxelab Aquila 427/BLT/Configuration.h | 6 +- .../BLT/Configuration_adv.h | 4 +- .../Default/Configuration.h | 6 +- .../Default/Configuration_adv.h | 4 +- .../Voxelab Aquila 427/MM/Configuration.h | 6 +- .../Voxelab Aquila 427/MM/Configuration_adv.h | 4 +- .../Voxelab Aquila 427/UBL/Configuration.h | 6 +- .../UBL/Configuration_adv.h | 4 +- .../Voxelab Aquila/BLT/Configuration.h | 6 +- .../Voxelab Aquila/BLT/Configuration_adv.h | 4 +- .../Voxelab Aquila/Default/Configuration.h | 6 +- .../Default/Configuration_adv.h | 4 +- .../Voxelab Aquila/MM/Configuration.h | 6 +- .../Voxelab Aquila/MM/Configuration_adv.h | 4 +- .../Voxelab Aquila/UBL/Configuration.h | 6 +- .../Voxelab Aquila/UBL/Configuration_adv.h | 4 +- .../Voxelab Aquila/X3/Configuration.h | 6 +- .../Voxelab Aquila/X3/Configuration_adv.h | 4 +- 87 files changed, 530 insertions(+), 518 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 85b342caeb..bdd9f69eb6 100644 --- a/Marlin/Configuration.h +++ b/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. */ diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 3f75cb7a62..2faab10d2b 100644 --- a/Marlin/Configuration_adv.h +++ b/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 diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h index 3be87923d6..0262c28bc8 100644 --- a/Marlin/src/core/language.h +++ b/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 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,7 +294,11 @@ #define STR_MAX_FEEDRATES "Max feedrates (units/s)" #define STR_ACCELERATION_P_R_T "Acceleration (units/s2) (P R T)" #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" @@ -302,6 +306,8 @@ #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 F Z)" @@ -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 diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 8a81217511..833f39f4ee 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/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 diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp index 682151eb71..ec37ddf852 100644 --- a/Marlin/src/feature/powerloss.cpp +++ b/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*/) { diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp index 8711bab9c8..9010803d69 100644 --- a/Marlin/src/gcode/bedlevel/M420.cpp +++ b/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 diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index b2b0cbf333..74d8717c04 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/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 diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp index 955266ff74..e5311c6d4f 100644 --- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp +++ b/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 diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp index ff875b80c4..1e3c61d2bb 100644 --- a/Marlin/src/gcode/calibrate/G28.cpp +++ b/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 }; diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp index f00f32e2de..7a37a99e45 100644 --- a/Marlin/src/gcode/calibrate/M48.cpp +++ b/Marlin/src/gcode/calibrate/M48.cpp @@ -39,7 +39,7 @@ #endif /** - * M48: Z probe repeatability measurement function. + * M48: Z-Probe repeatability measurement function. * * Usage: * M48 @@ -47,7 +47,7 @@ * 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) diff --git a/Marlin/src/gcode/feature/input_shaping/M593.cpp b/Marlin/src/gcode/feature/input_shaping/M593.cpp index 6ce942e4ee..62c245a07c 100644 --- a/Marlin/src/gcode/feature/input_shaping/M593.cpp +++ b/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), diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp index b12257b4e5..2c69b3f36c 100644 --- a/Marlin/src/gcode/feature/powerloss/M413.cpp +++ b/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. diff --git a/Marlin/src/gcode/feature/prusa_MMU2/M704-M709.cpp b/Marlin/src/gcode/feature/prusa_MMU2/M704-M709.cpp index 8229959cc0..ce7a63e3d2 100644 --- a/Marlin/src/gcode/feature/prusa_MMU2/M704-M709.cpp +++ b/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) diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 501f009c06..25ef0ae394 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/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) diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index 2dbe0de3cf..90ddb868e3 100644 --- a/Marlin/src/gcode/gcode.h +++ b/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 S. 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 X Y V E L S. (Requires Z_MIN_PROBE_REPEATABILITY_TEST) + * M48 - Measure Z-Probe repeatability: M48 P X Y V E L S. (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". (Requires FILAMENT_WIDTH_SENSOR) * M405 - Enable Filament Sensor flow control. "M405 D". (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] [J] [K]". (Requires SKEW_CORRECTION_GCODE, plus SKEW_CORRECTION_FOR_Z for IJ) * *** I2C_POSITION_ENCODERS *** diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp index d10f9ee73c..de09f9524a 100644 --- a/Marlin/src/gcode/motion/M290.cpp +++ b/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 - 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) diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp index 21fd58b7c9..506695e99b 100644 --- a/Marlin/src/gcode/probe/G30.cpp +++ b/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: * diff --git a/Marlin/src/gcode/probe/G31_G32.cpp b/Marlin/src/gcode/probe/G31_G32.cpp index af44257d61..ac1178f364 100644 --- a/Marlin/src/gcode/probe/G31_G32.cpp +++ b/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(); } diff --git a/Marlin/src/gcode/probe/M401_M402.cpp b/Marlin/src/gcode/probe/M401_M402.cpp index 05230e05ea..4a55926d99 100644 --- a/Marlin/src/gcode/probe/M401_M402.cpp +++ b/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 Remain in place after stowing (and before deactivating) the probe */ void GcodeSuite::M402() { diff --git a/Marlin/src/gcode/probe/M423.cpp b/Marlin/src/gcode/probe/M423.cpp index 7ab887eb64..8d21f4f44b 100644 --- a/Marlin/src/gcode/probe/M423.cpp +++ b/Marlin/src/gcode/probe/M423.cpp @@ -88,7 +88,7 @@ void GcodeSuite::M423() { void GcodeSuite::M423_report(const bool forReplay/*=true*/) { TERN_(MARLIN_SMALL_BUILD, return); - report_heading(forReplay, F("X-Twist Correction")); + report_heading(forReplay, F(STR_X_TWIST_CORRECTION)); SERIAL_ECHOLNPGM(" M423 A", xatc.start, " I", xatc.spacing); for (uint8_t x = 0; x < XATC_MAX_POINTS; ++x) { const float z = xatc.z_offset[x]; diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp index 12e175420d..b5b94fd4e4 100644 --- a/Marlin/src/gcode/temp/M306.cpp +++ b/Marlin/src/gcode/temp/M306.cpp @@ -90,7 +90,7 @@ void GcodeSuite::M306() { void GcodeSuite::M306_report(const bool forReplay/*=true*/) { TERN_(MARLIN_SMALL_BUILD, return); - report_heading(forReplay, F("Model predictive control")); + report_heading(forReplay, F(STR_MPC)); HOTEND_LOOP() { report_echo_start(forReplay); MPC_t &mpc = thermalManager.temp_hotend[e].mpc; diff --git a/Marlin/src/gcode/temp/M86_M87.cpp b/Marlin/src/gcode/temp/M86_M87.cpp index 502052e87b..087ab58b4f 100644 --- a/Marlin/src/gcode/temp/M86_M87.cpp +++ b/Marlin/src/gcode/temp/M86_M87.cpp @@ -37,7 +37,7 @@ void GcodeSuite::M86_report(const bool forReplay/*=true*/) { TERN_(MARLIN_SMALL_BUILD, return); hotend_idle_settings_t &c = hotend_idle.cfg; - report_heading(forReplay, F("Hotend Idle Timeout")); + report_heading(forReplay, F(STR_HOTEND_TIMEOUT)); SERIAL_ECHOLNPGM(" M86" #if HAS_HEATED_BED " B", c.bed_target, diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index 89bafa18d1..a0fdcdb547 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -2073,16 +2073,6 @@ void DWIN_Print_Aborted() { } #endif - #if ALL(PROUI_MESH_EDIT, HAS_MESH) - void SetMeshArea() { - TERN(PROUI_EX, PRO_data, HMI_data).mesh_min_x = ui.mesh_min_x; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_max_x = ui.mesh_max_x; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_min_y = ui.mesh_min_y; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_max_y = ui.mesh_max_y; - ApplyMeshInset(); - } -#endif - void DWIN_SetDataDefaults() { DEBUG_ECHOLNPGM("DWIN_SetDataDefaults"); DWIN_SetColorDefaults(); @@ -2130,13 +2120,13 @@ void DWIN_SetDataDefaults() { #endif TERN_(HAS_GCODE_PREVIEW, HMI_data.EnablePreview = true;) TERN_(PROUI_ITEM_ABRT, HMI_data.auto_abort = true;) + #if ENABLED(PROUI_MESH_EDIT) + ui.mesh_min_x = DEF_MESH_MIN_X; + ui.mesh_max_x = DEF_MESH_MAX_X; + ui.mesh_min_y = DEF_MESH_MIN_Y; + ui.mesh_max_y = DEF_MESH_MAX_Y; + #endif #if PROUI_EX - #if ENABLED(PROUI_MESH_EDIT) - PRO_data.mesh_min_x = DEF_MESH_MIN_X; - PRO_data.mesh_max_x = DEF_MESH_MAX_X; - PRO_data.mesh_min_y = DEF_MESH_MIN_Y; - PRO_data.mesh_max_y = DEF_MESH_MAX_Y; - #endif PRO_data.x_bed_size = DEF_X_BED_SIZE; PRO_data.y_bed_size = DEF_Y_BED_SIZE; PRO_data.x_min_pos = DEF_X_MIN_POS; @@ -2172,12 +2162,6 @@ void DWIN_SetDataDefaults() { HMI_data.grid_max_points = DEF_GRID_MAX_POINTS; #endif TERN_(HAS_EXTRUDERS, HMI_data.Invert_E0 = DEF_INVERT_E0_DIR;) - #if ENABLED(PROUI_MESH_EDIT) - HMI_data.mesh_min_x = DEF_MESH_MIN_X; - HMI_data.mesh_max_x = DEF_MESH_MAX_X; - HMI_data.mesh_min_y = DEF_MESH_MIN_Y; - HMI_data.mesh_max_y = DEF_MESH_MAX_Y; - #endif #endif } @@ -4324,13 +4308,13 @@ void Draw_MaxAccel_Menu() { // Mesh Inset void ApplyMeshInset() { set_bed_leveling_enabled(false); reset_bed_level(); ReDrawItem(); } - void SetXMeshInset() { SetPFloatOnClick(0, X_BED_SIZE, UNITFDIGITS, SetMeshArea, ApplyMeshInset); } - void SetYMeshInset() { SetPFloatOnClick(0, Y_BED_SIZE, UNITFDIGITS, SetMeshArea, ApplyMeshInset); } + void SetXMeshInset() { SetPFloatOnClick(0, X_BED_SIZE, UNITFDIGITS, ApplyMeshInset); } + void SetYMeshInset() { SetPFloatOnClick(0, Y_BED_SIZE, UNITFDIGITS, ApplyMeshInset); } void MaxMeshArea() { - TERN(PROUI_EX, PRO_data, HMI_data).mesh_min_x = ui.mesh_min_x = 0; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_max_x = ui.mesh_max_x = X_BED_SIZE; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_min_y = ui.mesh_min_y = 0; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_max_y = ui.mesh_max_y = Y_BED_SIZE; + MESH_MIN_X = 0; + MESH_MAX_X = X_BED_SIZE; + MESH_MIN_Y = 0; + MESH_MAX_Y = Y_BED_SIZE; set_bed_leveling_enabled(false); reset_bed_level(); ReDrawMenu(); @@ -4340,10 +4324,10 @@ void Draw_MaxAccel_Menu() { if (max < X_BED_SIZE - MESH_MAX_X) { max = X_BED_SIZE - MESH_MAX_X; } if (max < MESH_MIN_Y) { max = MESH_MIN_Y; } if (max < Y_BED_SIZE - MESH_MAX_Y) { max = Y_BED_SIZE - MESH_MAX_Y; } - TERN(PROUI_EX, PRO_data, HMI_data).mesh_min_x = ui.mesh_min_x = max; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_max_x = ui.mesh_max_x = X_BED_SIZE - max; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_min_y = ui.mesh_min_y = max; - TERN(PROUI_EX, PRO_data, HMI_data).mesh_max_y = ui.mesh_max_y = Y_BED_SIZE - max; + MESH_MIN_X = max; + MESH_MAX_X = X_BED_SIZE - max; + MESH_MIN_Y = max; + MESH_MAX_Y = Y_BED_SIZE - max; set_bed_leveling_enabled(false); reset_bed_level(); ReDrawMenu(); diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h index ce631ca1a0..e38bf4603f 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.h +++ b/Marlin/src/lcd/e3v2/proui/dwin.h @@ -407,3 +407,15 @@ void Draw_MaxAccel_Menu(); #if DEBUG_DWIN void DWIN_Debug(PGM_P msg1=nullptr, PGM_P msg2=nullptr, PGM_P msg3=nullptr, PGM_P msg4=nullptr); #endif + +#if ENABLED(PROUI_MESH_EDIT) + #undef MESH_MIN_X + #undef MESH_MAX_X + #undef MESH_MIN_Y + #undef MESH_MAX_Y + #include "../../marlinui.h" + #define MESH_MIN_X ui.mesh_min_x + #define MESH_MAX_X ui.mesh_max_x + #define MESH_MIN_Y ui.mesh_min_y + #define MESH_MAX_Y ui.mesh_max_y +#endif diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h index 0ba37bd8b1..e20779b618 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h +++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h @@ -166,16 +166,6 @@ #undef INVERT_E0_DIR #define INVERT_E0_DIR PRO_data.Invert_E0 #endif - #if ENABLED(PROUI_MESH_EDIT) - #undef MESH_MIN_X - #undef MESH_MAX_X - #undef MESH_MIN_Y - #undef MESH_MAX_Y - #define MESH_MIN_X (float)PRO_data.mesh_min_x - #define MESH_MAX_X (float)PRO_data.mesh_max_x - #define MESH_MIN_Y (float)PRO_data.mesh_min_y - #define MESH_MAX_Y (float)PRO_data.mesh_max_y - #endif #else @@ -204,15 +194,5 @@ #undef INVERT_E0_DIR #define INVERT_E0_DIR HMI_data.Invert_E0 #endif - #if ENABLED(PROUI_MESH_EDIT) - #undef MESH_MIN_X - #undef MESH_MAX_X - #undef MESH_MIN_Y - #undef MESH_MAX_Y - #define MESH_MIN_X (float)HMI_data.mesh_min_x - #define MESH_MAX_X (float)HMI_data.mesh_max_x - #define MESH_MIN_Y (float)HMI_data.mesh_min_y - #define MESH_MAX_Y (float)HMI_data.mesh_max_y - #endif #endif // PROUI_EX diff --git a/Marlin/src/lcd/e3v2/proui/menus.cpp b/Marlin/src/lcd/e3v2/proui/menus.cpp index 570d3096cd..0339460a13 100644 --- a/Marlin/src/lcd/e3v2/proui/menus.cpp +++ b/Marlin/src/lcd/e3v2/proui/menus.cpp @@ -166,8 +166,8 @@ void DrawItemEdit(const bool selected) { // 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 +// LiveUpdate: live update function when the encoder changes 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; @@ -184,8 +184,8 @@ void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, // 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 +// LiveUpdate: live update function when the encoder changes 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); DrawItemEdit(true); @@ -196,8 +196,8 @@ void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, const // 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 +// LiveUpdate: live update function when the encoder changes 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); @@ -208,8 +208,8 @@ void SetValueOnClick(uint8_t process, const float lo, const float hi, uint8_t dp // 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 +// LiveUpdate: live update function when the encoder changes 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); } @@ -217,8 +217,8 @@ void SetIntOnClick(const int32_t lo, const int32_t hi, const int32_t val, void ( // 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 +// LiveUpdate: live update function when the encoder changes void SetPIntOnClick(const int32_t lo, const int32_t hi, void (*Apply)()/*=nullptr*/, void (*LiveUpdate)()/*=nullptr*/) { MenuData.P_Int = (int16_t*)static_cast(CurrentMenu->SelectedItem())->value; const int32_t value = *MenuData.P_Int; @@ -238,8 +238,8 @@ void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val // 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 +// LiveUpdate: live update function when the encoder changes void SetPFloatOnClick(const float lo, const float hi, uint8_t dp, void (*Apply)()/*=nullptr*/, void (*LiveUpdate)()/*=nullptr*/) { MenuData.P_Float = (float*)static_cast(CurrentMenu->SelectedItem())->value; SetValueOnClick(SetPFloat, lo, hi, dp, *MenuData.P_Float, Apply, LiveUpdate); diff --git a/Marlin/src/lcd/e3v2/proui/proui.h b/Marlin/src/lcd/e3v2/proui/proui.h index b736c9c106..77dc3c7bf4 100644 --- a/Marlin/src/lcd/e3v2/proui/proui.h +++ b/Marlin/src/lcd/e3v2/proui/proui.h @@ -215,12 +215,6 @@ typedef struct { bool auto_abort; #endif #if !PROUI_EX -#if ENABLED(PROUI_MESH_EDIT) - float mesh_min_x = DEF_MESH_MIN_X; - float mesh_max_x = DEF_MESH_MAX_X; - float mesh_min_y = DEF_MESH_MIN_Y; - float mesh_max_y = DEF_MESH_MAX_Y; -#endif TERN_(PROUI_GRID_PNTS, uint8_t grid_max_points = DEF_GRID_MAX_POINTS;) #if HAS_BED_PROBE IF_DISABLED(BD_SENSOR, uint8_t multiple_probing = MULTIPLE_PROBING;) diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandlerBase.h b/Marlin/src/lcd/extui/dgus/DGUSScreenHandlerBase.h index 9c8f9c7b6a..073b68a267 100644 --- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandlerBase.h +++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandlerBase.h @@ -75,7 +75,7 @@ class DGUSScreenHandler { // 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. + // Hook for Power-Loss Recovery. static void handlePowerLossRecovery(DGUS_VP_Variable &var, void *val_ptr); #endif // Hook for settings diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp index a38d45f073..8c3311a786 100644 --- a/Marlin/src/lcd/extui/ui_api.cpp +++ b/Marlin/src/lcd/extui/ui_api.cpp @@ -864,7 +864,7 @@ namespace ExtUI { if (!babystepAxis_steps(steps, axis)) return; #if ENABLED(BABYSTEP_ZPROBE_OFFSET) - // Make it so babystepping in Z adjusts the Z probe offset. + // Make it so babystepping in Z adjusts the Z-Probe Offset. if (axis == Z && TERN1(HAS_MULTI_EXTRUDER, (linked_nozzles || active_extruder == 0))) probe.offset.z += mm; #endif diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h index 361fa1c2bc..e5259ca6d3 100644 --- a/Marlin/src/lcd/extui/ui_api.h +++ b/Marlin/src/lcd/extui/ui_api.h @@ -367,7 +367,7 @@ namespace ExtUI { void normalizeNozzleOffset(const axis_t axis); #endif - // The Probe Z Offset + // The Probe Z-Offset float getZOffset_mm(); void setZOffset_mm(const_float_t); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 0b6c41973d..532a6264b6 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -546,7 +546,7 @@ namespace LanguageNarrow_en { LSTR MSG_RESUME_PRINT = _UxGT("Resume Print"); LSTR MSG_STOP_PRINT = _UxGT("Stop Print"); LSTR MSG_CANCEL_PRINT = _UxGT("Cancel Print"); - LSTR MSG_OUTAGE_RECOVERY = _UxGT("Power-loss Recovery"); + LSTR MSG_OUTAGE_RECOVERY = _UxGT("Power-Loss Recovery"); LSTR MSG_RESUME_BED_TEMP = _UxGT("Resume Bed Temp"); LSTR MSG_HOST_START_PRINT = _UxGT("Start Host Print"); LSTR MSG_PRINTING_OBJECT = _UxGT("Printing Object"); @@ -915,15 +915,15 @@ namespace LanguageNarrow_en { LSTR MSG_TMC_CCURRENT = _UxGT(STR_C " Driver Current"); LSTR MSG_TMC_ECURRENT = _UxGT(STR_E " Driver Current"); LSTR MSG_TMC_ENCURRENT = _UxGT("* Driver Current"); - LSTR MSG_TMC_HYBRID_THRS = _UxGT("Hybrid Threshold"); - LSTR MSG_TMC_AHYBRID_THRS = _UxGT(STR_A " Hybrid Threshold"); - LSTR MSG_TMC_BHYBRID_THRS = _UxGT(STR_B " Hybrid Threshold"); - LSTR MSG_TMC_CHYBRID_THRS = _UxGT(STR_C " Hybrid Threshold"); - LSTR MSG_TMC_EHYBRID_THRS = _UxGT(STR_E " Hybrid Threshold"); - LSTR MSG_TMC_ENHYBRID_THRS = _UxGT("* Hybrid Threshold"); + LSTR MSG_TMC_HYBRID_THRS = _UxGT(STR_HYBRID_THRESHOLD); + LSTR MSG_TMC_AHYBRID_THRS = _UxGT(STR_A " " STR_HYBRID_THRESHOLD); + LSTR MSG_TMC_BHYBRID_THRS = _UxGT(STR_B " " STR_HYBRID_THRESHOLD); + LSTR MSG_TMC_CHYBRID_THRS = _UxGT(STR_C " " STR_HYBRID_THRESHOLD); + LSTR MSG_TMC_EHYBRID_THRS = _UxGT(STR_E " " STR_HYBRID_THRESHOLD); + LSTR MSG_TMC_ENHYBRID_THRS = _UxGT("* " STR_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_TMC_STEALTH_ENABLED = _UxGT(STR_TMC_STEALTH " Enabled"); LSTR MSG_TMC_ASTEALTH = _UxGT(STR_A " " STR_TMC_STEALTH); LSTR MSG_TMC_BSTEALTH = _UxGT(STR_B " " STR_TMC_STEALTH); LSTR MSG_TMC_CSTEALTH = _UxGT(STR_C " " STR_TMC_STEALTH); @@ -955,7 +955,7 @@ namespace LanguageNarrow_en { LSTR MSG_FTM_ZETA_N = _UxGT("@ Damping"); LSTR MSG_FTM_VTOL_N = _UxGT("@ Vib. Level"); - LSTR MSG_LEVEL_X_AXIS = _UxGT("Level X Axis"); + LSTR MSG_LEVEL_X_AXIS = _UxGT("Level X-Axis"); LSTR MSG_AUTO_CALIBRATE = _UxGT("Auto Calibrate"); LSTR MSG_FTDI_HEATER_TIMEOUT = _UxGT("Idle timeout, temperature decreased. Press Okay to reheat and again to resume."); LSTR MSG_HEATER_TIMEOUT = _UxGT("Heater Timeout"); @@ -1163,7 +1163,7 @@ namespace LanguageWide_en { LSTR MSG_RAISE = _UxGT("Raise"); LSTR MSG_POSITION_UNKNOWN = _UxGT("..WARNING: Current position is unknown, Home axes."); - LSTR MSG_POSITION_UNKNOWN_Z = _UxGT("..CAUTION: Unknown Z position, Home Z axis."); + LSTR MSG_POSITION_UNKNOWN_Z = _UxGT("..CAUTION: Unknown Z position, Home Z-Axis."); LSTR MSG_CENTER_NOZZLE = _UxGT("..Center Nozzle - As Nozzle touches bed, save Z-Offset."); LSTR MSG_OUTAGE_RECOVERY2 = _UxGT("It looks like the last"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 1fc9534580..d5441e6292 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -396,7 +396,7 @@ namespace LanguageNarrow_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_INPUT_SHAPING = _UxGT("Input SShaping"); LSTR MSG_SHAPING_ENABLE = _UxGT("Abilita shaping @"); LSTR MSG_SHAPING_DISABLE = _UxGT("Disabil. shaping @"); LSTR MSG_SHAPING_FREQ = _UxGT("Frequenza @"); @@ -555,7 +555,7 @@ namespace LanguageNarrow_it { LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Collega penna USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Cambia ") MEDIA_TYPE_IT; LSTR MSG_RELEASE_MEDIA = _UxGT("Rilascia ") MEDIA_TYPE_IT; - LSTR MSG_ZPROBE_OUT = _UxGT("Z probe fuori piatto"); + 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"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 75cfc0e7ad..bfa234a999 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -170,7 +170,7 @@ namespace LanguageNarrow_jp_kana { 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_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 ヲフッキサセテクダサイ"); // "Home ... first" diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 1b1d5adf28..e9aa89bc21 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -76,7 +76,7 @@ namespace LanguageNarrow_nl { LSTR MSG_EXTRUDE = _UxGT("Extrude"); LSTR MSG_RETRACT = _UxGT("Retract"); LSTR MSG_MOVE_AXIS = _UxGT("As verplaatsen"); - LSTR MSG_PROBE_AND_LEVEL = _UxGT("Z probe & Level"); + LSTR MSG_PROBE_AND_LEVEL = _UxGT("Z-Probe & Level"); LSTR MSG_BED_LEVELING = _UxGT("Bed Leveling"); LSTR MSG_LEVEL_BED = _UxGT("Level bed"); @@ -148,7 +148,7 @@ namespace LanguageNarrow_nl { 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_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 Eerst"); diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 8a3155f7da..e268565469 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -407,7 +407,7 @@ namespace LanguageNarrow_zh_CN { 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_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("自检"); diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 814004f336..15c52ebc5e 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -353,7 +353,7 @@ namespace LanguageNarrow_zh_TW { 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_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_SELFTEST = _UxGT("BLTouch 自檢"); // "BLTouch Self-Test" diff --git a/Marlin/src/lcd/menu/menu_probe_level.cpp b/Marlin/src/lcd/menu/menu_probe_level.cpp index 9376ada37e..a3897f2949 100644 --- a/Marlin/src/lcd/menu/menu_probe_level.cpp +++ b/Marlin/src/lcd/menu/menu_probe_level.cpp @@ -343,7 +343,7 @@ void menu_probe_level() { #endif // - // Probe Z Offset - Babystep or Edit + // Probe Z-Offset - Babystep or Edit // if (can_babystep_z) { #if ENABLED(BABYSTEP_ZPROBE_OFFSET) @@ -357,7 +357,7 @@ void menu_probe_level() { } // - // Probe Z Offset Wizard + // Probe Z-Offset Wizard // #if ENABLED(PROBE_OFFSET_WIZARD) SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard); diff --git a/Marlin/src/lcd/tft/ui_move_axis_screen_1024.cpp b/Marlin/src/lcd/tft/ui_move_axis_screen_1024.cpp index a15c05d25e..bd1caa58ec 100644 --- a/Marlin/src/lcd/tft/ui_move_axis_screen_1024.cpp +++ b/Marlin/src/lcd/tft/ui_move_axis_screen_1024.cpp @@ -139,7 +139,7 @@ void MarlinUI::move_axis_screen() { const bool busy = printingIsActive(); - // Babysteps during printing? Select babystep for Z probe offset + // Babysteps during printing? Select babystep for Z-Probe Offset #if ENABLED(BABYSTEP_ZPROBE_OFFSET) if (busy) motionAxisState.z_selection = Z_SELECTION_Z_PROBE; #endif diff --git a/Marlin/src/lcd/tft/ui_move_axis_screen_320.cpp b/Marlin/src/lcd/tft/ui_move_axis_screen_320.cpp index 5b1fbaf958..5ca32bbbed 100644 --- a/Marlin/src/lcd/tft/ui_move_axis_screen_320.cpp +++ b/Marlin/src/lcd/tft/ui_move_axis_screen_320.cpp @@ -152,7 +152,7 @@ void MarlinUI::move_axis_screen() { const bool busy = printingIsActive(); - // Babysteps during printing? Select babystep for Z probe offset + // Babysteps during printing? Select babystep for Z-Probe Offset #if ENABLED(BABYSTEP_ZPROBE_OFFSET) if (busy) motionAxisState.z_selection = Z_SELECTION_Z_PROBE; #endif diff --git a/Marlin/src/lcd/tft/ui_move_axis_screen_480.cpp b/Marlin/src/lcd/tft/ui_move_axis_screen_480.cpp index 9e42411580..026d434e25 100644 --- a/Marlin/src/lcd/tft/ui_move_axis_screen_480.cpp +++ b/Marlin/src/lcd/tft/ui_move_axis_screen_480.cpp @@ -152,7 +152,7 @@ void MarlinUI::move_axis_screen() { const bool busy = printingIsActive(); - // Babysteps during printing? Select babystep for Z probe offset + // Babysteps during printing? Select babystep for Z-Probe Offset #if ENABLED(BABYSTEP_ZPROBE_OFFSET) if (busy) motionAxisState.z_selection = Z_SELECTION_Z_PROBE; #endif diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index b0d994ed9a..909e9eec07 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -2681,7 +2681,7 @@ void prepare_line_to_destination() { ? TOOL_X_HOME_DIR(active_extruder) : home_dir(axis); // - // Homing Z with a probe? Raise Z (maybe) and deploy the Z probe. + // Homing Z with a probe? Raise Z (maybe) and deploy the Z-Probe. // if (TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS && probe.deploy())) return; @@ -2974,7 +2974,7 @@ void prepare_line_to_destination() { if (axis == Z_AXIS) bdl.config_state = BDS_IDLE; #endif - // Put away the Z probe + // Put away the Z-Probe if (TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS && probe.stow())) return; #if DISABLED(DELTA) && defined(HOMING_BACKOFF_POST_MM) diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 37cca54012..7cd4199342 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -573,7 +573,7 @@ bool Probe::set_deployed(const bool deploy, const bool no_return/*=false*/) { /** * @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. + * Used by run_z_probe to do a single Z-Probe move. * * @param z Z destination * @param fr_mm_s Feedrate in mm/s @@ -708,7 +708,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) { } /** - * @brief Tare the Z probe + * @brief Tare the Z-Probe * * @details Signal to the probe to tare itself * @@ -780,7 +780,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) { }; // Stop the probe before it goes too low to prevent damage. - // For known Z probe below the expected trigger point, otherwise -10mm lower. + // For known Z-Probe below the expected trigger point, otherwise -10mm lower. const float z_probe_low_point = zoffs + z_min_point - float((!axis_is_trusted(Z_AXIS)) * 10); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Probe Low Point: ", z_probe_low_point); @@ -936,7 +936,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) { }; // Stop the probe before it goes too low to prevent damage. - // For known Z probe below the expected trigger point, otherwise -10mm lower. + // For known Z-Probe below the expected trigger point, otherwise -10mm lower. const float z_probe_low_point = zoffs + z_min_point - float((!axis_is_trusted(Z_AXIS)) * 10); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Probe Low Point: ", z_probe_low_point); @@ -1019,13 +1019,13 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) { */ float Probe::probe_at_point( const_float_t rx, const_float_t ry, - const ProbePtRaise raise_after, // = PROBE_PT_NONE - const uint8_t verbose_level, // = 0 - const bool probe_relative, // = true - const bool sanity_check, // = true - const_float_t z_min_point, // = Z_PROBE_LOW_POINT - const_float_t z_clearance, // = Z_TWEEN_SAFE_CLEARANCE - const bool raise_after_is_rel // = false + const ProbePtRaise raise_after, // = PROBE_PT_NONE + const uint8_t verbose_level, // = 0 + const bool probe_relative, // = true + const bool sanity_check, // = true + const_float_t z_min_point, // = Z_PROBE_LOW_POINT + const_float_t z_clearance, // = Z_TWEEN_SAFE_CLEARANCE + const bool raise_after_is_rel // = false ) { DEBUG_SECTION(log_probe, "Probe::probe_at_point", DEBUGGING(LEVELING)); diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index 607d648009..28c39af91f 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 "V90" +#define EEPROM_VERSION "V91" #define EEPROM_OFFSET 100 // Check the integrity of data offsets. @@ -234,13 +234,15 @@ typedef struct SettingsDataStruct { 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 + #if HAS_JUNCTION_DEVIATION + float planner_junction_deviation_mm; // M205 J planner.junction_deviation_mm + #endif // // Home Offset // #if NUM_AXES && DISABLED(NO_HOME_OFFSETS) - xyz_pos_t home_offset; // M206 XYZ / M665 TPZ + xyz_pos_t home_offset; // M206 XYZ / M665 PTZ #endif // @@ -286,14 +288,14 @@ typedef struct SettingsDataStruct { #endif // - // HAS_BED_PROBE + // Probe XYZ Offsets // #if NUM_AXES xyz_pos_t probe_offset; // M851 X Y Z #endif // - // ABL_PLANAR + // Planar Bed Leveling matrix // #if ABL_PLANAR matrix_3x3 planner_bed_level_matrix; // planner.bed_level_matrix @@ -312,7 +314,7 @@ typedef struct SettingsDataStruct { #endif // - // X_AXIS_TWIST_COMPENSATION + // X Axis Twist Compensation // #if ENABLED(X_AXIS_TWIST_COMPENSATION) float xatc_spacing; // M423 X Z @@ -327,14 +329,14 @@ typedef struct SettingsDataStruct { int8_t ubl_storage_slot; // bedlevel.storage_slot // - // SERVO_ANGLES + // Servo Angles // #if HAS_SERVO_ANGLES uint16_t servo_angles[NUM_SERVOS][2]; // M281 P L U #endif // - // Temperature first layer compensation values + // Probe Temperature Compensation // #if HAS_PTC #if ENABLED(PTC_PROBE) @@ -378,7 +380,7 @@ typedef struct SettingsDataStruct { #endif // - // Extra Endstops offsets + // Extra Endstop adjustment // #if HAS_EXTRA_ENDSTOPS float x2_endstop_adj, // M666 X @@ -389,7 +391,7 @@ typedef struct SettingsDataStruct { #endif // - // Z_STEPPER_AUTO_ALIGN, HAS_Z_STEPPER_ALIGN_STEPPER_XY + // Z Auto-Align // #if ENABLED(Z_STEPPER_AUTO_ALIGN) xy_pos_t z_stepper_align_xy[NUM_Z_STEPPERS]; // M422 S X Y @@ -399,7 +401,7 @@ typedef struct SettingsDataStruct { #endif // - // Material Presets + // Material heatup parameters // #if HAS_PREHEAT preheat_t ui_material_preset[PREHEAT_COUNT]; // M145 S0 H B F @@ -435,26 +437,19 @@ typedef struct SettingsDataStruct { #endif // - // Power monitor + // Power Monitor // #if HAS_POWER_MONITOR uint8_t power_monitor_flags; // M430 I V W #endif // - // HAS_LCD_CONTRAST + // LCD Contrast // #if HAS_LCD_CONTRAST uint8_t lcd_contrast; // M250 C #endif - // - // HAS_LCD_BRIGHTNESS - // - #if HAS_LCD_BRIGHTNESS - uint8_t lcd_brightness; // M256 B - #endif - // // Display Sleep // @@ -467,14 +462,21 @@ typedef struct SettingsDataStruct { #endif // - // Controller fan settings + // LCD Brightness + // + #if HAS_LCD_BRIGHTNESS + uint8_t lcd_brightness; // M256 B + #endif + + // + // Controller fan // #if ENABLED(USE_CONTROLLER_FAN) controllerFan_settings_t controllerFan_settings; // M710 #endif // - // POWER_LOSS_RECOVERY + // Power-Loss Recovery // #if ENABLED(POWER_LOSS_RECOVERY) bool recovery_enabled; // M413 S @@ -482,7 +484,7 @@ typedef struct SettingsDataStruct { #endif // - // FWRETRACT + // Firmware Retraction // #if ENABLED(FWRETRACT) fwretract_settings_t fwretract_settings; // M207 S F Z W, M208 S F W R @@ -490,16 +492,18 @@ typedef struct SettingsDataStruct { #endif // - // !NO_VOLUMETRIC + // Volumetric Extrusion & Filament Diameter // + bool parser_volumetric_enabled; // M200 S parser.volumetric_enabled #if DISABLED(NO_VOLUMETRICS) - bool parser_volumetric_enabled; // M200 S parser.volumetric_enabled float planner_filament_size[EXTRUDERS]; // M200 T D planner.filament_size[] - float planner_volumetric_extruder_limit[EXTRUDERS]; // M200 T L planner.volumetric_extruder_limit[] + #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) + float planner_volumetric_extruder_limit[EXTRUDERS]; // M200 T L planner.volumetric_extruder_limit[] + #endif #endif // - // HAS_TRINAMIC_CONFIG + // TMC Stepper Current // #if HAS_TRINAMIC_CONFIG per_stepper_uint16_t tmc_stepper_current; // M906 X Y Z... @@ -509,29 +513,27 @@ typedef struct SettingsDataStruct { #endif // - // LIN_ADVANCE + // Linear Advance // #if ENABLED(LIN_ADVANCE) float planner_extruder_advance_K[DISTINCT_E]; // M900 K planner.extruder_advance_K #endif // - // HAS_MOTOR_CURRENT_PWM + // HAS_MOTOR_CURRENT_(I2C|DAC|SPI|PWM) // - #if HAS_MOTOR_CURRENT - #ifndef MOTOR_CURRENT_COUNT - #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 + #ifndef MOTOR_CURRENT_COUNT + #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 - uint32_t motor_current_setting[MOTOR_CURRENT_COUNT]; // M907 X Z E ... #endif + uint32_t motor_current_setting[MOTOR_CURRENT_COUNT]; // M907 X Z E ... // // Adaptive Step Smoothing state @@ -541,35 +543,35 @@ typedef struct SettingsDataStruct { #endif // - // CNC_COORDINATE_SYSTEMS + // CNC Coordinate Systems // #if NUM_AXES xyz_pos_t coordinate_system[MAX_COORDINATE_SYSTEMS]; // G54-G59.3 #endif // - // SKEW_CORRECTION + // Skew Factor // #if ENABLED(SKEW_CORRECTION) skew_factor_t planner_skew_factor; // M852 I J K #endif // - // ADVANCED_PAUSE_FEATURE + // Filament load/unload // #if ENABLED(CONFIGURE_FILAMENT_CHANGE) fil_change_settings_t fc_settings[EXTRUDERS]; // M603 T U L #endif // - // Tool-change settings + // Tool-changing // #if HAS_MULTI_EXTRUDER toolchange_settings_t toolchange_settings; // M217 S P R #endif // - // BACKLASH_COMPENSATION + // Backlash Compensation // #if NUM_AXES && ENABLED(BACKLASH_GCODE) xyz_float_t backlash_distance_mm; // M425 X Y Z @@ -592,14 +594,14 @@ typedef struct SettingsDataStruct { #endif // - // CASELIGHT_USES_BRIGHTNESS + // Case Light Brightness // #if CASELIGHT_USES_BRIGHTNESS uint8_t caselight_brightness; // M355 P #endif // - // PASSWORD_FEATURE + // Password feature // #if ENABLED(PASSWORD_FEATURE) bool password_is_set; @@ -607,7 +609,7 @@ typedef struct SettingsDataStruct { #endif // - // TOUCH_SCREEN_CALIBRATION + // Touch Screen Calibration // #if ENABLED(TOUCH_SCREEN_CALIBRATION) touch_calibration_t touch_calibration_data; @@ -685,14 +687,14 @@ typedef struct SettingsDataStruct { #endif // - // NUM_LANGUAGES > 1 + // UI Language // #if HAS_MULTI_LANGUAGE uint8_t ui_language; // M414 S #endif // - // Model predictive control + // Model Predictive Control // #if ENABLED(MPCTEMP) MPC_t mpc_constants[HOTENDS]; // M306 @@ -722,7 +724,7 @@ typedef struct SettingsDataStruct { #endif // - // HOTEND_IDLE_TIMEOUT + // Hotend Idle Timeout // #if ENABLED(HOTEND_IDLE_TIMEOUT) hotend_idle_settings_t hotend_idle_config; // M86 S T E B @@ -893,11 +895,9 @@ void MarlinSettings::postprocess() { #if ENABLED(DEBUG_EEPROM_OBSERVE) #define EEPROM_READ(V...) do { SERIAL_ECHOLNPGM("READ: ", F(STRINGIFY(FIRST(V)))); EEPROM_READ_(V); } while (0) #define EEPROM_READ_ALWAYS(V...) do { SERIAL_ECHOLNPGM("READ: ", F(STRINGIFY(FIRST(V)))); EEPROM_READ_ALWAYS_(V); } while (0) - #define EEPROM_WRITE(V...) do { SERIAL_ECHOLNPGM("WRITE: ", F(STRINGIFY(FIRST(V)))); EEPROM_WRITE_(V); } while (0) #else #define EEPROM_READ(V...) EEPROM_READ_(V) #define EEPROM_READ_ALWAYS(V...) EEPROM_READ_ALWAYS_(V) - #define EEPROM_WRITE(V...) EEPROM_WRITE_(V) #endif constexpr char version_str[4] = EEPROM_VERSION; @@ -940,23 +940,33 @@ void MarlinSettings::postprocess() { TERN(FLASH_EEPROM_EMULATION, EEPROM_SKIP, EEPROM_WRITE)(dummy_version); #if ENABLED(EEPROM_INIT_NOW) - EEPROM_SKIP(build_hash); // Skip the hash slot which will be written later + EEPROM_SKIP(build_hash); // Skip the hash slot which will be written later #endif - EEPROM_SKIP(working_crc); // Skip the checksum slot + EEPROM_SKIP(working_crc); // Skip the checksum slot // // Clear after skipping CRC and before writing the CRC'ed data // working_crc = 0; + // // Write the size of the data structure for use in validation - const uint16_t data_size = datasize(); - EEPROM_WRITE(data_size); + // + { + _FIELD_TEST(data_size); + const uint16_t data_size = datasize(); + EEPROM_WRITE(data_size); + } - const uint8_t e_factors = DISTINCT_AXES - (NUM_AXES); - _FIELD_TEST(e_factors); - EEPROM_WRITE(e_factors); + // + // DISTINCT_E_FACTORS + // + { + _FIELD_TEST(e_factors); + const uint8_t e_factors = DISTINCT_AXES - (NUM_AXES); + EEPROM_WRITE(e_factors); + } // // Planner Motion @@ -971,12 +981,11 @@ void MarlinSettings::postprocess() { EEPROM_WRITE(dummyf); #endif #else - const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(5, 10, 10, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4); + const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(10, 10, 10, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4); EEPROM_WRITE(planner_max_jerk); #endif - TERN_(CLASSIC_JERK, dummyf = 0.02f); - EEPROM_WRITE(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm)); + TERN_(HAS_JUNCTION_DEVIATION, EEPROM_WRITE(planner.junction_deviation_mm)); } // @@ -1000,21 +1009,21 @@ void MarlinSettings::postprocess() { // // Hotend Offsets, if any // + #if HAS_HOTEND_OFFSET { - #if HAS_HOTEND_OFFSET // Skip hotend 0 which must be 0 for (uint8_t e = 1; e < HOTENDS; ++e) EEPROM_WRITE(hotend_offset[e]); - #endif } + #endif // // Filament Runout Sensor // #if HAS_FILAMENT_SENSOR { - const bool &runout_sensor_enabled = runout.enabled; _FIELD_TEST(runout_sensor_enabled); + const bool &runout_sensor_enabled = runout.enabled; EEPROM_WRITE(runout_sensor_enabled); #if HAS_FILAMENT_RUNOUT_DISTANCE @@ -1067,6 +1076,7 @@ void MarlinSettings::postprocess() { dummyf = 0; #endif + // Set grid dimensions #if ANY(PROUI_EX, PROUI_GRID_PNTS) const uint8_t mesh_num_x = TERN(MESH_BED_LEVELING, GRID_LIMIT, 3), mesh_num_y = TERN(MESH_BED_LEVELING, GRID_LIMIT, 3); @@ -1178,10 +1188,10 @@ 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, bedlevel.storage_slot, -1); - EEPROM_WRITE(ubl_active); - EEPROM_WRITE(storage_slot); + const bool planner_leveling_active = TERN(AUTO_BED_LEVELING_UBL, planner.leveling_active, false); + const int8_t ubl_storage_slot = TERN(AUTO_BED_LEVELING_UBL, bedlevel.storage_slot, -1); + EEPROM_WRITE(planner_leveling_active); + EEPROM_WRITE(ubl_storage_slot); } // @@ -1195,7 +1205,7 @@ void MarlinSettings::postprocess() { #endif // - // Thermal first layer compensation values + // Probe Temperature Compensation // #if HAS_PTC #if ENABLED(PTC_PROBE) @@ -1252,7 +1262,7 @@ void MarlinSettings::postprocess() { #endif // - // Extra Endstops offsets + // Extra Endstop adjustment // #if HAS_EXTRA_ENDSTOPS { @@ -1278,6 +1288,9 @@ void MarlinSettings::postprocess() { } #endif + // + // Z Auto-Align + // #if ENABLED(Z_STEPPER_AUTO_ALIGN) EEPROM_WRITE(z_stepper_align.xy); #if HAS_Z_STEPPER_ALIGN_STEPPER_XY @@ -1286,7 +1299,7 @@ void MarlinSettings::postprocess() { #endif // - // LCD Preheat settings + // Material heatup parameters // #if HAS_PREHEAT _FIELD_TEST(ui_material_preset); @@ -1304,7 +1317,12 @@ void MarlinSettings::postprocess() { raw_pidcf_t pidcf = { pid.p(), pid.i(), pid.d(), pid.c(), pid.f() }; EEPROM_WRITE(pidcf); } + } + // + // PID_EXTRUSION_SCALING + // + { _FIELD_TEST(lpq_len); const int16_t lpq_len = TERN(PID_EXTRUSION_SCALING, thermalManager.lpq_len, 20); EEPROM_WRITE(lpq_len); @@ -1344,12 +1362,12 @@ void MarlinSettings::postprocess() { #endif // - // Power monitor + // Power Monitor // #if HAS_POWER_MONITOR { - const uint8_t &power_monitor_flags = power_monitor.flags; _FIELD_TEST(power_monitor_flags); + const uint8_t &power_monitor_flags = power_monitor.flags; EEPROM_WRITE(power_monitor_flags); } #endif @@ -1365,6 +1383,17 @@ void MarlinSettings::postprocess() { } #endif + // + // Display Sleep + // + #if ENABLED(EDITABLE_DISPLAY_TIMEOUT) + #if HAS_BACKLIGHT_TIMEOUT + EEPROM_WRITE(ui.backlight_timeout_minutes); + #elif HAS_DISPLAY_SLEEP + EEPROM_WRITE(ui.sleep_timeout_minutes); + #endif + #endif + // // LCD Brightness // @@ -1376,28 +1405,13 @@ void MarlinSettings::postprocess() { } #endif - // - // LCD Backlight / Sleep Timeout - // - #if ENABLED(EDITABLE_DISPLAY_TIMEOUT) - #if HAS_BACKLIGHT_TIMEOUT - EEPROM_WRITE(ui.backlight_timeout_minutes); - #elif HAS_DISPLAY_SLEEP - EEPROM_WRITE(ui.sleep_timeout_minutes); - #endif - #endif - // // Controller Fan // #if ENABLED(USE_CONTROLLER_FAN) { _FIELD_TEST(controllerFan_settings); - #if ENABLED(CONTROLLER_FAN_EDITABLE) - const controllerFan_settings_t &cfs = controllerFan.settings; - #else - constexpr controllerFan_settings_t cfs = controllerFan_defaults; - #endif + const controllerFan_settings_t &cfs = controllerFan.settings; EEPROM_WRITE(cfs); } #endif @@ -1431,24 +1445,24 @@ void MarlinSettings::postprocess() { #endif // - // Volumetric & Filament Size + // Volumetric Extrusion & Filament Diameter // - #if DISABLED(NO_VOLUMETRICS) { _FIELD_TEST(parser_volumetric_enabled); - EEPROM_WRITE(parser.volumetric_enabled); - EEPROM_WRITE(planner.filament_size); - #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) - EEPROM_WRITE(planner.volumetric_extruder_limit); - #else - dummyf = 0.0; - for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummyf); + + #if DISABLED(NO_VOLUMETRICS) + + EEPROM_WRITE(parser.volumetric_enabled); + EEPROM_WRITE(planner.filament_size); + #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) + EEPROM_WRITE(planner.volumetric_extruder_limit); + #endif + #endif } - #endif // - // TMC Configuration + // TMC Stepper Current // #if HAS_TRINAMIC_CONFIG { @@ -1637,9 +1651,8 @@ void MarlinSettings::postprocess() { #endif // - // Motor Current PWM + // HAS_MOTOR_CURRENT_(SPI|PWM) // - #if HAS_MOTOR_CURRENT { _FIELD_TEST(motor_current_setting); @@ -1650,7 +1663,6 @@ void MarlinSettings::postprocess() { EEPROM_WRITE(no_current); #endif } - #endif // // Adaptive Step Smoothing state @@ -1674,7 +1686,7 @@ void MarlinSettings::postprocess() { #endif // - // Skew correction factors + // Skew Factor // #if ENABLED(SKEW_CORRECTION) _FIELD_TEST(planner_skew_factor); @@ -1682,7 +1694,7 @@ void MarlinSettings::postprocess() { #endif // - // Advanced Pause filament load & unload lengths + // Filament load/unload // #if ENABLED(CONFIGURE_FILAMENT_CHANGE) { @@ -1692,9 +1704,8 @@ void MarlinSettings::postprocess() { #endif // - // Multiple Extruders + // Tool-changing // - #if HAS_MULTI_EXTRUDER _FIELD_TEST(toolchange_settings); EEPROM_WRITE(toolchange_settings); @@ -1705,6 +1716,7 @@ void MarlinSettings::postprocess() { // #if NUM_AXES && ENABLED(BACKLASH_GCODE) { + _FIELD_TEST(backlash_distance_mm); xyz_float_t backlash_distance_mm; LOOP_NUM_AXES(axis) backlash_distance_mm[axis] = backlash.get_distance_mm((AxisEnum)axis); const uint8_t backlash_correction = backlash.get_correction_uint8(); @@ -1713,7 +1725,6 @@ void MarlinSettings::postprocess() { #else const float backlash_smoothing_mm = 3; #endif - _FIELD_TEST(backlash_distance_mm); EEPROM_WRITE(backlash_distance_mm); EEPROM_WRITE(backlash_correction); EEPROM_WRITE(backlash_smoothing_mm); @@ -1725,9 +1736,9 @@ void MarlinSettings::postprocess() { // #if ENABLED(EXTENSIBLE_UI) { + _FIELD_TEST(extui_data); char extui_data[ExtUI::eeprom_data_size] = { 0 }; ExtUI::onStoreSettings(extui_data); - _FIELD_TEST(extui_data); EEPROM_WRITE(extui_data); } #endif @@ -1760,7 +1771,7 @@ void MarlinSettings::postprocess() { #endif // - // TOUCH_SCREEN_CALIBRATION + // Touch Screen Calibration // #if ENABLED(TOUCH_SCREEN_CALIBRATION) EEPROM_WRITE(touch_calibration.calibration); @@ -1846,14 +1857,14 @@ void MarlinSettings::postprocess() { #endif // - // Selected LCD language + // UI Language // #if HAS_MULTI_LANGUAGE EEPROM_WRITE(ui.language); #endif // - // Model predictive control + // Model Predictive Control // #if ENABLED(MPCTEMP) HOTEND_LOOP() EEPROM_WRITE(thermalManager.temp_hotend[e].mpc); @@ -1886,7 +1897,7 @@ void MarlinSettings::postprocess() { #endif // - // HOTEND_IDLE_TIMEOUT + // Hotend Idle Timeout // #if ENABLED(HOTEND_IDLE_TIMEOUT) EEPROM_WRITE(hotend_idle.cfg); @@ -2079,11 +2090,11 @@ void MarlinSettings::postprocess() { for (uint8_t q = LOGICAL_AXES; q--;) EEPROM_READ(dummyf); #endif - EEPROM_READ(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm)); + TERN_(HAS_JUNCTION_DEVIATION, EEPROM_READ(planner.junction_deviation_mm)); } // - // Home Offset (M206 / M665) + // Home Offset // #if NUM_AXES && DISABLED(NO_HOME_OFFSETS) { @@ -2103,21 +2114,21 @@ void MarlinSettings::postprocess() { // // Hotend Offsets, if any // + #if HAS_HOTEND_OFFSET { - #if HAS_HOTEND_OFFSET // Skip hotend 0 which must be 0 for (uint8_t e = 1; e < HOTENDS; ++e) EEPROM_READ(hotend_offset[e]); - #endif } + #endif // // Filament Runout Sensor // #if HAS_FILAMENT_SENSOR { - int8_t runout_sensor_enabled; _FIELD_TEST(runout_sensor_enabled); + int8_t runout_sensor_enabled; EEPROM_READ(runout_sensor_enabled); if (!validating) runout.enabled = runout_sensor_enabled < 0 ? FIL_RUNOUT_ENABLED_DEFAULT : runout_sensor_enabled; @@ -2272,7 +2283,7 @@ void MarlinSettings::postprocess() { #endif // - // Unified Bed Leveling active state + // Unified Bed Leveling // { _FIELD_TEST(planner_leveling_active); @@ -2288,7 +2299,7 @@ void MarlinSettings::postprocess() { } // - // SERVO_ANGLES + // Servo Angles // #if HAS_SERVO_ANGLES { @@ -2303,7 +2314,7 @@ void MarlinSettings::postprocess() { #endif // - // Thermal first layer compensation values + // Probe Temperature Compensation // #if HAS_PTC #if ENABLED(PTC_PROBE) @@ -2361,7 +2372,7 @@ void MarlinSettings::postprocess() { #endif // - // Extra Endstops offsets + // Extra Endstop adjustment // #if HAS_EXTRA_ENDSTOPS { @@ -2384,6 +2395,9 @@ void MarlinSettings::postprocess() { } #endif + // + // Z Auto-Align + // #if ENABLED(Z_STEPPER_AUTO_ALIGN) EEPROM_READ(z_stepper_align.xy); #if HAS_Z_STEPPER_ALIGN_STEPPER_XY @@ -2392,7 +2406,7 @@ void MarlinSettings::postprocess() { #endif // - // LCD Preheat settings + // Material heatup parameters // #if HAS_PREHEAT _FIELD_TEST(ui_material_preset); @@ -2400,7 +2414,7 @@ void MarlinSettings::postprocess() { #endif // - // Hotend PID + // PIDTEMP // #if ENABLED(PIDTEMP) { @@ -2413,7 +2427,7 @@ void MarlinSettings::postprocess() { } // - // PID Extrusion Scaling + // PID_EXTRUSION_SCALING // { _FIELD_TEST(lpq_len); @@ -2427,7 +2441,7 @@ void MarlinSettings::postprocess() { #endif // - // Heated Bed PID + // PIDTEMPBED // #if ENABLED(PIDTEMPBED) { @@ -2439,7 +2453,7 @@ void MarlinSettings::postprocess() { #endif // - // Heated Chamber PID + // PIDTEMPCHAMBER // #if ENABLED(PIDTEMPCHAMBER) { @@ -2455,20 +2469,20 @@ void MarlinSettings::postprocess() { // #if HAS_USER_THERMISTORS { - user_thermistor_t user_thermistor[USER_THERMISTORS]; _FIELD_TEST(user_thermistor); + user_thermistor_t user_thermistor[USER_THERMISTORS]; EEPROM_READ(user_thermistor); if (!validating) COPY(thermalManager.user_thermistor, user_thermistor); } #endif // - // Power monitor + // Power Monitor // #if HAS_POWER_MONITOR { - uint8_t power_monitor_flags; _FIELD_TEST(power_monitor_flags); + uint8_t power_monitor_flags; EEPROM_READ(power_monitor_flags); if (!validating) power_monitor.flags = power_monitor_flags; } @@ -2479,43 +2493,43 @@ void MarlinSettings::postprocess() { // #if HAS_LCD_CONTRAST { - uint8_t lcd_contrast; _FIELD_TEST(lcd_contrast); + uint8_t lcd_contrast; EEPROM_READ(lcd_contrast); if (!validating) ui.contrast = lcd_contrast; } #endif + // + // Display Sleep + // + #if ENABLED(EDITABLE_DISPLAY_TIMEOUT) + #if HAS_BACKLIGHT_TIMEOUT + EEPROM_READ(ui.backlight_timeout_minutes); + #elif HAS_DISPLAY_SLEEP + EEPROM_READ(ui.sleep_timeout_minutes); + #endif + #endif + // // LCD Brightness // #if HAS_LCD_BRIGHTNESS { - uint8_t lcd_brightness; _FIELD_TEST(lcd_brightness); + uint8_t lcd_brightness; EEPROM_READ(lcd_brightness); if (!validating) ui.brightness = lcd_brightness; } #endif - // - // LCD Backlight / Sleep Timeout - // - #if ENABLED(EDITABLE_DISPLAY_TIMEOUT) - #if HAS_BACKLIGHT_TIMEOUT - EEPROM_READ(ui.backlight_timeout_minutes); - #elif HAS_DISPLAY_SLEEP - EEPROM_READ(ui.sleep_timeout_minutes); - #endif - #endif - // // Controller Fan // #if ENABLED(USE_CONTROLLER_FAN) { - controllerFan_settings_t cfs = { 0 }; _FIELD_TEST(controllerFan_settings); + controllerFan_settings_t cfs = { 0 }; EEPROM_READ(cfs); TERN_(CONTROLLER_FAN_EDITABLE, if (!validating) controllerFan.settings = cfs); } @@ -2543,9 +2557,9 @@ void MarlinSettings::postprocess() { // #if ENABLED(FWRETRACT) { + _FIELD_TEST(fwretract_settings); fwretract_settings_t fwretract_settings; bool autoretract_enabled; - _FIELD_TEST(fwretract_settings); EEPROM_READ(fwretract_settings); EEPROM_READ(autoretract_enabled); @@ -2557,36 +2571,39 @@ void MarlinSettings::postprocess() { #endif // - // Volumetric & Filament Size + // Volumetric Extrusion & Filament Diameter // - #if DISABLED(NO_VOLUMETRICS) { struct { bool volumetric_enabled; float filament_size[EXTRUDERS]; - float volumetric_extruder_limit[EXTRUDERS]; + #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) + float volumetric_extruder_limit[EXTRUDERS]; + #endif } storage; _FIELD_TEST(parser_volumetric_enabled); EEPROM_READ(storage); - if (!validating) { - parser.volumetric_enabled = storage.volumetric_enabled; - COPY(planner.filament_size, storage.filament_size); - #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) - COPY(planner.volumetric_extruder_limit, storage.volumetric_extruder_limit); - #endif - } + #if DISABLED(NO_VOLUMETRICS) + if (!validating) { + parser.volumetric_enabled = storage.volumetric_enabled; + COPY(planner.filament_size, storage.filament_size); + #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) + COPY(planner.volumetric_extruder_limit, storage.volumetric_extruder_limit); + #endif + } + #endif } - #endif // // TMC Stepper Settings // - if (!validating) reset_stepper_drivers(); + // // TMC Stepper Current + // #if HAS_TRINAMIC_CONFIG { _FIELD_TEST(tmc_stepper_current); @@ -2665,10 +2682,12 @@ void MarlinSettings::postprocess() { } } + // // TMC Hybrid Threshold + // { - per_stepper_uint32_t tmc_hybrid_threshold; _FIELD_TEST(tmc_hybrid_threshold); + per_stepper_uint32_t tmc_hybrid_threshold; EEPROM_READ(tmc_hybrid_threshold); #if ENABLED(HYBRID_THRESHOLD) @@ -2703,8 +2722,8 @@ void MarlinSettings::postprocess() { // TMC StallGuard threshold. // { - mot_stepper_int16_t tmc_sgt; _FIELD_TEST(tmc_sgt); + mot_stepper_int16_t tmc_sgt; EEPROM_READ(tmc_sgt); #if USE_SENSORLESS if (!validating) { @@ -2728,7 +2747,9 @@ void MarlinSettings::postprocess() { #endif } + // // TMC stepping mode + // { _FIELD_TEST(tmc_stealth_enabled); @@ -2768,8 +2789,8 @@ void MarlinSettings::postprocess() { // #if ENABLED(LIN_ADVANCE) { - float extruder_advance_K[DISTINCT_E]; _FIELD_TEST(planner_extruder_advance_K); + float extruder_advance_K[DISTINCT_E]; EEPROM_READ(extruder_advance_K); if (!validating) COPY(planner.extruder_advance_K, extruder_advance_K); @@ -2777,9 +2798,8 @@ void MarlinSettings::postprocess() { #endif // - // Motor Current PWM + // HAS_MOTOR_CURRENT_(SPI|PWM) // - #if HAS_MOTOR_CURRENT { _FIELD_TEST(motor_current_setting); uint32_t motor_current_setting[MOTOR_CURRENT_COUNT] @@ -2799,7 +2819,6 @@ void MarlinSettings::postprocess() { COPY(stepper.motor_current_setting, motor_current_setting); #endif } - #endif // // Adaptive Step Smoothing state @@ -2809,7 +2828,7 @@ void MarlinSettings::postprocess() { #endif // - // CNC Coordinate System + // CNC Coordinate Systems // #if NUM_AXES { @@ -2825,12 +2844,12 @@ void MarlinSettings::postprocess() { #endif // - // Skew correction factors + // Skew Factor // #if ENABLED(SKEW_CORRECTION) { - skew_factor_t skew_factor; _FIELD_TEST(planner_skew_factor); + skew_factor_t skew_factor; EEPROM_READ(skew_factor); #if ENABLED(SKEW_CORRECTION_GCODE) if (!validating) { @@ -2845,7 +2864,7 @@ void MarlinSettings::postprocess() { #endif // - // Advanced Pause filament load & unload lengths + // Filament load/unload // #if ENABLED(CONFIGURE_FILAMENT_CHANGE) { @@ -2855,7 +2874,7 @@ void MarlinSettings::postprocess() { #endif // - // Tool-change settings + // Tool-changing // #if HAS_MULTI_EXTRUDER _FIELD_TEST(toolchange_settings); @@ -2863,15 +2882,15 @@ void MarlinSettings::postprocess() { #endif // - // Backlash Compensation + // BACKLASH_GCODE // #if NUM_AXES && ENABLED(BACKLASH_GCODE) { + _FIELD_TEST(backlash_distance_mm); 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); @@ -2891,20 +2910,20 @@ void MarlinSettings::postprocess() { // #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); + const char extui_data[ExtUI::eeprom_data_size] = { 0 }; EEPROM_READ(extui_data); if (!validating) ExtUI::onLoadSettings(extui_data); } #endif // - // DWIN ProUI User Data + // DWIN UI User Data // #if ENABLED(DWIN_LCD_PROUI) { - const char dwin_data[eeprom_data_size] = { 0 }; _FIELD_TEST(dwin_data); + const char dwin_data[eeprom_data_size] = { 0 }; EEPROM_READ(dwin_data); if (!validating) DWIN_CopySettingsFrom(dwin_data); } @@ -2928,7 +2947,7 @@ void MarlinSettings::postprocess() { #endif // - // TOUCH_SCREEN_CALIBRATION + // Touch Screen Calibration // #if ENABLED(TOUCH_SCREEN_CALIBRATION) _FIELD_TEST(touch_calibration_data); @@ -3022,7 +3041,7 @@ void MarlinSettings::postprocess() { #endif // - // Selected LCD language + // UI Language // #if HAS_MULTI_LANGUAGE { @@ -3034,7 +3053,7 @@ void MarlinSettings::postprocess() { #endif // - // Model predictive control + // Model Predictive Control // #if ENABLED(MPCTEMP) HOTEND_LOOP() EEPROM_READ(thermalManager.temp_hotend[e].mpc); @@ -3085,7 +3104,7 @@ void MarlinSettings::postprocess() { #endif // - // HOTEND_IDLE_TIMEOUT + // Hotend Idle Timeout // #if ENABLED(HOTEND_IDLE_TIMEOUT) EEPROM_READ(hotend_idle.cfg); @@ -3264,10 +3283,6 @@ void MarlinSettings::postprocess() { #if ANY(EEPROM_AUTO_INIT, EEPROM_INIT_NOW) (void)save(); SERIAL_ECHO_MSG("EEPROM Initialized"); - #if ENABLED(DWIN_LCD_PROUI) - safe_delay(200); - RebootPrinter(); - #endif #endif return false; } @@ -3493,7 +3508,6 @@ void MarlinSettings::reset() { // // Filament Runout Sensor // - #if HAS_FILAMENT_SENSOR runout.enabled = FIL_RUNOUT_ENABLED_DEFAULT; runout.reset(); @@ -3501,9 +3515,8 @@ void MarlinSettings::reset() { #endif // - // Tool-change Settings + // Tool-changing // - #if HAS_MULTI_EXTRUDER #if ENABLED(TOOLCHANGE_FILAMENT_SWAP) toolchange_settings.swap_length = TOOLCHANGE_FS_LENGTH; @@ -3535,6 +3548,9 @@ void MarlinSettings::reset() { #endif + // + // Backlash Compensation + // #if ENABLED(BACKLASH_GCODE) backlash.set_correction(BACKLASH_CORRECTION); constexpr xyz_float_t tmp = BACKLASH_DISTANCE_MM; @@ -3550,7 +3566,19 @@ void MarlinSettings::reset() { TERN_(CASELIGHT_USES_BRIGHTNESS, caselight.brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS); // - // TOUCH_SCREEN_CALIBRATION + // Password feature + // + #if ENABLED(PASSWORD_FEATURE) + #ifdef PASSWORD_DEFAULT_VALUE + password.is_set = true; + password.value = PASSWORD_DEFAULT_VALUE; + #else + password.is_set = false; + #endif + #endif + + // + // Touch Screen Calibration // TERN_(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration_reset()); @@ -3594,7 +3622,7 @@ void MarlinSettings::reset() { // Toggle the meshviewer // #if ALL(DWIN_LCD_PROUI, HAS_MESH, USE_GRID_MESHVIEWER) - bedLevelTools.view_mesh = false; //added mesh viewer option + bedLevelTools.view_mesh = false; #endif // @@ -3623,7 +3651,7 @@ void MarlinSettings::reset() { TERN_(X_AXIS_TWIST_COMPENSATION, xatc.reset()); // - // Nozzle-to-probe Offset + // Probe XYZ Offsets // #if HAS_BED_PROBE constexpr float dpo[] = NOZZLE_TO_PROBE_OFFSET; @@ -3636,7 +3664,7 @@ void MarlinSettings::reset() { #endif // - // Z Stepper Auto-alignment points + // Z Auto-Align // TERN_(Z_STEPPER_AUTO_ALIGN, z_stepper_align.reset_to_default()); @@ -3658,7 +3686,6 @@ void MarlinSettings::reset() { // // Kinematic Settings (Delta, SCARA, TPARA, Polargraph...) // - #if IS_KINEMATIC segments_per_second = DEFAULT_SEGMENTS_PER_SECOND; #if ENABLED(DELTA) @@ -3679,7 +3706,6 @@ void MarlinSettings::reset() { // // Endstop Adjustments // - #if ENABLED(X_DUAL_ENDSTOPS) #ifndef X2_ENDSTOP_ADJUSTMENT #define X2_ENDSTOP_ADJUSTMENT 0 @@ -3714,7 +3740,7 @@ void MarlinSettings::reset() { #endif // - // Preheat parameters + // Material heatup parameters // #if HAS_PREHEAT #define _PITEM(N,T) PREHEAT_##N##_##T, @@ -3735,9 +3761,8 @@ void MarlinSettings::reset() { #endif // - // Hotend PID + // PIDTEMP // - #if ENABLED(PIDTEMP) #if ENABLED(PID_PARAMS_PER_HOTEND) constexpr float defKp[] = @@ -3798,26 +3823,26 @@ void MarlinSettings::reset() { #endif // - // PID Extrusion Scaling + // PID_EXTRUSION_SCALING // TERN_(PID_EXTRUSION_SCALING, thermalManager.lpq_len = 20); // Default last-position-queue size // - // Heated Bed PID + // PIDTEMPBED // #if ENABLED(PIDTEMPBED) thermalManager.temp_bed.pid.set(DEFAULT_bedKp, DEFAULT_bedKi, DEFAULT_bedKd); #endif // - // Heated Chamber PID + // PIDTEMPCHAMBER // #if ENABLED(PIDTEMPCHAMBER) thermalManager.temp_chamber.pid.set(DEFAULT_chamberKp, DEFAULT_chamberKi, DEFAULT_chamberKd); #endif // - // User-Defined Thermistors + // User-defined Thermistors // TERN_(HAS_USER_THERMISTORS, thermalManager.reset_user_thermistors()); @@ -3832,12 +3857,7 @@ void MarlinSettings::reset() { TERN_(HAS_LCD_CONTRAST, ui.contrast = LCD_CONTRAST_DEFAULT); // - // LCD Brightness - // - TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = LCD_BRIGHTNESS_DEFAULT); - - // - // LCD Backlight / Sleep Timeout + // Display Sleep // #if ENABLED(EDITABLE_DISPLAY_TIMEOUT) #if HAS_BACKLIGHT_TIMEOUT @@ -3847,6 +3867,11 @@ void MarlinSettings::reset() { #endif #endif + // + // LCD Brightness + // + TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = LCD_BRIGHTNESS_DEFAULT); + // // Controller Fan // @@ -3866,7 +3891,7 @@ void MarlinSettings::reset() { TERN_(FWRETRACT, fwretract.reset()); // - // Volumetric & Filament Size + // Volumetric Extrusion & Filament Diameter // #if DISABLED(NO_VOLUMETRICS) parser.volumetric_enabled = ENABLED(VOLUMETRIC_DEFAULT_ON); @@ -3899,9 +3924,8 @@ void MarlinSettings::reset() { #endif // - // Motor Current PWM + // HAS_MOTOR_CURRENT_PWM // - #if HAS_MOTOR_CURRENT_PWM constexpr uint32_t tmp_motor_current_setting[MOTOR_CURRENT_COUNT] = PWM_MOTOR_CURRENT; for (uint8_t q = 0; q < MOTOR_CURRENT_COUNT; ++q) @@ -3909,7 +3933,7 @@ void MarlinSettings::reset() { #endif // - // DIGIPOTS + // HAS_MOTOR_CURRENT_SPI // #if HAS_MOTOR_CURRENT_SPI static constexpr uint32_t tmp_motor_current_setting[] = DIGIPOT_MOTOR_CURRENT; @@ -3927,12 +3951,12 @@ void MarlinSettings::reset() { #endif // - // CNC Coordinate System + // CNC Coordinate Systems // TERN_(CNC_COORDINATE_SYSTEMS, (void)gcode.select_coordinate_system(-1)); // Go back to machine space // - // Skew Correction + // Skew Factor // #if ENABLED(SKEW_CORRECTION_GCODE) planner.skew_factor.xy = XY_SKEW_FACTOR; @@ -3943,7 +3967,7 @@ void MarlinSettings::reset() { #endif // - // Advanced Pause filament load & unload lengths + // Filament load/unload // #if ENABLED(CONFIGURE_FILAMENT_CHANGE) EXTRUDER_LOOP() { @@ -3952,15 +3976,6 @@ void MarlinSettings::reset() { } #endif - #if ENABLED(PASSWORD_FEATURE) - #ifdef PASSWORD_DEFAULT_VALUE - password.is_set = true; - password.value = PASSWORD_DEFAULT_VALUE; - #else - password.is_set = false; - #endif - #endif - // // Fan tachometer check // @@ -3972,12 +3987,12 @@ void MarlinSettings::reset() { TERN_(DGUS_LCD_UI_MKS, MKS_reset_settings()); // - // Ender-3 V2 with ProUI + // Ender-3 V2 DWIN // TERN_(DWIN_LCD_PROUI, DWIN_SetDataDefaults()); // - // Model predictive control + // Model Predictive Control // #if ENABLED(MPCTEMP) constexpr float _mpc_heater_power[] = MPC_HEATER_POWER; @@ -4073,6 +4088,7 @@ void MarlinSettings::reset() { #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, F(STR)) + // M92 Steps per unit #if ENABLED(EDITABLE_STEPS_PER_UNIT) void M92_report(const bool echo=true, const int8_t e=-1); #endif @@ -4141,12 +4157,12 @@ void MarlinSettings::reset() { TERN_(HAS_HOME_OFFSET, gcode.M206_report(forReplay)); // - // M218 Hotend offsets + // M218 Hotend Offsets // TERN_(HAS_HOTEND_OFFSET, gcode.M218_report(forReplay)); // - // Bed Leveling + // M420 Bed Leveling // #if HAS_LEVELING @@ -4203,76 +4219,83 @@ void MarlinSettings::reset() { #endif // HAS_LEVELING // - // X Axis Twist Compensation + // M423 X Axis Twist Compensation // TERN_(X_AXIS_TWIST_COMPENSATION, gcode.M423_report(forReplay)); // - // Editable Servo Angles + // M281 Servo Angles // TERN_(EDITABLE_SERVO_ANGLES, gcode.M281_report(forReplay)); // - // Kinematic Settings + // M665 Kinematic Settings // TERN_(IS_KINEMATIC, gcode.M665_report(forReplay)); // - // M666 Endstops Adjustment + // M666 Endstop adjustment // #if ANY(DELTA, HAS_EXTRA_ENDSTOPS) gcode.M666_report(forReplay); #endif // - // Z Auto-Align + // M422 Z Auto-Align // TERN_(Z_STEPPER_AUTO_ALIGN, gcode.M422_report(forReplay)); // - // LCD Preheat Settings + // M145 Material heatup parameters // TERN_(HAS_PREHEAT, gcode.M145_report(forReplay)); // - // PID + // M301 Hotend PID + // M304 Bed PID + // M309 Chamber PID // TERN_(PIDTEMP, gcode.M301_report(forReplay)); TERN_(PIDTEMPBED, gcode.M304_report(forReplay)); TERN_(PIDTEMPCHAMBER, gcode.M309_report(forReplay)); + // + // M305 User thermistors + // #if HAS_USER_THERMISTORS for (uint8_t i = 0; i < USER_THERMISTORS; ++i) thermalManager.M305_report(i, forReplay); #endif // - // LCD Contrast + // M250 LCD Contrast // TERN_(HAS_LCD_CONTRAST, gcode.M250_report(forReplay)); // - // Display Sleep + // M255 Display Sleep // TERN_(EDITABLE_DISPLAY_TIMEOUT, gcode.M255_report(forReplay)); // - // LCD Brightness + // M256 LCD Brightness // TERN_(HAS_LCD_BRIGHTNESS, gcode.M256_report(forReplay)); // - // Controller Fan + // M710 Controller Fan // TERN_(CONTROLLER_FAN_EDITABLE, gcode.M710_report(forReplay)); // - // Power-Loss Recovery + // M413 Power-Loss Recovery // TERN_(POWER_LOSS_RECOVERY, gcode.M413_report(forReplay)); // - // Firmware Retraction + // M207 Retract + // M208 Recover + // M209 Auto-Retract // #if ENABLED(FWRETRACT) gcode.M207_report(forReplay); @@ -4281,89 +4304,96 @@ void MarlinSettings::reset() { #endif // - // Probe Offset + // M851 Probe Offset // TERN_(HAS_BED_PROBE, gcode.M851_report(forReplay)); // - // Bed Skew Correction + // M852 Skew Factor // TERN_(SKEW_CORRECTION_GCODE, gcode.M852_report(forReplay)); #if HAS_TRINAMIC_CONFIG // - // TMC Stepper driver current + // M906 TMC Stepper driver current // gcode.M906_report(forReplay); // - // TMC Hybrid Threshold + // M913 TMC Hybrid Threshold // TERN_(HYBRID_THRESHOLD, gcode.M913_report(forReplay)); // - // TMC Sensorless homing thresholds + // M914 TMC StallGuard Threshold // TERN_(USE_SENSORLESS, gcode.M914_report(forReplay)); #endif // - // TMC stepping mode + // M569 TMC Driver stepping mode // TERN_(HAS_STEALTHCHOP, gcode.M569_report(forReplay)); // - // Fixed-Time Motion + // M493 Fixed-Time Motion // TERN_(FT_MOTION, gcode.M493_report(forReplay)); // - // Nonlinear Extrusion + // M592 Nonlinear Extrusion // TERN_(NONLINEAR_EXTRUSION, gcode.M592_report(forReplay)); // - // Input Shaping + // M593 Input Shaping // TERN_(HAS_ZV_SHAPING, gcode.M593_report(forReplay)); // - // Hotend Idle Timeout + // M86 Hotend Idle Timeout // TERN_(HOTEND_IDLE_TIMEOUT, gcode.M86_report(forReplay)); // - // Linear Advance + // M900 Linear Advance // TERN_(LIN_ADVANCE, gcode.M900_report(forReplay)); // - // Motor Current (SPI or PWM) + // M907 Stepper motor currents // #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM gcode.M907_report(forReplay); #endif // - // Advanced Pause filament load & unload lengths + // M603 Filament load/unload // TERN_(CONFIGURE_FILAMENT_CHANGE, gcode.M603_report(forReplay)); // - // Tool-changing Parameters + // M217 Tool-changing // E_TERN_(gcode.M217_report(forReplay)); // - // Backlash Compensation + // M425 Backlash Compensation // TERN_(BACKLASH_GCODE, gcode.M425_report(forReplay)); // - // Filament Runout Sensor + // M412 Filament runout sensor // TERN_(HAS_FILAMENT_SENSOR, gcode.M412_report(forReplay)); + // + // Ethernet port enabled/disabled + // MAC + // ip address + // subnet mask + // gateway + // #if HAS_ETHERNET CONFIG_ECHO_HEADING("Ethernet"); if (!forReplay) ETH0_report(); @@ -4373,14 +4403,18 @@ void MarlinSettings::reset() { CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); gcode.M554_report(); #endif + // + // M414 UI Language + // TERN_(HAS_MULTI_LANGUAGE, gcode.M414_report(forReplay)); // - // Model predictive control + // M306 Model Predictive Control // TERN_(MPCTEMP, gcode.M306_report(forReplay)); - // MMU3 + // + // M503 MMU3 Operational Stats // TERN_(HAS_PRUSA_MMU3, gcode.MMU3_report(forReplay)); diff --git a/Marlin/src/module/settings.h b/Marlin/src/module/settings.h index 70f5b47ff7..f181e4014d 100644 --- a/Marlin/src/module/settings.h +++ b/Marlin/src/module/settings.h @@ -150,7 +150,7 @@ class MarlinSettings { static void EEPROM_SKIP(const T &VAR) { eeprom_index += sizeof(VAR); } template - static void EEPROM_WRITE_(const T &VAR) { + static void EEPROM_WRITE(const T &VAR) { persistentStore.write_data(eeprom_index, (const uint8_t *) &VAR, sizeof(VAR), &working_crc); } diff --git a/configurations/Andrew427/Configuration-MP.h b/configurations/Andrew427/Configuration-MP.h index 99d1b61c6e..cebcfb396f 100644 --- a/configurations/Andrew427/Configuration-MP.h +++ b/configurations/Andrew427/Configuration-MP.h @@ -2090,7 +2090,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" @@ -2313,9 +2313,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. */ diff --git a/configurations/Andrew427/Configuration.h b/configurations/Andrew427/Configuration.h index 124e91cfd3..baeda5ac24 100644 --- a/configurations/Andrew427/Configuration.h +++ b/configurations/Andrew427/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. */ diff --git a/configurations/Andrew427/Configuration_adv.h b/configurations/Andrew427/Configuration_adv.h index 7b307148ab..a22c8cd73c 100644 --- a/configurations/Andrew427/Configuration_adv.h +++ b/configurations/Andrew427/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 diff --git a/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration.h b/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration.h index d7b0430cbe..970ca06c72 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration.h +++ b/configurations/BTT_SKR-Mini-E3-V2/MM/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. */ diff --git a/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration_adv.h b/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration_adv.h index 6b4449f76a..8ee94f730c 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration_adv.h +++ b/configurations/BTT_SKR-Mini-E3-V2/MM/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 diff --git a/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration.h b/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration.h index 467b8f5d79..43e4f95595 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration.h +++ b/configurations/BTT_SKR-Mini-E3-V2/UBL/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. */ diff --git a/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration_adv.h b/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration_adv.h index 005d0ac6cc..e31fb0baac 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration_adv.h +++ b/configurations/BTT_SKR-Mini-E3-V2/UBL/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 diff --git a/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration.h b/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration.h index d6aeb4bcd3..99b4723190 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration.h +++ b/configurations/BTT_SKR-Mini-E3-V3/MM/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. */ diff --git a/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration_adv.h b/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration_adv.h index 5c1cd391c2..f28a852bbf 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration_adv.h +++ b/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration_adv.h @@ -1511,7 +1511,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. @@ -2378,7 +2378,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 diff --git a/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration.h b/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration.h index 02ee3d1e5a..f591dbb4c4 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration.h +++ b/configurations/BTT_SKR-Mini-E3-V3/UBL/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. */ diff --git a/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration_adv.h b/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration_adv.h index 5c1cd391c2..f28a852bbf 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration_adv.h +++ b/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration_adv.h @@ -1511,7 +1511,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. @@ -2378,7 +2378,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 diff --git a/configurations/Creality Ender/BLT/Configuration.h b/configurations/Creality Ender/BLT/Configuration.h index dd7a6bd94d..9cac251918 100644 --- a/configurations/Creality Ender/BLT/Configuration.h +++ b/configurations/Creality Ender/BLT/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. */ diff --git a/configurations/Creality Ender/BLT/Configuration_adv.h b/configurations/Creality Ender/BLT/Configuration_adv.h index 4b4f888d7f..eab716eccf 100644 --- a/configurations/Creality Ender/BLT/Configuration_adv.h +++ b/configurations/Creality Ender/BLT/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 diff --git a/configurations/Creality Ender/Default/Configuration.h b/configurations/Creality Ender/Default/Configuration.h index bd99677e4a..a423187abd 100644 --- a/configurations/Creality Ender/Default/Configuration.h +++ b/configurations/Creality Ender/Default/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. */ diff --git a/configurations/Creality Ender/Default/Configuration_adv.h b/configurations/Creality Ender/Default/Configuration_adv.h index d17ccbab22..cdb8ed59f6 100644 --- a/configurations/Creality Ender/Default/Configuration_adv.h +++ b/configurations/Creality Ender/Default/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 diff --git a/configurations/Creality Ender/E3-Free-runs/MM/Configuration.h b/configurations/Creality Ender/E3-Free-runs/MM/Configuration.h index d763fcf762..c64a01e304 100644 --- a/configurations/Creality Ender/E3-Free-runs/MM/Configuration.h +++ b/configurations/Creality Ender/E3-Free-runs/MM/Configuration.h @@ -2087,7 +2087,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" @@ -2310,9 +2310,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. */ diff --git a/configurations/Creality Ender/E3-Free-runs/MM/Configuration_adv.h b/configurations/Creality Ender/E3-Free-runs/MM/Configuration_adv.h index 1613529239..378fea1dde 100644 --- a/configurations/Creality Ender/E3-Free-runs/MM/Configuration_adv.h +++ b/configurations/Creality Ender/E3-Free-runs/MM/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 diff --git a/configurations/Creality Ender/E3-Free-runs/UBL/Configuration.h b/configurations/Creality Ender/E3-Free-runs/UBL/Configuration.h index 5150239db2..1886eb3720 100644 --- a/configurations/Creality Ender/E3-Free-runs/UBL/Configuration.h +++ b/configurations/Creality Ender/E3-Free-runs/UBL/Configuration.h @@ -2087,7 +2087,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" @@ -2310,9 +2310,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. */ diff --git a/configurations/Creality Ender/E3-Free-runs/UBL/Configuration_adv.h b/configurations/Creality Ender/E3-Free-runs/UBL/Configuration_adv.h index 1613529239..378fea1dde 100644 --- a/configurations/Creality Ender/E3-Free-runs/UBL/Configuration_adv.h +++ b/configurations/Creality Ender/E3-Free-runs/UBL/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 diff --git a/configurations/Creality Ender/MM/Configuration.h b/configurations/Creality Ender/MM/Configuration.h index 1782006e19..51740b85b9 100644 --- a/configurations/Creality Ender/MM/Configuration.h +++ b/configurations/Creality Ender/MM/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. */ diff --git a/configurations/Creality Ender/MM/Configuration_adv.h b/configurations/Creality Ender/MM/Configuration_adv.h index 4b4f888d7f..eab716eccf 100644 --- a/configurations/Creality Ender/MM/Configuration_adv.h +++ b/configurations/Creality Ender/MM/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 diff --git a/configurations/Creality Ender/S1/UBL/Configuration.h b/configurations/Creality Ender/S1/UBL/Configuration.h index 523427a877..059116ef7e 100644 --- a/configurations/Creality Ender/S1/UBL/Configuration.h +++ b/configurations/Creality Ender/S1/UBL/Configuration.h @@ -2087,7 +2087,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" @@ -2310,9 +2310,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. */ diff --git a/configurations/Creality Ender/S1/UBL/Configuration_adv.h b/configurations/Creality Ender/S1/UBL/Configuration_adv.h index 0ffc61b2ba..7cdc00ce44 100644 --- a/configurations/Creality Ender/S1/UBL/Configuration_adv.h +++ b/configurations/Creality Ender/S1/UBL/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 diff --git a/configurations/Creality Ender/UBL/Configuration.h b/configurations/Creality Ender/UBL/Configuration.h index 23e7bc3d27..56f15f9fda 100644 --- a/configurations/Creality Ender/UBL/Configuration.h +++ b/configurations/Creality Ender/UBL/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. */ diff --git a/configurations/Creality Ender/UBL/Configuration_adv.h b/configurations/Creality Ender/UBL/Configuration_adv.h index 4b4f888d7f..eab716eccf 100644 --- a/configurations/Creality Ender/UBL/Configuration_adv.h +++ b/configurations/Creality Ender/UBL/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 diff --git a/configurations/Voxelab Aquila 427/BLT/Configuration.h b/configurations/Voxelab Aquila 427/BLT/Configuration.h index 8e11c33f4a..d36226e77c 100644 --- a/configurations/Voxelab Aquila 427/BLT/Configuration.h +++ b/configurations/Voxelab Aquila 427/BLT/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. */ diff --git a/configurations/Voxelab Aquila 427/BLT/Configuration_adv.h b/configurations/Voxelab Aquila 427/BLT/Configuration_adv.h index 4b4f888d7f..eab716eccf 100644 --- a/configurations/Voxelab Aquila 427/BLT/Configuration_adv.h +++ b/configurations/Voxelab Aquila 427/BLT/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 diff --git a/configurations/Voxelab Aquila 427/Default/Configuration.h b/configurations/Voxelab Aquila 427/Default/Configuration.h index f756875d5f..821f20bc40 100644 --- a/configurations/Voxelab Aquila 427/Default/Configuration.h +++ b/configurations/Voxelab Aquila 427/Default/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. */ diff --git a/configurations/Voxelab Aquila 427/Default/Configuration_adv.h b/configurations/Voxelab Aquila 427/Default/Configuration_adv.h index d17ccbab22..cdb8ed59f6 100644 --- a/configurations/Voxelab Aquila 427/Default/Configuration_adv.h +++ b/configurations/Voxelab Aquila 427/Default/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 diff --git a/configurations/Voxelab Aquila 427/MM/Configuration.h b/configurations/Voxelab Aquila 427/MM/Configuration.h index 4cc0c6babb..356bdea66c 100644 --- a/configurations/Voxelab Aquila 427/MM/Configuration.h +++ b/configurations/Voxelab Aquila 427/MM/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. */ diff --git a/configurations/Voxelab Aquila 427/MM/Configuration_adv.h b/configurations/Voxelab Aquila 427/MM/Configuration_adv.h index 4b4f888d7f..eab716eccf 100644 --- a/configurations/Voxelab Aquila 427/MM/Configuration_adv.h +++ b/configurations/Voxelab Aquila 427/MM/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 diff --git a/configurations/Voxelab Aquila 427/UBL/Configuration.h b/configurations/Voxelab Aquila 427/UBL/Configuration.h index 2a07102641..34cddc4819 100644 --- a/configurations/Voxelab Aquila 427/UBL/Configuration.h +++ b/configurations/Voxelab Aquila 427/UBL/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. */ diff --git a/configurations/Voxelab Aquila 427/UBL/Configuration_adv.h b/configurations/Voxelab Aquila 427/UBL/Configuration_adv.h index 4b4f888d7f..eab716eccf 100644 --- a/configurations/Voxelab Aquila 427/UBL/Configuration_adv.h +++ b/configurations/Voxelab Aquila 427/UBL/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 diff --git a/configurations/Voxelab Aquila/BLT/Configuration.h b/configurations/Voxelab Aquila/BLT/Configuration.h index e70813f1e1..5376a7aaed 100644 --- a/configurations/Voxelab Aquila/BLT/Configuration.h +++ b/configurations/Voxelab Aquila/BLT/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. */ diff --git a/configurations/Voxelab Aquila/BLT/Configuration_adv.h b/configurations/Voxelab Aquila/BLT/Configuration_adv.h index c2dfcf6cea..63813a646d 100644 --- a/configurations/Voxelab Aquila/BLT/Configuration_adv.h +++ b/configurations/Voxelab Aquila/BLT/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 diff --git a/configurations/Voxelab Aquila/Default/Configuration.h b/configurations/Voxelab Aquila/Default/Configuration.h index 0be232f668..021c939789 100644 --- a/configurations/Voxelab Aquila/Default/Configuration.h +++ b/configurations/Voxelab Aquila/Default/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. */ diff --git a/configurations/Voxelab Aquila/Default/Configuration_adv.h b/configurations/Voxelab Aquila/Default/Configuration_adv.h index b5a6344ed7..1de8b13101 100644 --- a/configurations/Voxelab Aquila/Default/Configuration_adv.h +++ b/configurations/Voxelab Aquila/Default/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 diff --git a/configurations/Voxelab Aquila/MM/Configuration.h b/configurations/Voxelab Aquila/MM/Configuration.h index 1c7293a5a7..ebd003d1cf 100644 --- a/configurations/Voxelab Aquila/MM/Configuration.h +++ b/configurations/Voxelab Aquila/MM/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. */ diff --git a/configurations/Voxelab Aquila/MM/Configuration_adv.h b/configurations/Voxelab Aquila/MM/Configuration_adv.h index b5a6344ed7..1de8b13101 100644 --- a/configurations/Voxelab Aquila/MM/Configuration_adv.h +++ b/configurations/Voxelab Aquila/MM/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 diff --git a/configurations/Voxelab Aquila/UBL/Configuration.h b/configurations/Voxelab Aquila/UBL/Configuration.h index 85b342caeb..bdd9f69eb6 100644 --- a/configurations/Voxelab Aquila/UBL/Configuration.h +++ b/configurations/Voxelab Aquila/UBL/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. */ diff --git a/configurations/Voxelab Aquila/UBL/Configuration_adv.h b/configurations/Voxelab Aquila/UBL/Configuration_adv.h index c2dfcf6cea..63813a646d 100644 --- a/configurations/Voxelab Aquila/UBL/Configuration_adv.h +++ b/configurations/Voxelab Aquila/UBL/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 diff --git a/configurations/Voxelab Aquila/X3/Configuration.h b/configurations/Voxelab Aquila/X3/Configuration.h index e844ea458e..9cf5031c95 100644 --- a/configurations/Voxelab Aquila/X3/Configuration.h +++ b/configurations/Voxelab Aquila/X3/Configuration.h @@ -2091,7 +2091,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" @@ -2314,9 +2314,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. */ diff --git a/configurations/Voxelab Aquila/X3/Configuration_adv.h b/configurations/Voxelab Aquila/X3/Configuration_adv.h index 2b910dbec6..72c00bebe7 100644 --- a/configurations/Voxelab Aquila/X3/Configuration_adv.h +++ b/configurations/Voxelab Aquila/X3/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