mirror of
https://github.com/MarlinFirmware/Configurations.git
synced 2025-07-09 07:56:27 -06:00
HOMING_FEEDRATE_* fixups (#380)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
parent
fd9de51ba6
commit
3bc92bac51
21 changed files with 38 additions and 32 deletions
|
@ -999,7 +999,7 @@
|
|||
#define PROBING_MARGIN 10
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (40*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
|
|
@ -1487,8 +1487,8 @@
|
|||
#endif
|
||||
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_XY (40*60)
|
||||
#define HOMING_FEEDRATE_Z (6*60)
|
||||
#define HOMING_FEEDRATE_MM_M { (40*60), (40*60), HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
|
@ -1487,8 +1487,8 @@
|
|||
#endif
|
||||
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_XY (40*60)
|
||||
#define HOMING_FEEDRATE_Z (6*60)
|
||||
#define HOMING_FEEDRATE_MM_M { (40*60), (40*60), HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
|
@ -1487,8 +1487,8 @@
|
|||
#endif
|
||||
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_XY (40*60)
|
||||
#define HOMING_FEEDRATE_Z (6*60)
|
||||
#define HOMING_FEEDRATE_MM_M { (40*60), (40*60), HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
|
@ -999,13 +999,13 @@
|
|||
#define PROBING_MARGIN 0
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (40*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
#define Z_PROBE_SPEED_FAST homing_feedrate_mm_m.z
|
||||
|
||||
// Feedrate (mm/min) for the "accurate" probe of each point
|
||||
#define Z_PROBE_SPEED_SLOW HOMING_FEEDRATE_Z
|
||||
#define Z_PROBE_SPEED_SLOW Z_PROBE_SPEED_FAST
|
||||
|
||||
/**
|
||||
* Probe Activation Switch
|
||||
|
|
|
@ -999,7 +999,7 @@
|
|||
#define PROBING_MARGIN 10
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (80*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (20*60)
|
||||
|
|
|
@ -999,7 +999,7 @@
|
|||
#define PROBING_MARGIN 10
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (80*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (20*60)
|
||||
|
|
|
@ -997,7 +997,7 @@
|
|||
#define PROBING_MARGIN 0
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (50*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
|
|
@ -997,7 +997,7 @@
|
|||
#define PROBING_MARGIN 0
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (50*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
|
|
@ -999,7 +999,7 @@
|
|||
#define PROBING_MARGIN 0
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (50*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
|
|
@ -998,7 +998,7 @@
|
|||
#define PROBING_MARGIN 0
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (50*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
|
|
@ -997,7 +997,7 @@
|
|||
#define PROBING_MARGIN 0
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (50*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
|
|
@ -999,7 +999,7 @@
|
|||
#define PROBING_MARGIN 0
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (50*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
|
|
@ -999,7 +999,7 @@
|
|||
#define PROBING_MARGIN 0
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (50*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
|
|
@ -1005,7 +1005,7 @@
|
|||
#define PROBING_MARGIN 1
|
||||
|
||||
// X and Y axis travel speed (mm/min) between probes
|
||||
#define XY_PROBE_SPEED HOMING_FEEDRATE_XY
|
||||
#define XY_PROBE_SPEED (40*60)
|
||||
|
||||
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
|
||||
#define Z_PROBE_SPEED_FAST (4*60)
|
||||
|
@ -1499,7 +1499,7 @@
|
|||
#endif
|
||||
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_MM_M { (HOMING_FEEDRATE_Z*10), (HOMING_FEEDRATE_Z*10), (4*60) }
|
||||
#define HOMING_FEEDRATE_MM_M { (40*60), (40*60), (4*60) }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
@ -1636,8 +1636,8 @@
|
|||
//#define NOZZLE_PARK_X_ONLY // X move only is required to park
|
||||
//#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
|
||||
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
|
||||
#define NOZZLE_PARK_XY_FEEDRATE (HOMING_FEEDRATE_XY/60) // (mm/s) X and Y axes feedrate (also used for delta Z axis)
|
||||
#define NOZZLE_PARK_Z_FEEDRATE (HOMING_FEEDRATE_Z/60) // (mm/s) Z axis feedrate (not used for delta printers)
|
||||
#define NOZZLE_PARK_XY_FEEDRATE 40 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
|
||||
#define NOZZLE_PARK_Z_FEEDRATE 4 // (mm/s) Z axis feedrate (not used for delta printers)
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
|
|
@ -1591,7 +1591,8 @@
|
|||
#endif
|
||||
|
||||
// Homing speeds (mm/min)
|
||||
//#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (100*60) }
|
||||
#define HOMING_FEEDRATE_Z (100*60)
|
||||
#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
|
@ -1590,8 +1590,9 @@
|
|||
#define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing
|
||||
#endif
|
||||
|
||||
// Delta only homes to Z
|
||||
#define HOMING_FEEDRATE_MM_M { (60*60), (60*60), (60*60) }
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_Z (60*60)
|
||||
#define HOMING_FEEDRATE_MM_M { HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
|
@ -1590,8 +1590,9 @@
|
|||
#define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing
|
||||
#endif
|
||||
|
||||
// Delta only homes to Z
|
||||
#define HOMING_FEEDRATE_MM_M { (60*60), (60*60), (60*60) }
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_Z (60*60)
|
||||
#define HOMING_FEEDRATE_MM_M { HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
|
@ -1590,8 +1590,9 @@
|
|||
#define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing
|
||||
#endif
|
||||
|
||||
// Delta only homes to Z
|
||||
#define HOMING_FEEDRATE_MM_M { (60*60), (60*60), (60*60) }
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_Z (60*60)
|
||||
#define HOMING_FEEDRATE_MM_M { HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
|
@ -1590,8 +1590,9 @@
|
|||
#define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing
|
||||
#endif
|
||||
|
||||
// Delta only homes to Z
|
||||
#define HOMING_FEEDRATE_MM_M { (60*60), (60*60), (60*60) }
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_Z (60*60)
|
||||
#define HOMING_FEEDRATE_MM_M { HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
|
@ -1591,8 +1591,9 @@
|
|||
#define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing
|
||||
#endif
|
||||
|
||||
// Delta only homes to Z
|
||||
#define HOMING_FEEDRATE_MM_M { (60*60), (60*60), (60*60) }
|
||||
// Homing speeds (mm/min)
|
||||
#define HOMING_FEEDRATE_Z (60*60)
|
||||
#define HOMING_FEEDRATE_MM_M { HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z, HOMING_FEEDRATE_Z }
|
||||
|
||||
// Validate that endstops are triggered on homing moves
|
||||
#define VALIDATE_HOMING_ENDSTOPS
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue