Browse Source
Merge pull request #11733 from marcio-ao/pr-relative-manual-extrusion-moves
[2.0.x] Show manual extrusion moves as relative in LCD
pull/1/head
Scott Lahteine
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with
58 additions and
1 deletions
Marlin/Configuration_adv.h
Marlin/src/config/default/Configuration_adv.h
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
Marlin/src/config/examples/Anet/A6/Configuration_adv.h
Marlin/src/config/examples/Anet/A8/Configuration_adv.h
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
Marlin/src/config/examples/Cartesio/Configuration_adv.h
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
Marlin/src/config/examples/Felix/Configuration_adv.h
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
Marlin/src/config/examples/MakerParts/Configuration_adv.h
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
Marlin/src/config/examples/RigidBot/Configuration_adv.h
Marlin/src/config/examples/SCARA/Configuration_adv.h
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
Marlin/src/config/examples/TheBorg/Configuration_adv.h
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
Marlin/src/config/examples/delta/generic/Configuration_adv.h
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
Marlin/src/config/examples/makibox/Configuration_adv.h
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
Marlin/src/config/examples/wt150/Configuration_adv.h
Marlin/src/lcd/ultralcd.cpp
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE {120*60, 120*60, 18*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
# endif
@ -425,6 +425,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE {120*60, 120*60, 18*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
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 0} // 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
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE {80*60, 80*60, 12*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
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE {50*60, 50*60, 10*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
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -428,6 +428,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE {70*60, 70*60, 15*60, 6*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
# endif
@ -426,6 +426,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE_XYZ 50*60
# define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 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
# endif
@ -426,6 +426,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE_XYZ 50*60
# define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 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
# endif
@ -426,6 +426,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE_XYZ 50*60
# define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 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
# endif
@ -426,6 +426,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE_XYZ 50*60
# define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 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
# endif
@ -426,6 +426,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE_XYZ 50*60
# define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 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
# endif
@ -431,6 +431,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE_XYZ 50*60
# define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 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
# endif
@ -426,6 +426,7 @@
# if ENABLED(ULTIPANEL)
# define MANUAL_FEEDRATE_XYZ 50*60
# define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 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
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -425,6 +425,7 @@
# 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_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
# define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
# endif
@ -477,6 +477,10 @@ uint16_t max_display_update_time = 0;
# define manual_move_e_index 0
# endif
# if ENABLED(MANUAL_E_MOVES_RELATIVE)
float manual_move_e_origin = 0 ;
# endif
# if IS_KINEMATIC
bool processing_manual_move = false ;
float manual_move_offset = 0 ;
@ -3066,6 +3070,9 @@ void lcd_quick_feedback(const bool clear_buttons) {
# if IS_KINEMATIC
+ manual_move_offset
# 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 :
STATIC_ITEM ( MSG_MOVE_Z , true , true ) ; break ;
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 ) ;