|
@@ -35,36 +35,46 @@ void GcodeSuite::M851() {
|
35
|
35
|
|
36
|
36
|
// Show usage with no parameters
|
37
|
37
|
if (!parser.seen("XYZ")) {
|
38
|
|
- SERIAL_ECHO_START();
|
39
|
|
- SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET " X", probe_offset[X_AXIS],
|
40
|
|
- " Y", probe_offset[Y_AXIS],
|
41
|
|
- " Z", probe_offset[Z_AXIS]);
|
|
38
|
+ SERIAL_ECHO_MSG(MSG_PROBE_OFFSET " X", probe_offset[X_AXIS], " Y", probe_offset[Y_AXIS], " Z", probe_offset[Z_AXIS]);
|
42
|
39
|
return;
|
43
|
40
|
}
|
44
|
41
|
|
45
|
|
- // Get the modified offsets
|
46
|
|
- const float offs[] = {
|
47
|
|
- parser.floatval('X', probe_offset[X_AXIS]),
|
48
|
|
- parser.floatval('Y', probe_offset[Y_AXIS]),
|
49
|
|
- parser.floatval('Z', probe_offset[Z_AXIS])
|
50
|
|
- };
|
|
42
|
+ float offs[XYZ] = { probe_offset[X_AXIS], probe_offset[Y_AXIS], probe_offset[Z_AXIS] };
|
51
|
43
|
|
52
|
|
- // Error-check
|
53
|
|
- if (!WITHIN(offs[X_AXIS], -(X_BED_SIZE), X_BED_SIZE)) {
|
54
|
|
- SERIAL_ERROR_MSG("?X out of range (-" STRINGIFY(X_BED_SIZE) " to " STRINGIFY(X_BED_SIZE) ")");
|
55
|
|
- return;
|
|
44
|
+ const bool ok = true;
|
|
45
|
+
|
|
46
|
+ if (parser.seenval('X')) {
|
|
47
|
+ const float x = parser.value_float();
|
|
48
|
+ if (WITHIN(x, -(X_BED_SIZE), X_BED_SIZE))
|
|
49
|
+ offs[X_AXIS] = x;
|
|
50
|
+ else {
|
|
51
|
+ SERIAL_ECHOLNPAIR("?X out of range (-", int(X_BED_SIZE), " to ", int(X_BED_SIZE), ")");
|
|
52
|
+ ok = false;
|
|
53
|
+ }
|
56
|
54
|
}
|
57
|
|
- if (!WITHIN(offs[Y_AXIS], -(Y_BED_SIZE), Y_BED_SIZE)) {
|
58
|
|
- SERIAL_ERROR_MSG("?Y out of range (-" STRINGIFY(Y_BED_SIZE) " to " STRINGIFY(Y_BED_SIZE) ")");
|
59
|
|
- return;
|
|
55
|
+
|
|
56
|
+ if (parser.seenval('Y')) {
|
|
57
|
+ const float y = parser.value_float();
|
|
58
|
+ if (WITHIN(y, -(Y_BED_SIZE), Y_BED_SIZE))
|
|
59
|
+ offs[Y_AXIS] = y;
|
|
60
|
+ else {
|
|
61
|
+ SERIAL_ECHOLNPAIR("?Y out of range (-", int(Y_BED_SIZE), " to ", int(Y_BED_SIZE), ")");
|
|
62
|
+ ok = false;
|
|
63
|
+ }
|
60
|
64
|
}
|
61
|
|
- if (!WITHIN(offs[Z_AXIS], Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) {
|
62
|
|
- SERIAL_ERROR_MSG("?Z out of range (" STRINGIFY(Z_PROBE_OFFSET_RANGE_MIN) " to " STRINGIFY(Z_PROBE_OFFSET_RANGE_MAX) ")");
|
63
|
|
- return;
|
|
65
|
+
|
|
66
|
+ if (parser.seenval('Z')) {
|
|
67
|
+ const float z = parser.value_float();
|
|
68
|
+ if (WITHIN(z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX))
|
|
69
|
+ offs[Z_AXIS] = z;
|
|
70
|
+ else {
|
|
71
|
+ SERIAL_ECHOLNPAIR("?Z out of range (", int(Z_PROBE_OFFSET_RANGE_MIN), " to ", int(Z_PROBE_OFFSET_RANGE_MAX), ")");
|
|
72
|
+ ok = false;
|
|
73
|
+ }
|
64
|
74
|
}
|
65
|
75
|
|
66
|
76
|
// Save the new offsets
|
67
|
|
- LOOP_XYZ(a) probe_offset[a] = offs[a];
|
|
77
|
+ if (ok) COPY(probe_offset, offs);
|
68
|
78
|
}
|
69
|
79
|
|
70
|
80
|
#endif // HAS_BED_PROBE
|