3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4066 from thinkyhead/rc_M851_with_probe

Browse source 
Make M851 standard with a bed probe
This commit is contained in:
Scott Lahteine 2016-06-17 17:32:55 -07:00 • committed by GitHub
commit bd4ec727e7
42 changed files with 155 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Marlin/Conditionals.h
View file

@ -383,24 +383,6 @@
#define Z_SAFE_HOMING
#endif
/**
* Z Safe Homing dependencies
*/
#if ENABLED(Z_SAFE_HOMING)
#ifndef X_PROBE_OFFSET_FROM_EXTRUDER
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Y_PROBE_OFFSET_FROM_EXTRUDER
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Z_PROBE_OFFSET_FROM_EXTRUDER
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef XY_TRAVEL_SPEED
#define XY_TRAVEL_SPEED 4000
#endif
#endif
/**
* Host keep alive
*/
@ -775,6 +757,30 @@
#define HAS_BED_PROBE (PROBE_SELECTED && PROBE_PIN_CONFIGURED)
/**
* Probe dependencies
*/
#if HAS_BED_PROBE
#ifndef X_PROBE_OFFSET_FROM_EXTRUDER
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Y_PROBE_OFFSET_FROM_EXTRUDER
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Z_PROBE_OFFSET_FROM_EXTRUDER
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0
#endif
#ifndef Z_PROBE_OFFSET_RANGE_MIN
#define Z_PROBE_OFFSET_RANGE_MIN -20
#endif
#ifndef Z_PROBE_OFFSET_RANGE_MAX
#define Z_PROBE_OFFSET_RANGE_MAX 20
#endif
#ifndef XY_TRAVEL_SPEED
#define XY_TRAVEL_SPEED 4000
#endif
#endif
/**
* Delta radius/rod trimmers
*/