2018-10-29 19:01:36 +00:00
|
|
|
/**
|
|
|
|
* Marlin 3D Printer Firmware
|
2019-06-28 04:57:50 +00:00
|
|
|
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
2018-10-29 19:01:36 +00:00
|
|
|
*
|
|
|
|
* Based on Sprinter and grbl.
|
2019-06-28 04:57:50 +00:00
|
|
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
2018-10-29 19:01:36 +00:00
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "../../inc/MarlinConfig.h"
|
|
|
|
|
|
|
|
#if ENABLED(Z_STEPPER_AUTO_ALIGN)
|
|
|
|
|
|
|
|
#include "../gcode.h"
|
2019-10-16 18:39:58 +00:00
|
|
|
#include "../../module/planner.h"
|
2018-10-29 19:01:36 +00:00
|
|
|
#include "../../module/stepper.h"
|
2019-10-16 18:39:58 +00:00
|
|
|
#include "../../module/motion.h"
|
|
|
|
#include "../../module/probe.h"
|
2018-10-29 19:01:36 +00:00
|
|
|
|
|
|
|
#if HOTENDS > 1
|
|
|
|
#include "../../module/tool_change.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAS_LEVELING
|
|
|
|
#include "../../feature/bedlevel/bedlevel.h"
|
|
|
|
#endif
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
#include "../../libs/least_squares_fit.h"
|
|
|
|
#endif
|
|
|
|
|
2019-03-14 07:25:42 +00:00
|
|
|
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
|
|
|
|
#include "../../core/debug_out.h"
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
// Sanity-check the count of Z_STEPPER_ALIGN_XY points
|
2019-09-29 09:25:39 +00:00
|
|
|
constexpr xy_pos_t sanity_arr_z_align[] = Z_STEPPER_ALIGN_XY;
|
2019-10-16 18:39:58 +00:00
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
static_assert(COUNT(sanity_arr_z_align) >= Z_STEPPER_COUNT,
|
|
|
|
"Z_STEPPER_ALIGN_XY requires at least three {X,Y} entries (Z, Z2, Z3, ...)."
|
|
|
|
);
|
|
|
|
#else
|
|
|
|
static_assert(COUNT(sanity_arr_z_align) == Z_STEPPER_COUNT,
|
|
|
|
#if ENABLED(Z_TRIPLE_STEPPER_DRIVERS)
|
|
|
|
"Z_STEPPER_ALIGN_XY requires three {X,Y} entries (Z, Z2, and Z3)."
|
|
|
|
#else
|
|
|
|
"Z_STEPPER_ALIGN_XY requires two {X,Y} entries (Z and Z2)."
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static xy_pos_t z_auto_align_pos[Z_STEPPER_COUNT] = Z_STEPPER_ALIGN_XY;
|
|
|
|
|
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
static xy_pos_t z_stepper_pos[] = Z_STEPPER_ALIGN_STEPPER_XY;
|
|
|
|
#endif
|
2019-09-29 09:25:39 +00:00
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
#define G34_PROBE_COUNT COUNT(z_auto_align_pos)
|
2018-10-29 19:01:36 +00:00
|
|
|
|
|
|
|
inline void set_all_z_lock(const bool lock) {
|
|
|
|
stepper.set_z_lock(lock);
|
|
|
|
stepper.set_z2_lock(lock);
|
|
|
|
#if ENABLED(Z_TRIPLE_STEPPER_DRIVERS)
|
|
|
|
stepper.set_z3_lock(lock);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* G34: Z-Stepper automatic alignment
|
|
|
|
*
|
2019-10-16 18:39:58 +00:00
|
|
|
* I<iterations>
|
|
|
|
* T<accuracy>
|
|
|
|
* A<amplification>
|
2018-10-29 19:01:36 +00:00
|
|
|
*/
|
|
|
|
void GcodeSuite::G34() {
|
2019-03-14 07:25:42 +00:00
|
|
|
if (DEBUGGING(LEVELING)) {
|
|
|
|
DEBUG_ECHOLNPGM(">>> G34");
|
|
|
|
log_machine_info();
|
|
|
|
}
|
2018-10-29 19:01:36 +00:00
|
|
|
|
|
|
|
do { // break out on error
|
|
|
|
|
|
|
|
const int8_t z_auto_align_iterations = parser.intval('I', Z_STEPPER_ALIGN_ITERATIONS);
|
|
|
|
if (!WITHIN(z_auto_align_iterations, 1, 30)) {
|
|
|
|
SERIAL_ECHOLNPGM("?(I)teration out of bounds (1-30).");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
const float z_auto_align_accuracy = parser.floatval('T', Z_STEPPER_ALIGN_ACC);
|
|
|
|
if (!WITHIN(z_auto_align_accuracy, 0.01f, 1.0f)) {
|
|
|
|
SERIAL_ECHOLNPGM("?(T)arget accuracy out of bounds (0.01-1.0).");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
const float z_auto_align_amplification =
|
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
Z_STEPPER_ALIGN_AMP;
|
|
|
|
#else
|
|
|
|
parser.floatval('A', Z_STEPPER_ALIGN_AMP);
|
|
|
|
if (!WITHIN(ABS(z_auto_align_amplification), 0.5f, 2.0f)) {
|
|
|
|
SERIAL_ECHOLNPGM("?(A)mplification out of bounds (0.5-2.0).");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
const ProbePtRaise raise_after = parser.boolval('E') ? PROBE_PT_STOW : PROBE_PT_RAISE;
|
2018-10-29 19:01:36 +00:00
|
|
|
|
|
|
|
// Wait for planner moves to finish!
|
|
|
|
planner.synchronize();
|
|
|
|
|
|
|
|
// Disable the leveling matrix before auto-aligning
|
|
|
|
#if HAS_LEVELING
|
|
|
|
#if ENABLED(RESTORE_LEVELING_AFTER_G34)
|
|
|
|
const bool leveling_was_active = planner.leveling_active;
|
|
|
|
#endif
|
|
|
|
set_bed_leveling_enabled(false);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(CNC_WORKSPACE_PLANES)
|
|
|
|
workspace_plane = PLANE_XY;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Always home with tool 0 active
|
|
|
|
#if HOTENDS > 1
|
|
|
|
const uint8_t old_tool_index = active_extruder;
|
2019-06-24 01:00:48 +00:00
|
|
|
tool_change(0, true);
|
2018-10-29 19:01:36 +00:00
|
|
|
#endif
|
|
|
|
|
2019-03-13 05:42:50 +00:00
|
|
|
#if HAS_DUPLICATION_MODE
|
2018-10-29 19:01:36 +00:00
|
|
|
extruder_duplication_enabled = false;
|
|
|
|
#endif
|
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
#if BOTH(BLTOUCH, BLTOUCH_HS_MODE)
|
|
|
|
// In BLTOUCH HS mode, the probe travels in a deployed state.
|
|
|
|
// Users of G34 might have a badly misaligned bed, so raise Z by the
|
|
|
|
// length of the deployed pin (BLTOUCH stroke < 7mm)
|
|
|
|
#define Z_BASIC_CLEARANCE Z_CLEARANCE_BETWEEN_PROBES + 7.0f
|
|
|
|
#else
|
|
|
|
#define Z_BASIC_CLEARANCE Z_CLEARANCE_BETWEEN_PROBES
|
|
|
|
#endif
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
// Compute a worst-case clearance height to probe from. After the first
|
|
|
|
// iteration this will be re-calculated based on the actual bed position
|
2019-06-21 02:18:36 +00:00
|
|
|
float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * (
|
2019-06-18 12:02:18 +00:00
|
|
|
#if ENABLED(Z_TRIPLE_STEPPER_DRIVERS)
|
2019-09-29 09:25:39 +00:00
|
|
|
SQRT(_MAX(HYPOT2(z_auto_align_pos[0].x - z_auto_align_pos[0].y, z_auto_align_pos[1].x - z_auto_align_pos[1].y),
|
2019-10-16 18:39:58 +00:00
|
|
|
HYPOT2(z_auto_align_pos[1].x - z_auto_align_pos[1].y, z_auto_align_pos[2].x - z_auto_align_pos[2].y),
|
|
|
|
HYPOT2(z_auto_align_pos[2].x - z_auto_align_pos[2].y, z_auto_align_pos[0].x - z_auto_align_pos[0].y)))
|
2019-06-18 12:02:18 +00:00
|
|
|
#else
|
2019-09-29 09:25:39 +00:00
|
|
|
HYPOT(z_auto_align_pos[0].x - z_auto_align_pos[0].y, z_auto_align_pos[1].x - z_auto_align_pos[1].y)
|
2019-06-18 12:02:18 +00:00
|
|
|
#endif
|
|
|
|
);
|
|
|
|
|
|
|
|
// Home before the alignment procedure
|
2019-09-02 07:44:48 +00:00
|
|
|
if (!all_axes_known()) home_all_axes();
|
2019-06-18 12:02:18 +00:00
|
|
|
|
|
|
|
// Move the Z coordinate realm towards the positive - dirty trick
|
2019-09-29 09:25:39 +00:00
|
|
|
current_position.z -= z_probe * 0.5f;
|
2019-04-23 18:40:55 +00:00
|
|
|
|
2018-10-29 19:01:36 +00:00
|
|
|
float last_z_align_move[Z_STEPPER_COUNT] = ARRAY_N(Z_STEPPER_COUNT, 10000.0f, 10000.0f, 10000.0f),
|
2019-10-16 18:39:58 +00:00
|
|
|
z_measured[G34_PROBE_COUNT] = { 0 },
|
2019-06-18 12:02:18 +00:00
|
|
|
z_maxdiff = 0.0f,
|
|
|
|
amplification = z_auto_align_amplification;
|
|
|
|
|
|
|
|
uint8_t iteration;
|
2018-10-29 19:01:36 +00:00
|
|
|
bool err_break = false;
|
2019-06-18 12:02:18 +00:00
|
|
|
for (iteration = 0; iteration < z_auto_align_iterations; ++iteration) {
|
2019-03-14 07:25:42 +00:00
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> probing all positions.");
|
2018-10-29 19:01:36 +00:00
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
SERIAL_ECHOLNPAIR("\nITERATION: ", int(iteration + 1));
|
|
|
|
|
|
|
|
// Initialize minimum value
|
2019-10-16 18:39:58 +00:00
|
|
|
float z_measured_min = 100000.0f,
|
|
|
|
z_measured_max = -100000.0f;
|
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
// Probe all positions (one per Z-Stepper)
|
2019-10-16 18:39:58 +00:00
|
|
|
for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i) {
|
2019-06-21 02:18:36 +00:00
|
|
|
// iteration odd/even --> downward / upward stepper sequence
|
2019-10-16 18:39:58 +00:00
|
|
|
const uint8_t iprobe = (iteration & 1) ? G34_PROBE_COUNT - 1 - i : i;
|
2019-05-18 00:10:18 +00:00
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
// Safe clearance even on an incline
|
2019-10-16 18:39:58 +00:00
|
|
|
if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe);
|
2019-05-18 00:10:18 +00:00
|
|
|
|
2019-07-17 09:18:16 +00:00
|
|
|
// Probe a Z height for each stepper.
|
2019-11-20 05:25:07 +00:00
|
|
|
const float z_probed_height = probe_at_point(z_auto_align_pos[iprobe], raise_after, 0, true);
|
2019-07-17 09:18:16 +00:00
|
|
|
if (isnan(z_probed_height)) {
|
2019-06-18 12:02:18 +00:00
|
|
|
SERIAL_ECHOLNPGM("Probing failed.");
|
2018-10-29 19:01:36 +00:00
|
|
|
err_break = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2019-07-17 09:18:16 +00:00
|
|
|
// Add height to each value, to provide a more useful target height for
|
|
|
|
// the next iteration of probing. This allows adjustments to be made away from the bed.
|
2019-10-16 18:39:58 +00:00
|
|
|
z_measured[iprobe] = z_probed_height + Z_CLEARANCE_BETWEEN_PROBES;
|
2019-07-17 09:18:16 +00:00
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", int(iprobe + 1), " measured position is ", z_measured[iprobe]);
|
2018-10-29 19:01:36 +00:00
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
// Remember the minimum measurement to calculate the correction later on
|
2019-10-16 18:39:58 +00:00
|
|
|
z_measured_min = _MIN(z_measured_min, z_measured[iprobe]);
|
|
|
|
z_measured_max = _MAX(z_measured_max, z_measured[iprobe]);
|
|
|
|
} // for (i)
|
2018-10-29 19:01:36 +00:00
|
|
|
|
|
|
|
if (err_break) break;
|
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
// Adapt the next probe clearance height based on the new measurements.
|
|
|
|
// Safe_height = lowest distance to bed (= highest measurement) plus highest measured misalignment.
|
2019-10-16 18:39:58 +00:00
|
|
|
z_maxdiff = z_measured_max - z_measured_min;
|
|
|
|
z_probe = Z_BASIC_CLEARANCE + z_measured_max + z_maxdiff;
|
|
|
|
|
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
// Replace the initial values in z_measured with calculated heights at
|
|
|
|
// each stepper position. This allows the adjustment algorithm to be
|
|
|
|
// shared between both possible probing mechanisms.
|
|
|
|
|
|
|
|
// This must be done after the next z_probe height is calculated, so that
|
|
|
|
// the height is calculated from actual print area positions, and not
|
|
|
|
// extrapolated motor movements.
|
|
|
|
|
|
|
|
// Compute the least-squares fit for all probed points.
|
|
|
|
// Calculate the Z position of each stepper and store it in z_measured.
|
|
|
|
// This allows the actual adjustment logic to be shared by both algorithms.
|
|
|
|
linear_fit_data lfd;
|
|
|
|
incremental_LSF_reset(&lfd);
|
|
|
|
for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i) {
|
|
|
|
SERIAL_ECHOLNPAIR("PROBEPT_", int(i + 1), ": ", z_measured[i]);
|
|
|
|
incremental_LSF(&lfd, z_auto_align_pos[i], z_measured[i]);
|
|
|
|
}
|
|
|
|
finish_incremental_LSF(&lfd);
|
|
|
|
|
|
|
|
z_measured_min = 100000.0f;
|
|
|
|
for (uint8_t i = 0; i < Z_STEPPER_COUNT; ++i) {
|
|
|
|
z_measured[i] = -(lfd.A * z_stepper_pos[i].x + lfd.B * z_stepper_pos[i].y);
|
|
|
|
z_measured_min = _MIN(z_measured_min, z_measured[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
SERIAL_ECHOLNPAIR("CALCULATED STEPPER POSITIONS: Z1=", z_measured[0], " Z2=", z_measured[1], " Z3=", z_measured[2]);
|
2019-06-18 12:02:18 +00:00
|
|
|
#endif
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
SERIAL_ECHOLNPAIR("\n"
|
2019-06-18 12:02:18 +00:00
|
|
|
"DIFFERENCE Z1-Z2=", ABS(z_measured[0] - z_measured[1])
|
|
|
|
#if ENABLED(Z_TRIPLE_STEPPER_DRIVERS)
|
|
|
|
, " Z2-Z3=", ABS(z_measured[1] - z_measured[2])
|
|
|
|
, " Z3-Z1=", ABS(z_measured[2] - z_measured[0])
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
|
|
|
|
// The following correction actions are to be enabled for select Z-steppers only
|
|
|
|
stepper.set_separate_multi_axis(true);
|
2018-10-29 19:01:36 +00:00
|
|
|
|
|
|
|
bool success_break = true;
|
2019-06-18 12:02:18 +00:00
|
|
|
// Correct the individual stepper offsets
|
2018-10-29 19:01:36 +00:00
|
|
|
for (uint8_t zstepper = 0; zstepper < Z_STEPPER_COUNT; ++zstepper) {
|
|
|
|
// Calculate current stepper move
|
|
|
|
const float z_align_move = z_measured[zstepper] - z_measured_min,
|
|
|
|
z_align_abs = ABS(z_align_move);
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
#if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
// Optimize one iteration's correction based on the first measurements
|
|
|
|
if (z_align_abs > 0.0f) amplification = iteration == 1 ? _MIN(last_z_align_move[zstepper] / z_align_abs, 2.0f) : z_auto_align_amplification;
|
|
|
|
#endif
|
2019-06-18 12:02:18 +00:00
|
|
|
|
|
|
|
// Check for less accuracy compared to last move
|
2018-10-29 19:01:36 +00:00
|
|
|
if (last_z_align_move[zstepper] < z_align_abs - 1.0) {
|
2019-06-18 12:02:18 +00:00
|
|
|
SERIAL_ECHOLNPGM("Decreasing accuracy detected.");
|
2018-10-29 19:01:36 +00:00
|
|
|
err_break = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
// Remember the alignment for the next iteration
|
|
|
|
last_z_align_move[zstepper] = z_align_abs;
|
|
|
|
|
|
|
|
// Stop early if all measured points achieve accuracy target
|
2018-10-29 19:01:36 +00:00
|
|
|
if (z_align_abs > z_auto_align_accuracy) success_break = false;
|
|
|
|
|
2019-03-14 07:25:42 +00:00
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", int(zstepper + 1), " corrected by ", z_align_move);
|
2018-10-29 19:01:36 +00:00
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
// Lock all steppers except one
|
|
|
|
set_all_z_lock(true);
|
2018-10-29 19:01:36 +00:00
|
|
|
switch (zstepper) {
|
|
|
|
case 0: stepper.set_z_lock(false); break;
|
|
|
|
case 1: stepper.set_z2_lock(false); break;
|
|
|
|
#if ENABLED(Z_TRIPLE_STEPPER_DRIVERS)
|
|
|
|
case 2: stepper.set_z3_lock(false); break;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
// Do a move to correct part of the misalignment for the current stepper
|
2019-09-29 09:25:39 +00:00
|
|
|
do_blocking_move_to_z(amplification * z_align_move + current_position.z);
|
2019-06-18 12:02:18 +00:00
|
|
|
} // for (zstepper)
|
|
|
|
|
|
|
|
// Back to normal stepper operations
|
|
|
|
set_all_z_lock(false);
|
|
|
|
stepper.set_separate_multi_axis(false);
|
2018-10-29 19:01:36 +00:00
|
|
|
|
|
|
|
if (err_break) break;
|
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
if (success_break) { SERIAL_ECHOLNPGM("Target accuracy achieved."); break; }
|
2018-10-29 19:01:36 +00:00
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
} // for (iteration)
|
2018-10-29 19:01:36 +00:00
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
if (err_break) { SERIAL_ECHOLNPGM("G34 aborted."); break; }
|
2018-10-29 19:01:36 +00:00
|
|
|
|
2019-06-18 12:02:18 +00:00
|
|
|
SERIAL_ECHOLNPAIR("Did ", int(iteration + (iteration != z_auto_align_iterations)), " iterations of ", int(z_auto_align_iterations));
|
|
|
|
SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
|
2018-10-29 19:01:36 +00:00
|
|
|
|
|
|
|
// Restore the active tool after homing
|
|
|
|
#if HOTENDS > 1
|
2019-06-24 01:00:48 +00:00
|
|
|
tool_change(old_tool_index, (
|
2018-10-29 19:01:36 +00:00
|
|
|
#if ENABLED(PARKING_EXTRUDER)
|
|
|
|
false // Fetch the previous toolhead
|
|
|
|
#else
|
|
|
|
true
|
|
|
|
#endif
|
2019-03-12 01:48:49 +00:00
|
|
|
));
|
2018-10-29 19:01:36 +00:00
|
|
|
#endif
|
|
|
|
|
2019-05-18 00:10:18 +00:00
|
|
|
#if HAS_LEVELING && ENABLED(RESTORE_LEVELING_AFTER_G34)
|
|
|
|
set_bed_leveling_enabled(leveling_was_active);
|
2018-10-29 19:01:36 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
// After this operation the z position needs correction
|
|
|
|
set_axis_is_not_at_home(Z_AXIS);
|
|
|
|
|
2019-09-25 07:29:10 +00:00
|
|
|
// Stow the probe, as the last call to probe_at_point(...) left
|
2019-06-24 01:55:43 +00:00
|
|
|
// the probe deployed if it was successful.
|
|
|
|
STOW_PROBE();
|
2019-05-18 00:10:18 +00:00
|
|
|
|
2019-06-22 05:43:33 +00:00
|
|
|
// Home Z after the alignment procedure
|
|
|
|
process_subcommands_now_P(PSTR("G28 Z"));
|
2018-10-29 19:01:36 +00:00
|
|
|
|
2019-08-16 23:34:13 +00:00
|
|
|
}while(0);
|
2018-10-29 19:01:36 +00:00
|
|
|
|
2019-03-14 07:25:42 +00:00
|
|
|
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G34");
|
2018-10-29 19:01:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2019-10-16 18:39:58 +00:00
|
|
|
* M422: Set a Z-Stepper automatic alignment XY point.
|
|
|
|
* Use repeatedly to set multiple points.
|
|
|
|
*
|
|
|
|
* S<index> : Index of the probe point to set
|
|
|
|
*
|
|
|
|
* With Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS:
|
|
|
|
* W<index> : Index of the Z stepper position to set
|
|
|
|
* The W and S parameters may not be combined.
|
|
|
|
*
|
|
|
|
* S and W require an X and/or Y parameter
|
|
|
|
* X<pos> : X position to set (Unchanged if omitted)
|
|
|
|
* Y<pos> : Y position to set (Unchanged if omitted)
|
2018-10-29 19:01:36 +00:00
|
|
|
*/
|
|
|
|
void GcodeSuite::M422() {
|
2019-10-16 18:39:58 +00:00
|
|
|
if (!parser.seen_any()) {
|
|
|
|
for (uint8_t i = 0; i < G34_PROBE_COUNT; ++i)
|
2019-11-29 10:45:07 +00:00
|
|
|
SERIAL_ECHOLNPAIR_P(PSTR("M422 S"), i + 1, SP_X_STR, z_auto_align_pos[i].x, SP_Y_STR, z_auto_align_pos[i].y);
|
2019-10-16 18:39:58 +00:00
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
for (uint8_t i = 0; i < Z_STEPPER_COUNT; ++i)
|
2019-11-29 10:45:07 +00:00
|
|
|
SERIAL_ECHOLNPAIR_P(PSTR("M422 W"), i + 1, SP_X_STR, z_stepper_pos[i].x, SP_Y_STR, z_stepper_pos[i].y);
|
2019-10-16 18:39:58 +00:00
|
|
|
#endif
|
2018-10-29 19:01:36 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
const bool is_probe_point = parser.seen('S');
|
2019-09-29 09:25:39 +00:00
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
if (is_probe_point && parser.seen('W')) {
|
|
|
|
SERIAL_ECHOLNPGM("?(S) and (W) may not be combined.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
xy_pos_t *pos_dest = (
|
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
!is_probe_point ? z_stepper_pos :
|
|
|
|
#endif
|
|
|
|
z_auto_align_pos
|
|
|
|
);
|
|
|
|
|
2019-10-24 17:52:20 +00:00
|
|
|
if (!is_probe_point
|
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
&& !parser.seen('W')
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
SERIAL_ECHOLNPGM(
|
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
"?(S) or (W) is required."
|
|
|
|
#else
|
|
|
|
"?(S) is required."
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
// Get the Probe Position Index or Z Stepper Index
|
|
|
|
int8_t position_index;
|
|
|
|
if (is_probe_point) {
|
|
|
|
position_index = parser.intval('S') - 1;
|
|
|
|
if (!WITHIN(position_index, 0, int8_t(G34_PROBE_COUNT) - 1)) {
|
|
|
|
SERIAL_ECHOLNPGM("?(S) Z-ProbePosition index invalid.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
|
|
|
position_index = parser.intval('W') - 1;
|
|
|
|
if (!WITHIN(position_index, 0, Z_STEPPER_COUNT - 1)) {
|
|
|
|
SERIAL_ECHOLNPGM("?(W) Z-Stepper index invalid.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2018-10-29 19:01:36 +00:00
|
|
|
}
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
const xy_pos_t pos = {
|
|
|
|
parser.floatval('X', pos_dest[position_index].x),
|
|
|
|
parser.floatval('Y', pos_dest[position_index].y)
|
|
|
|
};
|
|
|
|
|
|
|
|
if (is_probe_point) {
|
|
|
|
if (!position_is_reachable_by_probe(pos.x, Y_CENTER)) {
|
|
|
|
SERIAL_ECHOLNPGM("?(X) out of bounds.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!position_is_reachable_by_probe(pos)) {
|
|
|
|
SERIAL_ECHOLNPGM("?(Y) out of bounds.");
|
|
|
|
return;
|
|
|
|
}
|
2018-10-29 19:01:36 +00:00
|
|
|
}
|
|
|
|
|
2019-10-16 18:39:58 +00:00
|
|
|
pos_dest[position_index] = pos;
|
2018-10-29 19:01:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif // Z_STEPPER_AUTO_ALIGN
|