|
@@ -103,13 +103,13 @@ void GcodeSuite::G35() {
|
103
|
103
|
// Users of G35 might have a badly misaligned bed, so raise Z by the
|
104
|
104
|
// length of the deployed pin (BLTOUCH stroke < 7mm)
|
105
|
105
|
do_blocking_move_to_z(SUM_TERN(BLTOUCH_HS_MODE, Z_CLEARANCE_BETWEEN_PROBES, 7));
|
106
|
|
- const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[i], PROBE_PT_RAISE, 0, true);
|
|
106
|
+ const float z_probed_height = probe.probe_at_point(tramming_points[i], PROBE_PT_RAISE, 0, true);
|
107
|
107
|
|
108
|
108
|
if (isnan(z_probed_height)) {
|
109
|
109
|
SERIAL_ECHOPAIR("G35 failed at point ", i + 1, " (");
|
110
|
110
|
SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
|
111
|
111
|
SERIAL_CHAR(')');
|
112
|
|
- SERIAL_ECHOLNPAIR_P(SP_X_STR, screws_tilt_adjust_pos[i].x, SP_Y_STR, screws_tilt_adjust_pos[i].y);
|
|
112
|
+ SERIAL_ECHOLNPAIR_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y);
|
113
|
113
|
err_break = true;
|
114
|
114
|
break;
|
115
|
115
|
}
|
|
@@ -118,7 +118,7 @@ void GcodeSuite::G35() {
|
118
|
118
|
DEBUG_ECHOPAIR("Probing point ", i + 1, " (");
|
119
|
119
|
DEBUG_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
|
120
|
120
|
DEBUG_CHAR(')');
|
121
|
|
- DEBUG_ECHOLNPAIR_P(SP_X_STR, screws_tilt_adjust_pos[i].x, SP_Y_STR, screws_tilt_adjust_pos[i].y, SP_Z_STR, z_probed_height);
|
|
121
|
+ DEBUG_ECHOLNPAIR_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y, SP_Z_STR, z_probed_height);
|
122
|
122
|
}
|
123
|
123
|
|
124
|
124
|
z_measured[i] = z_probed_height;
|