|
@@ -50,42 +50,49 @@
|
50
|
50
|
extern const char msg_wait_for_bed_heating[25];
|
51
|
51
|
#endif
|
52
|
52
|
|
53
|
|
- inline float probe_min_x() {
|
54
|
|
- return _MAX(
|
55
|
|
- #if ENABLED(DELTA) || IS_SCARA
|
56
|
|
- PROBE_X_MIN, MESH_MIN_X
|
57
|
|
- #else
|
58
|
|
- (X_MIN_BED) + (MIN_PROBE_EDGE), (X_MIN_POS) + probe_offset[X_AXIS]
|
59
|
|
- #endif
|
60
|
|
- );
|
61
|
|
- }
|
62
|
|
- inline float probe_max_x() {
|
63
|
|
- return _MIN(
|
64
|
|
- #if ENABLED(DELTA) || IS_SCARA
|
65
|
|
- PROBE_X_MAX, MESH_MAX_X
|
66
|
|
- #else
|
67
|
|
- (X_MAX_BED) - (MIN_PROBE_EDGE), (X_MAX_POS) + probe_offset[X_AXIS]
|
68
|
|
- #endif
|
69
|
|
- );
|
70
|
|
- }
|
71
|
|
- inline float probe_min_y() {
|
72
|
|
- return _MAX(
|
73
|
|
- #if ENABLED(DELTA) || IS_SCARA
|
74
|
|
- PROBE_Y_MIN, MESH_MIN_Y
|
75
|
|
- #else
|
76
|
|
- (Y_MIN_BED) + (MIN_PROBE_EDGE), (Y_MIN_POS) + probe_offset[Y_AXIS]
|
77
|
|
- #endif
|
78
|
|
- );
|
79
|
|
- }
|
80
|
|
- inline float probe_max_y() {
|
81
|
|
- return _MIN(
|
82
|
|
- #if ENABLED(DELTA) || IS_SCARA
|
83
|
|
- PROBE_Y_MAX, MESH_MAX_Y
|
84
|
|
- #else
|
85
|
|
- (Y_MAX_BED) - (MIN_PROBE_EDGE), (Y_MAX_POS) + probe_offset[Y_AXIS]
|
86
|
|
- #endif
|
87
|
|
- );
|
88
|
|
- }
|
|
53
|
+ #if HAS_LEVELING
|
|
54
|
+
|
|
55
|
+ inline float probe_min_x() {
|
|
56
|
+ return _MAX(
|
|
57
|
+ #if ENABLED(DELTA) || IS_SCARA
|
|
58
|
+ PROBE_X_MIN, MESH_MIN_X
|
|
59
|
+ #else
|
|
60
|
+ (X_MIN_BED) + (MIN_PROBE_EDGE), (X_MIN_POS) + probe_offset[X_AXIS]
|
|
61
|
+ #endif
|
|
62
|
+ );
|
|
63
|
+ }
|
|
64
|
+
|
|
65
|
+ inline float probe_max_x() {
|
|
66
|
+ return _MIN(
|
|
67
|
+ #if ENABLED(DELTA) || IS_SCARA
|
|
68
|
+ PROBE_X_MAX, MESH_MAX_X
|
|
69
|
+ #else
|
|
70
|
+ (X_MAX_BED) - (MIN_PROBE_EDGE), (X_MAX_POS) + probe_offset[X_AXIS]
|
|
71
|
+ #endif
|
|
72
|
+ );
|
|
73
|
+ }
|
|
74
|
+
|
|
75
|
+ inline float probe_min_y() {
|
|
76
|
+ return _MAX(
|
|
77
|
+ #if ENABLED(DELTA) || IS_SCARA
|
|
78
|
+ PROBE_Y_MIN, MESH_MIN_Y
|
|
79
|
+ #else
|
|
80
|
+ (Y_MIN_BED) + (MIN_PROBE_EDGE), (Y_MIN_POS) + probe_offset[Y_AXIS]
|
|
81
|
+ #endif
|
|
82
|
+ );
|
|
83
|
+ }
|
|
84
|
+
|
|
85
|
+ inline float probe_max_y() {
|
|
86
|
+ return _MIN(
|
|
87
|
+ #if ENABLED(DELTA) || IS_SCARA
|
|
88
|
+ PROBE_Y_MAX, MESH_MAX_Y
|
|
89
|
+ #else
|
|
90
|
+ (Y_MAX_BED) - (MIN_PROBE_EDGE), (Y_MAX_POS) + probe_offset[Y_AXIS]
|
|
91
|
+ #endif
|
|
92
|
+ );
|
|
93
|
+ }
|
|
94
|
+
|
|
95
|
+ #endif
|
89
|
96
|
|
90
|
97
|
#else
|
91
|
98
|
|