mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-11-27 13:56:24 +00:00
Show manual extrusion moves as relative in LCD
- Implements FR#11724 - Old behavior can be restored by commenting out MANUAL_E_MOVES_RELATIVE
This commit is contained in:
parent
d10f29ae2e
commit
beb51c2d58
@ -425,6 +425,7 @@
|
|||||||
|
|
||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
|
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
|
||||||
|
#define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
|
||||||
#define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
|
#define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -425,6 +425,7 @@
|
|||||||
|
|
||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
|
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
|
||||||
|
#define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
|
||||||
#define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
|
#define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -477,6 +477,10 @@ uint16_t max_display_update_time = 0;
|
|||||||
#define manual_move_e_index 0
|
#define manual_move_e_index 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(MANUAL_E_MOVES_RELATIVE)
|
||||||
|
float manual_move_e_origin = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if IS_KINEMATIC
|
#if IS_KINEMATIC
|
||||||
bool processing_manual_move = false;
|
bool processing_manual_move = false;
|
||||||
float manual_move_offset = 0;
|
float manual_move_offset = 0;
|
||||||
@ -3066,6 +3070,9 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
|||||||
#if IS_KINEMATIC
|
#if IS_KINEMATIC
|
||||||
+ manual_move_offset
|
+ manual_move_offset
|
||||||
#endif
|
#endif
|
||||||
|
#if ENABLED(MANUAL_E_MOVES_RELATIVE)
|
||||||
|
- manual_move_e_origin
|
||||||
|
#endif
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3114,7 +3121,11 @@ void lcd_quick_feedback(const bool clear_buttons) {
|
|||||||
case Z_AXIS:
|
case Z_AXIS:
|
||||||
STATIC_ITEM(MSG_MOVE_Z, true, true); break;
|
STATIC_ITEM(MSG_MOVE_Z, true, true); break;
|
||||||
default:
|
default:
|
||||||
STATIC_ITEM(MSG_MOVE_E, true, true); break;
|
#if ENABLED(MANUAL_E_MOVES_RELATIVE)
|
||||||
|
manual_move_e_origin = current_position[E_AXIS];
|
||||||
|
#endif
|
||||||
|
STATIC_ITEM(MSG_MOVE_E, true, true);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MENU_BACK(MSG_MOVE_AXIS);
|
MENU_BACK(MSG_MOVE_AXIS);
|
||||||
|
Loading…
Reference in New Issue
Block a user