zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix manual moves for switching tools (#10868)

Browse source
This commit is contained in:
Scott Lahteine 2018-05-26 18:30:53 -05:00 committed by GitHub
parent 1da2c4f1c1
commit cf7d5a642a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_LCD.h
View file

@ -426,10 +426,8 @@
#if ENABLED(SWITCHING_EXTRUDER) // One stepper for every two EXTRUDERS #if ENABLED(SWITCHING_EXTRUDER) // One stepper for every two EXTRUDERS
#if EXTRUDERS > 4 #if EXTRUDERS > 4
#define E_STEPPERS 3 #define E_STEPPERS 3
#define E_MANUAL 3
#elif EXTRUDERS > 2 #elif EXTRUDERS > 2
#define E_STEPPERS 2 #define E_STEPPERS 2
#define E_MANUAL 2
#else #else
#define E_STEPPERS 1 #define E_STEPPERS 1
#endif #endif

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

@ -3260,6 +3260,20 @@ void lcd_quick_feedback(const bool clear_buttons) {
#endif #endif
#if ENABLED(SWITCHING_EXTRUDER) || ENABLED(SWITCHING_NOZZLE)
// Only the current...
MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_get_e_amount);
// ...and the non-switching
#if E_MANUAL == 5
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E5, lcd_move_get_e4_amount);
#elif E_MANUAL == 3
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E3, lcd_move_get_e2_amount);
#endif
#else
// Independent extruders with one E-stepper per hotend
MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_get_e_amount); MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_get_e_amount);
#if E_MANUAL > 1 #if E_MANUAL > 1
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E1, lcd_move_get_e0_amount); MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E1, lcd_move_get_e0_amount);
@ -3275,6 +3289,8 @@ void lcd_quick_feedback(const bool clear_buttons) {
#endif // E_MANUAL > 2 #endif // E_MANUAL > 2
#endif // E_MANUAL > 1 #endif // E_MANUAL > 1
#endif
END_MENU(); END_MENU();
} }