Merge pull request #11733 from marcio-ao/pr-relative-manual-extrusion-moves
[2.0.x] Show manual extrusion moves as relative in LCD
This commit is contained in:
		@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -425,6 +425,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#if ENABLED(ULTIPANEL)
 | 
					#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_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
 | 
					  #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 {120*60, 120*60, 18*60, 60}  // Feedrates for manual moves along X, Y, Z, E from panel
 | 
					  #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
 | 
					  #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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -425,6 +425,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#if ENABLED(ULTIPANEL)
 | 
					#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_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
 | 
					  #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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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 {80*60, 80*60, 12*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
 | 
					  #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
 | 
					  #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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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, 10*60, 60}  // Feedrates for manual moves along X, Y, Z, E from panel
 | 
					  #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
 | 
					  #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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -428,6 +428,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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -425,6 +425,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#if ENABLED(ULTIPANEL)
 | 
					#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_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
 | 
					  #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -426,6 +426,7 @@
 | 
				
			|||||||
#if ENABLED(ULTIPANEL)
 | 
					#if ENABLED(ULTIPANEL)
 | 
				
			||||||
  #define MANUAL_FEEDRATE_XYZ 50*60
 | 
					  #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_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
 | 
					  #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -426,6 +426,7 @@
 | 
				
			|||||||
#if ENABLED(ULTIPANEL)
 | 
					#if ENABLED(ULTIPANEL)
 | 
				
			||||||
  #define MANUAL_FEEDRATE_XYZ 50*60
 | 
					  #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_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
 | 
					  #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -426,6 +426,7 @@
 | 
				
			|||||||
#if ENABLED(ULTIPANEL)
 | 
					#if ENABLED(ULTIPANEL)
 | 
				
			||||||
  #define MANUAL_FEEDRATE_XYZ 50*60
 | 
					  #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_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
 | 
					  #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -426,6 +426,7 @@
 | 
				
			|||||||
#if ENABLED(ULTIPANEL)
 | 
					#if ENABLED(ULTIPANEL)
 | 
				
			||||||
  #define MANUAL_FEEDRATE_XYZ 50*60
 | 
					  #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_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
 | 
					  #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -426,6 +426,7 @@
 | 
				
			|||||||
#if ENABLED(ULTIPANEL)
 | 
					#if ENABLED(ULTIPANEL)
 | 
				
			||||||
  #define MANUAL_FEEDRATE_XYZ 50*60
 | 
					  #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_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
 | 
					  #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -431,6 +431,7 @@
 | 
				
			|||||||
#if ENABLED(ULTIPANEL)
 | 
					#if ENABLED(ULTIPANEL)
 | 
				
			||||||
  #define MANUAL_FEEDRATE_XYZ 50*60
 | 
					  #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_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
 | 
					  #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -426,6 +426,7 @@
 | 
				
			|||||||
#if ENABLED(ULTIPANEL)
 | 
					#if ENABLED(ULTIPANEL)
 | 
				
			||||||
  #define MANUAL_FEEDRATE_XYZ 50*60
 | 
					  #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_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
 | 
					  #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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user