forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4358 from thinkyhead/rc_individual_homing_rates

Browse Source 
Set homing feedrates individually
master
Scott Lahteine 8 years ago committed by GitHub
parent e6e4d4062d e44b37cdc2
commit 792fff5771
25 changed files with 145 additions and 150 deletions
Show Stats Download Patch File Download Diff File

4
Marlin/Conditionals.h
Unescape View File

@ -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

12
Marlin/Configuration.h
Unescape View File

@ -749,14 +749,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

9
Marlin/Marlin_main.cpp
Unescape View File

@ -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
Unescape View File

@ -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

12
Marlin/example_configurations/Cartesio/Configuration.h
Unescape View File

@ -749,14 +749,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (10*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {3000, 3000, 600, 20} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/Felix/Configuration.h
Unescape View File

@ -731,14 +731,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/Felix/DUAL/Configuration.h
Unescape View File

@ -729,14 +729,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/Hephestos/Configuration.h
Unescape View File

@ -741,14 +741,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY 2000
#define HOMING_FEEDRATE_Z 150
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {2000, 2000, 150, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/Hephestos_2/Configuration.h
Unescape View File

@ -743,14 +743,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (150*60)
#define HOMING_FEEDRATE_Z 200
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {150*60, 150*60, 3.3*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/K8200/Configuration.h
Unescape View File

@ -766,14 +766,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/K8400/Configuration.h
Unescape View File

@ -749,14 +749,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (8*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 8*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/K8400/Dual-head/Configuration.h
Unescape View File

@ -749,14 +749,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (8*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 8*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape View File

@ -749,14 +749,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/RigidBot/Configuration.h
Unescape View File

@ -746,14 +746,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (15*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 15*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

@ -757,14 +757,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (40*60)
#define HOMING_FEEDRATE_Z (10*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {40*60, 40*60, 10*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/TAZ4/Configuration.h
Unescape View File

@ -770,14 +770,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (8*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 8*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/WITBOX/Configuration.h
Unescape View File

@ -741,14 +741,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (120*60)
#define HOMING_FEEDRATE_Z 432
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {120*60, 120*60, 7.2*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

12
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape View File

@ -749,14 +749,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

15
Marlin/example_configurations/delta/biv2.5/Configuration.h
Unescape View File

@ -842,16 +842,13 @@
#endif #endif
// @section motion // Delta only homes to Z
#define HOMING_FEEDRATE_Z (200*30)
/**
* MOVEMENT SETTINGS
*/
// delta homing speeds must be the same on xyz //
#define HOMING_FEEDRATE_XYZ (200*30) // MOVEMENT SETTINGS
#define HOMING_FEEDRATE_E 0 // @section motion
#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

15
Marlin/example_configurations/delta/generic/Configuration.h
Unescape View File

@ -836,16 +836,13 @@
#endif #endif
// @section motion // Delta only homes to Z
#define HOMING_FEEDRATE_Z (200*60)
/**
* MOVEMENT SETTINGS
*/
// delta homing speeds must be the same on xyz //
#define HOMING_FEEDRATE_XYZ (200*60) // MOVEMENT SETTINGS
#define HOMING_FEEDRATE_E 0 // @section motion
#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

15
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape View File

@ -839,16 +839,13 @@
#endif #endif
// @section motion // Delta only homes to Z
#define HOMING_FEEDRATE_Z (200*60)
/**
* MOVEMENT SETTINGS
*/
// delta homing speeds must be the same on xyz //
#define HOMING_FEEDRATE_XYZ (200*60) // MOVEMENT SETTINGS
#define HOMING_FEEDRATE_E 0 // @section motion
#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

15
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape View File

@ -833,16 +833,13 @@
#endif #endif
// @section motion // Delta only homes to Z
#define HOMING_FEEDRATE_Z (200*60)
/**
* MOVEMENT SETTINGS
*/
// delta homing speeds must be the same on xyz //
#define HOMING_FEEDRATE_XYZ (200*60) // MOVEMENT SETTINGS
#define HOMING_FEEDRATE_E 0 // @section motion
#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

16
Marlin/example_configurations/delta/kossel_xl/Configuration.h
Unescape View File

@ -833,17 +833,13 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Delta only homes to Z
#define HOMING_FEEDRATE_Z (60*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
// delta homing speeds must be the same on xyz
#define HOMING_FEEDRATE_XYZ (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
@ -854,6 +850,8 @@
// delta speeds must be the same on xyz // delta speeds must be the same on xyz
#define XYZ_STEPS (XYZ_FULL_STEPS_PER_ROTATION * XYZ_MICROSTEPS / double(XYZ_BELT_PITCH) / double(XYZ_PULLEY_TEETH)) #define XYZ_STEPS (XYZ_FULL_STEPS_PER_ROTATION * XYZ_MICROSTEPS / double(XYZ_BELT_PITCH) / double(XYZ_PULLEY_TEETH))
// default settings
#define DEFAULT_AXIS_STEPS_PER_UNIT {XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 158} // default steps per unit for PowerWasp #define DEFAULT_AXIS_STEPS_PER_UNIT {XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 158} // default steps per unit for PowerWasp
#define DEFAULT_MAX_FEEDRATE {200, 200, 200, 25} // (mm/sec) #define DEFAULT_MAX_FEEDRATE {200, 200, 200, 25} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {9000,9000,9000,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot. #define DEFAULT_MAX_ACCELERATION {9000,9000,9000,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.

12
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -752,14 +752,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY 1500
#define HOMING_FEEDRATE_Z (2*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {1500, 1500, 120, 0} // set the homing speeds (mm/min) ***** MakiBox A6 *****
// default settings // default settings

12
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -739,14 +739,14 @@
#define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28).
#endif #endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
//
// MOVEMENT SETTINGS
// @section motion // @section motion
//
/**
* MOVEMENT SETTINGS
*/
#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min)
// default settings // default settings

Write Preview
Loading…
Cancel
Save