From 4a6ed5e22170d26b8c4eb907a32b46830ba46f2b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 19 Jul 2016 18:21:38 -0700 Subject: [PATCH] Use HOMING_FEEDRATE_Z for Z_PROBE_SPEED_FAST --- Marlin/Configuration.h | 2 +- Marlin/example_configurations/Cartesio/Configuration.h | 2 +- Marlin/example_configurations/Felix/Configuration.h | 2 +- Marlin/example_configurations/Felix/DUAL/Configuration.h | 2 +- Marlin/example_configurations/Hephestos/Configuration.h | 2 +- Marlin/example_configurations/Hephestos_2/Configuration.h | 2 +- Marlin/example_configurations/K8200/Configuration.h | 2 +- Marlin/example_configurations/K8400/Configuration.h | 2 +- Marlin/example_configurations/K8400/Dual-head/Configuration.h | 2 +- .../RepRapWorld/Megatronics/Configuration.h | 2 +- Marlin/example_configurations/RigidBot/Configuration.h | 2 +- Marlin/example_configurations/SCARA/Configuration.h | 2 +- Marlin/example_configurations/TAZ4/Configuration.h | 2 +- Marlin/example_configurations/WITBOX/Configuration.h | 2 +- Marlin/example_configurations/adafruit/ST7565/Configuration.h | 2 +- Marlin/example_configurations/delta/biv2.5/Configuration.h | 2 +- Marlin/example_configurations/delta/generic/Configuration.h | 2 +- Marlin/example_configurations/delta/kossel_mini/Configuration.h | 2 +- Marlin/example_configurations/delta/kossel_pro/Configuration.h | 2 +- Marlin/example_configurations/delta/kossel_xl/Configuration.h | 2 +- Marlin/example_configurations/makibox/Configuration.h | 2 +- Marlin/example_configurations/tvrrug/Round2/Configuration.h | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 68d117f4f3..d934986bdd 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -500,7 +500,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 14641bbb87..212e9f00f5 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -500,7 +500,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 7fa9c3dd29..fb0634db7c 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -482,7 +482,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index b9eadd04d6..3608f21481 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -480,7 +480,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 80a3eabab9..44913e1383 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -492,7 +492,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 7e62f2caac..acbe2377df 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -494,7 +494,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 3db1bc4d81..a19b23e170 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -517,7 +517,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index 32ebd19145..caab776991 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -500,7 +500,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index d4090f958a..399f426992 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -500,7 +500,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index c7875a4d9c..7f4af7eb70 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -500,7 +500,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 7e3e0cb095..26ca4d7469 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -497,7 +497,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 01ec60e675..2848d8974b 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -508,7 +508,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 8f18e4e4db..e1b15532f4 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -521,7 +521,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 12f1175664..4182d2e043 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -492,7 +492,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 641d18f8d4..7c41be3f05 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -500,7 +500,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 81cdce7311..69c2e068a4 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -542,7 +542,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 4000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 20f5ee8fd3..cbaa2a58cb 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -542,7 +542,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 4000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index c24447b126..a9b717bab5 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -542,7 +542,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 4000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 317ab54d0c..36e9131102 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -533,7 +533,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index c5e6c2aeb3..809d77ca19 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -540,7 +540,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 6d6b0bb258..2092bf1983 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -503,7 +503,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 48c54569a0..264bb55343 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -490,7 +490,7 @@ // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 // Speed for the first approach when probing -#define Z_PROBE_SPEED_FAST (homing_feedrate_mm_m[Z_AXIS]) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z // Speed for the second approach when probing #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)