Use HOMING_FEEDRATE_Z for Z_PROBE_SPEED_FAST

9 years ago · 4a6ed5e221
parent 09a3cc33e6
commit 4a6ed5e221
22 changed files with 22 additions and 22 deletions
--- 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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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