SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

2.0.x - Idex match119 (#11556)

Browse source 
* Update ubl_G29.cpp

* Update ultralcd.cpp
This commit is contained in:
InsanityAutomation 2018-08-15 14:26:11 -04:00 committed by Roxy-3D
parent e9de321ac0
commit c2553f9888
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

@ -304,10 +304,10 @@
// Check for commands that require the printer to be homed // Check for commands that require the printer to be homed
if (may_move) { if (may_move) {
if (axis_unhomed_error()) gcode.home_all_axes();
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
if (active_extruder != 0) tool_change(0); if (active_extruder != 0) tool_change(0);
#endif #endif
if (axis_unhomed_error()) gcode.home_all_axes();
} }
// Invalidate Mesh Points. This command is a little bit asymmetrical because // Invalidate Mesh Points. This command is a little bit asymmetrical because

4
Marlin/src/lcd/ultralcd.cpp
View file

@ -2937,7 +2937,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
const int8_t old_extruder = active_extruder; 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 #endif
// Set movement on a single axis // Set movement on a single axis
@ -2963,7 +2963,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
#else #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; manual_move_axis = (int8_t)NO_AXIS;
#endif #endif