Skip to content

Update ubl_G29.cpp #10

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

Closed
InsanityAutomation wants to merge 2 commits into from
Closed

Update ubl_G29.cpp #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0bc502
Update ubl_G29.cpp
InsanityAutomation Aug 15, 2018
ecca64f
Update ultralcd.cpp
InsanityAutomation Aug 15, 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: 1 addition & 1 deletion Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@

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

// Invalidate Mesh Points. This command is a little bit asymmetrical because
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2937,7 +2937,7 @@ void lcd_quick_feedback(const bool clear_buttons) {

#if EXTRUDERS > 1
const int8_t old_extruder = active_extruder;
active_extruder = manual_move_e_index;
if (manual_move_axis == E_AXIS) active_extruder = manual_move_e_index;
#endif

// Set movement on a single axis
Expand All @@ -2963,7 +2963,7 @@ void lcd_quick_feedback(const bool clear_buttons) {

#else

planner.buffer_line_kinematic(current_position, MMM_TO_MMS(manual_feedrate_mm_m[manual_move_axis]), manual_move_e_index);
planner.buffer_line_kinematic(current_position, MMM_TO_MMS(manual_feedrate_mm_m[manual_move_axis]), manual_move_axis == E_AXIS ? manual_move_e_index : active_extruder);
manual_move_axis = (int8_t)NO_AXIS;

#endif
Expand Down