melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix DUAL_X_CARRIAGE manual moves, add T0/T1 menu item

Browse Source
This commit is contained in:
Scott Lahteine 2017-10-02 23:35:55 -05:00
parent a8b8d4e85e
commit ca3c9baf1b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/ultralcd.cpp
View File

@ -2750,9 +2750,13 @@ void kill_screen(const char* lcd_msg) {
, int8_t eindex=-1 , int8_t eindex=-1
#endif #endif
) { ) {
#if ENABLED(DUAL_X_CARRIAGE) || E_MANUAL > 1
#if E_MANUAL > 1 #if E_MANUAL > 1
if (axis == E_AXIS) manual_move_e_index = eindex >= 0 ? eindex : active_extruder; if (axis == E_AXIS)
#endif #endif
manual_move_e_index = eindex >= 0 ? eindex : active_extruder;
#endif
manual_move_start_time = millis() + (move_menu_scale < 0.99 ? 0UL : 250UL); // delay for bigger moves manual_move_start_time = millis() + (move_menu_scale < 0.99 ? 0UL : 250UL); // delay for bigger moves
manual_move_axis = (int8_t)axis; manual_move_axis = (int8_t)axis;
} }
@ -2963,7 +2967,7 @@ void kill_screen(const char* lcd_msg) {
else else
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
#if ENABLED(SWITCHING_EXTRUDER) #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(DUAL_X_CARRIAGE)
if (active_extruder) if (active_extruder)
MENU_ITEM(gcode, MSG_SELECT " " MSG_E1, PSTR("T0")); MENU_ITEM(gcode, MSG_SELECT " " MSG_E1, PSTR("T0"));
else else