Skip to content

[1.1.x] Home axes after tool-change in UBL's G29 #11329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Roxy-3D merged 4 commits into from
Jul 24, 2018
+3 −2
Merged

[1.1.x] Home axes after tool-change in UBL's G29 #11329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1d22e4
Merge pull request #1 from MarlinFirmware/bugfix-1.1.x
silentninja1 Jul 21, 2018
b2c314b
Move home all axis prototype to allow access from UBL.h
silentninja1 Jul 21, 2018
893e63e
Remove home all axis command as it exists in marlin.h now
silentninja1 Jul 21, 2018
ebce558
Reverse order of tool change and home
silentninja1 Jul 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Marlin/Marlin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ extern float soft_endstop_min[XYZ], soft_endstop_max[XYZ];

void tool_change(const uint8_t tmp_extruder, const float fr_mm_s=0.0, bool no_move=false);

void home_all_axes();

void report_current_position();

#if IS_KINEMATIC
Expand Down
1 change: 0 additions & 1 deletion Marlin/ubl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ enum MeshPointType : char { INVALID, REAL, SET_IN_BITMAP };
// External references

char *ftostr43sign(const float&, char);
void home_all_axes();

extern uint8_t ubl_cnt;

Expand Down
2 changes: 1 addition & 1 deletion Marlin/ubl_G29.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@

// Check for commands that require the printer to be homed
if (may_move) {
if (axis_unhomed_error()) home_all_axes();
#if ENABLED(DUAL_X_CARRIAGE)
if (active_extruder != 0) tool_change(0);
#endif
if (axis_unhomed_error()) home_all_axes();
}

// Invalidate Mesh Points. This command is a little bit asymmetrical because
Expand Down