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

Revert to Probe Raise rather than Probe Height

Browse Source
This commit is contained in:
Scott Lahteine
2016-09-13 20:25:12 -05:00
parent 5cbed13f41
commit 0e7d638a7a
25 changed files with 387 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/Conditionals_post.h
View File

@@ -602,10 +602,10 @@
#define XY_PROBE_SPEED 4000
#endif
#endif
#if Z_PROBE_TRAVEL_HEIGHT > Z_PROBE_DEPLOY_HEIGHT
#define _Z_PROBE_DEPLOY_HEIGHT Z_PROBE_TRAVEL_HEIGHT
#if Z_RAISE_BETWEEN_PROBES > Z_RAISE_DEPLOY_PROBE
#define _Z_RAISE_DEPLOY_PROBE Z_RAISE_BETWEEN_PROBES
#else
#define _Z_PROBE_DEPLOY_HEIGHT Z_PROBE_DEPLOY_HEIGHT
#define _Z_RAISE_DEPLOY_PROBE Z_RAISE_DEPLOY_PROBE
#endif
#else
#undef X_PROBE_OFFSET_FROM_EXTRUDER
@@ -681,17 +681,17 @@
#endif
/**
* Z_HOMING_HEIGHT / Z_PROBE_TRAVEL_HEIGHT
* Z_HOMING_HEIGHT / Z_RAISE_BETWEEN_PROBES
*/
#ifndef Z_HOMING_HEIGHT
#ifndef Z_PROBE_TRAVEL_HEIGHT
#ifndef Z_RAISE_BETWEEN_PROBES
#define Z_HOMING_HEIGHT 0
#else
#define Z_HOMING_HEIGHT Z_PROBE_TRAVEL_HEIGHT
#define Z_HOMING_HEIGHT Z_RAISE_BETWEEN_PROBES
#endif
#endif
#ifndef Z_PROBE_TRAVEL_HEIGHT
#define Z_PROBE_TRAVEL_HEIGHT Z_HOMING_HEIGHT
#ifndef Z_RAISE_BETWEEN_PROBES
#define Z_RAISE_BETWEEN_PROBES Z_HOMING_HEIGHT
#endif
#if IS_KINEMATIC