Browse Source

Set homing feedrates individually

pull/1/head
Scott Lahteine 8 years ago
parent
commit
204fd6ec44
  1. 4
      Marlin/Conditionals.h
  2. 4
      Marlin/Configuration.h
  3. 9
      Marlin/Marlin_main.cpp
  4. 2
      Marlin/SanityCheck.h
  5. 4
      Marlin/example_configurations/Cartesio/Configuration.h
  6. 4
      Marlin/example_configurations/Felix/Configuration.h
  7. 4
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  8. 4
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 4
      Marlin/example_configurations/Hephestos_2/Configuration.h
  10. 4
      Marlin/example_configurations/K8200/Configuration.h
  11. 4
      Marlin/example_configurations/K8400/Configuration.h
  12. 4
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  13. 4
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 4
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 4
      Marlin/example_configurations/SCARA/Configuration.h
  16. 4
      Marlin/example_configurations/TAZ4/Configuration.h
  17. 4
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 4
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  19. 6
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  20. 6
      Marlin/example_configurations/delta/generic/Configuration.h
  21. 6
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  22. 6
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  23. 6
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  24. 4
      Marlin/example_configurations/makibox/Configuration.h
  25. 4
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

4
Marlin/Conditionals.h

@ -829,8 +829,8 @@
#define Z_PROBE_OFFSET_RANGE_MAX 20 #define Z_PROBE_OFFSET_RANGE_MAX 20
#endif #endif
#ifndef XY_PROBE_SPEED #ifndef XY_PROBE_SPEED
#ifdef HOMING_FEEDRATE_XYZ #ifdef HOMING_FEEDRATE_XY
#define XY_PROBE_SPEED HOMING_FEEDRATE_XYZ #define XY_PROBE_SPEED HOMING_FEEDRATE_XY
#else #else
#define XY_PROBE_SPEED 4000 #define XY_PROBE_SPEED 4000
#endif #endif

4
Marlin/Configuration.h

@ -756,7 +756,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
// default settings // default settings

9
Marlin/Marlin_main.cpp

@ -306,7 +306,14 @@ static uint8_t cmd_queue_index_r = 0,
* Feed rates are often configured with mm/m * Feed rates are often configured with mm/m
* but the planner and stepper like mm/s units. * but the planner and stepper like mm/s units.
*/ */
const float homing_feedrate_mm_m[] = HOMING_FEEDRATE; const float homing_feedrate_mm_m[] = {
#if ENABLED(DELTA)
HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z,
#else
HOMING_FEEDRATE_XY, HOMING_FEEDRATE_XY,
#endif
HOMING_FEEDRATE_Z, 0
};
static float feedrate_mm_m = 1500.0, saved_feedrate_mm_m; static float feedrate_mm_m = 1500.0, saved_feedrate_mm_m;
int feedrate_percentage = 100, saved_feedrate_percentage; int feedrate_percentage = 100, saved_feedrate_percentage;

2
Marlin/SanityCheck.h

@ -682,6 +682,8 @@
#error "ABS_PREHEAT_FAN_SPEED is now PREHEAT_2_FAN_SPEED. Please update your configuration." #error "ABS_PREHEAT_FAN_SPEED is now PREHEAT_2_FAN_SPEED. Please update your configuration."
#elif defined(ENDSTOPS_ONLY_FOR_HOMING) #elif defined(ENDSTOPS_ONLY_FOR_HOMING)
#error "ENDSTOPS_ONLY_FOR_HOMING is deprecated. Use (disable) ENDSTOPS_ALWAYS_ON_DEFAULT instead." #error "ENDSTOPS_ONLY_FOR_HOMING is deprecated. Use (disable) ENDSTOPS_ALWAYS_ON_DEFAULT instead."
#elif defined(HOMING_FEEDRATE)
#error "HOMING_FEEDRATE is deprecated. Set individual rates with HOMING_FEEDRATE_(XY|Z|E) instead."
#endif #endif
#endif //SANITYCHECK_H #endif //SANITYCHECK_H

4
Marlin/example_configurations/Cartesio/Configuration.h

@ -756,7 +756,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {3000, 3000, 600, 20} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (10*60)
// default settings // default settings

4
Marlin/example_configurations/Felix/Configuration.h

@ -738,7 +738,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
// default settings // default settings

4
Marlin/example_configurations/Felix/DUAL/Configuration.h

@ -736,7 +736,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
// default settings // default settings

4
Marlin/example_configurations/Hephestos/Configuration.h

@ -748,7 +748,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {2000, 2000, 150, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY 2000
#define HOMING_FEEDRATE_Z 150
// default settings // default settings

4
Marlin/example_configurations/Hephestos_2/Configuration.h

@ -750,7 +750,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {150*60, 150*60, 3.3*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (150*60)
#define HOMING_FEEDRATE_Z 200
// default settings // default settings

4
Marlin/example_configurations/K8200/Configuration.h

@ -773,7 +773,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
// default settings // default settings

4
Marlin/example_configurations/K8400/Configuration.h

@ -756,7 +756,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 8*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (8*60)
// default settings // default settings

4
Marlin/example_configurations/K8400/Dual-head/Configuration.h

@ -756,7 +756,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 8*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (8*60)
// default settings // default settings

4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h

@ -756,7 +756,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
// default settings // default settings

4
Marlin/example_configurations/RigidBot/Configuration.h

@ -753,7 +753,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 15*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (15*60)
// default settings // default settings

4
Marlin/example_configurations/SCARA/Configuration.h

@ -764,7 +764,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {40*60, 40*60, 10*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (40*60)
#define HOMING_FEEDRATE_Z (10*60)
// default settings // default settings

4
Marlin/example_configurations/TAZ4/Configuration.h

@ -777,7 +777,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 8*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (8*60)
// default settings // default settings

4
Marlin/example_configurations/WITBOX/Configuration.h

@ -748,7 +748,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {120*60, 120*60, 7.2*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (120*60)
#define HOMING_FEEDRATE_Z 432
// default settings // default settings

4
Marlin/example_configurations/adafruit/ST7565/Configuration.h

@ -756,7 +756,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
// default settings // default settings

6
Marlin/example_configurations/delta/biv2.5/Configuration.h

@ -848,10 +848,8 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
// delta homing speeds must be the same on xyz // Delta only homes to Z
#define HOMING_FEEDRATE_XYZ (200*30) #define HOMING_FEEDRATE_Z (200*30)
#define HOMING_FEEDRATE_E 0
#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
// default settings // default settings
// delta speeds must be the same on xyz // delta speeds must be the same on xyz

6
Marlin/example_configurations/delta/generic/Configuration.h

@ -842,10 +842,8 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
// delta homing speeds must be the same on xyz // Delta only homes to Z
#define HOMING_FEEDRATE_XYZ (200*60) #define HOMING_FEEDRATE_Z (200*60)
#define HOMING_FEEDRATE_E 0
#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
// default settings // default settings
// delta speeds must be the same on xyz // delta speeds must be the same on xyz

6
Marlin/example_configurations/delta/kossel_mini/Configuration.h

@ -845,10 +845,8 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
// delta homing speeds must be the same on xyz // Delta only homes to Z
#define HOMING_FEEDRATE_XYZ (200*60) #define HOMING_FEEDRATE_Z (200*60)
#define HOMING_FEEDRATE_E 0
#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
// default settings // default settings
// delta speeds must be the same on xyz // delta speeds must be the same on xyz

6
Marlin/example_configurations/delta/kossel_pro/Configuration.h

@ -839,10 +839,8 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
// delta homing speeds must be the same on xyz // Delta only homes to Z
#define HOMING_FEEDRATE_XYZ (200*60) #define HOMING_FEEDRATE_Z (200*60)
#define HOMING_FEEDRATE_E 0
#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
#define XYZ_FULL_STEPS_PER_ROTATION 200 #define XYZ_FULL_STEPS_PER_ROTATION 200
#define XYZ_MICROSTEPS 32 #define XYZ_MICROSTEPS 32

6
Marlin/example_configurations/delta/kossel_xl/Configuration.h

@ -840,10 +840,8 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
// delta homing speeds must be the same on xyz // Delta only homes to Z
#define HOMING_FEEDRATE_XYZ (60*60) #define HOMING_FEEDRATE_Z (60*60)
#define HOMING_FEEDRATE_E 0
#define HOMING_FEEDRATE { HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_XYZ, HOMING_FEEDRATE_E }
// variables to calculate steps // variables to calculate steps
#define XYZ_FULL_STEPS_PER_ROTATION 200 #define XYZ_FULL_STEPS_PER_ROTATION 200

4
Marlin/example_configurations/makibox/Configuration.h

@ -759,7 +759,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {1500, 1500, 120, 0} // set the homing speeds (mm/min) ***** MakiBox A6 ***** // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY 1500
#define HOMING_FEEDRATE_Z (2*60)
// default settings // default settings

4
Marlin/example_configurations/tvrrug/Round2/Configuration.h

@ -746,7 +746,9 @@
* MOVEMENT SETTINGS * MOVEMENT SETTINGS
*/ */
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
// default settings // default settings

Loading…
Cancel
Save