Browse Source

Unify manual feedrate and Fix LCD MANUAL_FEEDRATE (PR#128)

As noted by @o-lampe at https://github.com/MarlinFirmware/MarlinDev/issues/114#issuecomment-136757614 the `MANUAL_FEEDRATE` for Delta Z should be the same as XY.
Scott Lahteine 9 years ago
parent
commit
7c72b57313

+ 2
- 1
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

247
 // @section lcd
247
 // @section lcd
248
 
248
 
249
 #if ENABLED(ULTIPANEL)
249
 #if ENABLED(ULTIPANEL)
250
-  #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
250
+  #define MANUAL_FEEDRATE_XYZ 50*60
251
+  #define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
251
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
252
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
252
 #endif
253
 #endif
253
 
254
 

+ 2
- 1
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

247
 // @section lcd
247
 // @section lcd
248
 
248
 
249
 #if ENABLED(ULTIPANEL)
249
 #if ENABLED(ULTIPANEL)
250
-  #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
250
+  #define MANUAL_FEEDRATE_XYZ 50*60
251
+  #define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
251
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
252
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
252
 #endif
253
 #endif
253
 
254
 

+ 2
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

247
 // @section lcd
247
 // @section lcd
248
 
248
 
249
 #if ENABLED(ULTIPANEL)
249
 #if ENABLED(ULTIPANEL)
250
-  #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
250
+  #define MANUAL_FEEDRATE_XYZ 50*60
251
+  #define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
251
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
252
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
252
 #endif
253
 #endif
253
 
254
 

+ 2
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

251
 // @section lcd
251
 // @section lcd
252
 
252
 
253
 #if ENABLED(ULTIPANEL)
253
 #if ENABLED(ULTIPANEL)
254
-  #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
254
+  #define MANUAL_FEEDRATE_XYZ 50*60
255
+  #define MANUAL_FEEDRATE { MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, MANUAL_FEEDRATE_XYZ, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
255
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
256
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
256
 #endif
257
 #endif
257
 
258
 

Loading…
Cancel
Save