0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix probe without leveling

Browse source
This commit is contained in:
Scott Lahteine 2019-09-25 19:57:41 -05:00
parent 8cbb5350ad
commit 39578a5919
1 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
Marlin/src/module/probe.h
View file

@ -50,42 +50,49 @@
extern const char msg_wait_for_bed_heating[25]; extern const char msg_wait_for_bed_heating[25];
#endif #endif
inline float probe_min_x() { #if HAS_LEVELING
return _MAX(
#if ENABLED(DELTA) || IS_SCARA inline float probe_min_x() {
PROBE_X_MIN, MESH_MIN_X return _MAX(
#else #if ENABLED(DELTA) || IS_SCARA
(X_MIN_BED) + (MIN_PROBE_EDGE), (X_MIN_POS) + probe_offset[X_AXIS] PROBE_X_MIN, MESH_MIN_X
#endif #else
); (X_MIN_BED) + (MIN_PROBE_EDGE), (X_MIN_POS) + probe_offset[X_AXIS]
} #endif
inline float probe_max_x() { );
return _MIN( }
#if ENABLED(DELTA) || IS_SCARA
PROBE_X_MAX, MESH_MAX_X inline float probe_max_x() {
#else return _MIN(
(X_MAX_BED) - (MIN_PROBE_EDGE), (X_MAX_POS) + probe_offset[X_AXIS] #if ENABLED(DELTA) || IS_SCARA
#endif PROBE_X_MAX, MESH_MAX_X
); #else
} (X_MAX_BED) - (MIN_PROBE_EDGE), (X_MAX_POS) + probe_offset[X_AXIS]
inline float probe_min_y() { #endif
return _MAX( );
#if ENABLED(DELTA) || IS_SCARA }
PROBE_Y_MIN, MESH_MIN_Y
#else inline float probe_min_y() {
(Y_MIN_BED) + (MIN_PROBE_EDGE), (Y_MIN_POS) + probe_offset[Y_AXIS] return _MAX(
#endif #if ENABLED(DELTA) || IS_SCARA
); PROBE_Y_MIN, MESH_MIN_Y
} #else
inline float probe_max_y() { (Y_MIN_BED) + (MIN_PROBE_EDGE), (Y_MIN_POS) + probe_offset[Y_AXIS]
return _MIN( #endif
#if ENABLED(DELTA) || IS_SCARA );
PROBE_Y_MAX, MESH_MAX_Y }
#else
(Y_MAX_BED) - (MIN_PROBE_EDGE), (Y_MAX_POS) + probe_offset[Y_AXIS] inline float probe_max_y() {
#endif return _MIN(
); #if ENABLED(DELTA) || IS_SCARA
} PROBE_Y_MAX, MESH_MAX_Y
#else
(Y_MAX_BED) - (MIN_PROBE_EDGE), (Y_MAX_POS) + probe_offset[Y_AXIS]
#endif
);
}
#endif
#else #else