From d4106c2fe35e19f883e5e3f9ec4524248a74000e Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 11 Jun 2018 11:13:49 +0200 Subject: [PATCH] If homing all axes, move Z little bit higher before X and Y movements to protect steel sheet/heatbed --- .gitignore | 1 + Firmware/Marlin_main.cpp | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 98f5b0b1..53ad84b5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ Firmware/Doc /Firmware/Firmware.sln /Firmware/Firmware.vcxproj /Firmware/Firmware.vcxproj.filters +/Firmware/Firmware - Shortcut.lnk diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a769536f..1dd7a938 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2564,23 +2564,30 @@ void force_high_power_mode(bool start_high_power_section) { } #endif //TMC2130 -void gcode_G28(bool home_x, bool home_y, bool home_z, bool calib){ - st_synchronize(); +void gcode_G28(bool home_x, bool home_y, bool home_z, bool calib) { + st_synchronize(); #if 0 - SERIAL_ECHOPGM("G28, initial "); print_world_coordinates(); - SERIAL_ECHOPGM("G28, initial "); print_physical_coordinates(); + SERIAL_ECHOPGM("G28, initial "); print_world_coordinates(); + SERIAL_ECHOPGM("G28, initial "); print_physical_coordinates(); #endif - // Flag for the display update routine and to disable the print cancelation during homing. - homing_flag = true; - - // Either all X,Y,Z codes are present, or none of them. - bool home_all_axes = home_x == home_y && home_x == home_z; - if (home_all_axes) - // No X/Y/Z code provided means to home all axes. - home_x = home_y = home_z = true; + // Flag for the display update routine and to disable the print cancelation during homing. + homing_flag = true; + // Either all X,Y,Z codes are present, or none of them. + bool home_all_axes = home_x == home_y && home_x == home_z; + if (home_all_axes) + // No X/Y/Z code provided means to home all axes. + home_x = home_y = home_z = true; + + //if we are homing all axes, first move z higher to protect heatbed/steel sheet + if (home_all_axes) { + current_position[Z_AXIS] += MESH_HOME_Z_SEARCH; + feedrate = homing_feedrate[Z_AXIS]; + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate / 60, active_extruder); + st_synchronize(); + } #ifdef ENABLE_AUTO_BED_LEVELING plan_bed_level_matrix.set_to_identity(); //Reset the plane ("erase" all leveling data) #endif //ENABLE_AUTO_BED_LEVELING