bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Add e index to _lcd_move_distance_menu

Browse Source
This commit is contained in:
Scott Lahteine 2018-10-22 23:34:49 -05:00
parent 3a46212dd8
commit a553ab82e0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3206,7 +3206,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
void lcd_move_menu_1mm() { _goto_manual_move( 1); } void lcd_move_menu_1mm() { _goto_manual_move( 1); }
void lcd_move_menu_01mm() { _goto_manual_move( 0.1f); } void lcd_move_menu_01mm() { _goto_manual_move( 0.1f); }
void _lcd_move_distance_menu(const AxisEnum axis, const screenFunc_t func) { void _lcd_move_distance_menu(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=-1) {
_manual_move_func_ptr = func; _manual_move_func_ptr = func;
START_MENU(); START_MENU();
if (LCD_HEIGHT >= 4) { if (LCD_HEIGHT >= 4) {
@ -3226,7 +3226,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
} }
} }
#if ENABLED(PREVENT_COLD_EXTRUSION) #if ENABLED(PREVENT_COLD_EXTRUSION)
if (thermalManager.tooColdToExtrude(active_extruder)) if (thermalManager.tooColdToExtrude(eindex >= 0 ? eindex : active_extruder))
MENU_BACK(MSG_HOTEND_TOO_COLD); MENU_BACK(MSG_HOTEND_TOO_COLD);
else else
#endif #endif
@ -3241,18 +3241,18 @@ void lcd_quick_feedback(const bool clear_buttons) {
void lcd_move_get_x_amount() { _lcd_move_distance_menu(X_AXIS, lcd_move_x); } void lcd_move_get_x_amount() { _lcd_move_distance_menu(X_AXIS, lcd_move_x); }
void lcd_move_get_y_amount() { _lcd_move_distance_menu(Y_AXIS, lcd_move_y); } void lcd_move_get_y_amount() { _lcd_move_distance_menu(Y_AXIS, lcd_move_y); }
void lcd_move_get_z_amount() { _lcd_move_distance_menu(Z_AXIS, lcd_move_z); } void lcd_move_get_z_amount() { _lcd_move_distance_menu(Z_AXIS, lcd_move_z); }
void lcd_move_get_e_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e); } void lcd_move_get_e_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e, -1); }
#if E_MANUAL > 1 #if E_MANUAL > 1
void lcd_move_get_e0_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e0); } void lcd_move_get_e0_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e0, 0); }
void lcd_move_get_e1_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e1); } void lcd_move_get_e1_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e1, 1); }
#if E_MANUAL > 2 #if E_MANUAL > 2
void lcd_move_get_e2_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e2); } void lcd_move_get_e2_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e2, 2); }
#if E_MANUAL > 3 #if E_MANUAL > 3
void lcd_move_get_e3_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e3); } void lcd_move_get_e3_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e3, 3); }
#if E_MANUAL > 4 #if E_MANUAL > 4
void lcd_move_get_e4_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e4); } void lcd_move_get_e4_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e4, 4); }
#if E_MANUAL > 5 #if E_MANUAL > 5
void lcd_move_get_e5_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e5); } void lcd_move_get_e5_amount() { _lcd_move_distance_menu(E_AXIS, lcd_move_e5, 5); }
#endif // E_MANUAL > 5 #endif // E_MANUAL > 5
#endif // E_MANUAL > 4 #endif // E_MANUAL > 4
#endif // E_MANUAL > 3 #endif // E_MANUAL > 3