diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7378774e597..6b63fc3833d 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -492,7 +492,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 7e498a34838..fcb7ee66624 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -492,7 +492,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 11707fb5a21..3683a40f3e0 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -475,7 +475,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index bb0e9a1452b..cf5585a68ec 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -475,7 +475,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 168cd6f929a..d5ebeffe45e 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -484,7 +484,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index c4686f3e0df..d8835d00172 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -486,7 +486,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index b5e3da2005c..0c9aab13152 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -509,7 +509,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index d015f7c416a..585162296b0 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -492,7 +492,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index a862ab64a37..4fd1a9f8a93 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -492,7 +492,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index b1d7f18a53d..16517f877e4 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -492,7 +492,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index ed96cc3f94a..7310bf6e2aa 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -490,7 +490,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 263214d5690..38686f7cac7 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -507,7 +507,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 2a87372c017..11cccd8d062 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -513,7 +513,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index ec18a2ed09e..6010d6d2506 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -484,7 +484,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 71bc9f02cdb..aa764bb0941 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -492,7 +492,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index bb759e4d190..934ac34d967 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -537,7 +537,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index f3fb06a1b3e..5a647e673af 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -537,7 +537,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 5f5978d8481..2b0a3859377 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -537,7 +537,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 77d9b3a0071..c5df1350841 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -533,7 +533,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index e44374ebe92..81f6aa865bf 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -543,7 +543,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 25e1ea2b18c..891ac9cd205 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -495,7 +495,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index f0cf6c1ae89..883f7df1906 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -488,7 +488,7 @@ #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves /** - * Defult Jerk (mm/s) + * Default Jerk (mm/s) * * "Jerk" specifies the minimum speed change that requires acceleration. * When changing speed and direction, if the difference is less than the diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 7282c8397b9..132fa7d9732 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1038,13 +1038,13 @@ void kill_screen(const char* lcd_msg) { // Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z // Z position will be restored with the final action, a G28 inline void _mbl_goto_xy(float x, float y) { - current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT; + current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT); line_to_current(Z_AXIS); - current_position[X_AXIS] = x + home_offset[X_AXIS]; - current_position[Y_AXIS] = y + home_offset[Y_AXIS]; + current_position[X_AXIS] = LOGICAL_X_POSITION(x); + current_position[Y_AXIS] = LOGICAL_Y_POSITION(y); line_to_current(manual_feedrate_mm_m[X_AXIS] <= manual_feedrate_mm_m[Y_AXIS] ? X_AXIS : Y_AXIS); #if Z_HOMING_HEIGHT > 0 - current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; // How do condition and action match? + current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z); line_to_current(Z_AXIS); #endif stepper.synchronize();