bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Unify run_z_probe

Browse Source 
Unify run_z_probe
Add double touch for DELTAs.
Introduce Z_PROBE_SPEED_FAST and Z_PROBE_SPEED_SLOW
  defaulting to homing_feedrate_mm_m[Z_AXIS] and homing_feedrate_mm_m[Z_AXIS]/2
This commit is contained in:
AnHardt
2016-07-18 15:52:41 +02:00
committed by Scott Lahteine
parent e6e4d4062d
commit 09a3cc33e6
23 changed files with 114 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -499,6 +499,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/Felix/Configuration.h
View File

@ -481,6 +481,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -479,6 +479,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -491,6 +491,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

@ -493,6 +493,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/K8200/Configuration.h
View File

@ -516,6 +516,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/K8400/Configuration.h
View File

@ -499,6 +499,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

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

@ -499,6 +499,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -499,6 +499,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -496,6 +496,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -507,6 +507,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/TAZ4/Configuration.h
View File

@ -520,6 +520,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -491,6 +491,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -499,6 +499,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/delta/biv2.5/Configuration.h
View File

@ -541,6 +541,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
// Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
// Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.

4
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -541,6 +541,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
// Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
// Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.

4
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -541,6 +541,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
// Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
// Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.

4
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -532,6 +532,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
// Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
// Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.

4
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -539,6 +539,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
// Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
// Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.

4
Marlin/example_configurations/makibox/Configuration.h
View File

@ -502,6 +502,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.

4
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -489,6 +489,10 @@
// 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])
// Speed for the second approach when probing
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
//
// Allen Key Probe is defined in the Delta example configurations.