diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 68d117f4f..d934986bd 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 14641bbb8..212e9f00f 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 7fa9c3dd2..fb0634db7 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 b9eadd04d..3608f2148 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 80a3eabab..44913e138 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 7e62f2caa..acbe2377d 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 3db1bc4d8..a19b23e17 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 32ebd1914..caab77699 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 d4090f958..399f42699 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 c7875a4d9..7f4af7eb7 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 7e3e0cb09..26ca4d746 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 01ec60e67..2848d8974 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 8f18e4e4d..e1b15532f 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 12f117566..4182d2e04 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 641d18f8d..7c41be3f0 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 81cdce731..69c2e068a 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 20f5ee8fd..cbaa2a58c 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 c24447b12..a9b717bab 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 317ab54d0..36e913110 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 c5e6c2aeb..809d77ca1 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 6d6b0bb25..2092bf198 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 48c54569a..264bb5534 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)