78ebd522b6
Implemented bed skew calibration by matching a precise physical model to the measured data using the least squares method. Rewrote handling of the command buffer to preserve memory and allow pushing the commands to the front of the queue.
1180 lines
47 KiB
C++
1180 lines
47 KiB
C++
#include "Marlin.h"
|
|
#include "Configuration.h"
|
|
#include "language_all.h"
|
|
#include "mesh_bed_calibration.h"
|
|
#include "mesh_bed_leveling.h"
|
|
#include "stepper.h"
|
|
#include "ultralcd.h"
|
|
// #include "qr_solve.h"
|
|
|
|
extern float home_retract_mm_ext(int axis);
|
|
|
|
float world2machine_rotation_and_skew[2][2];
|
|
float world2machine_shift[2];
|
|
|
|
#define BED_ZERO_REF_X (- 22.f + X_PROBE_OFFSET_FROM_EXTRUDER)
|
|
#define BED_ZERO_REF_Y (- 0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER)
|
|
|
|
// Positions of the bed reference points in the machine coordinates, referenced to the P.I.N.D.A sensor.
|
|
// The points are ordered in a zig-zag fashion to speed up the calibration.
|
|
const float bed_ref_points[] PROGMEM = {
|
|
13.f - BED_ZERO_REF_X, 6.4f - BED_ZERO_REF_Y,
|
|
115.f - BED_ZERO_REF_X, 6.4f - BED_ZERO_REF_Y,
|
|
216.f - BED_ZERO_REF_X, 6.4f - BED_ZERO_REF_Y,
|
|
|
|
216.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y,
|
|
115.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y,
|
|
13.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y,
|
|
|
|
13.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y,
|
|
115.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y,
|
|
216.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y
|
|
};
|
|
|
|
// Positions of the bed reference points in the machine coordinates, referenced to the P.I.N.D.A sensor.
|
|
// The points are the following: center front, center right, center rear, center left.
|
|
const float bed_ref_points_4[] PROGMEM = {
|
|
115.f - BED_ZERO_REF_X, 6.4f - BED_ZERO_REF_Y,
|
|
216.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y,
|
|
115.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y,
|
|
13.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y
|
|
};
|
|
|
|
static inline float sqr(float x) { return x * x; }
|
|
|
|
bool calculate_machine_skew_and_offset_LS(
|
|
// Matrix of maximum 9 2D points (18 floats)
|
|
const float *measured_pts,
|
|
uint8_t npts,
|
|
const float *true_pts,
|
|
// Resulting correction matrix.
|
|
float *vec_x,
|
|
float *vec_y,
|
|
float *cntr
|
|
// Temporary values, 49-18-(2*3)=25 floats
|
|
// , float *temp
|
|
)
|
|
{
|
|
SERIAL_ECHOPGM("X vector, initial: ");
|
|
MYSERIAL.print(vec_x[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(vec_x[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOPGM("Y vector, initial: ");
|
|
MYSERIAL.print(vec_y[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(vec_y[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOPGM("center, initial: ");
|
|
MYSERIAL.print(cntr[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(cntr[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
for (uint8_t i = 0; i < npts; ++ i) {
|
|
SERIAL_ECHOPGM("point #");
|
|
MYSERIAL.print(int(i));
|
|
SERIAL_ECHOPGM(" measured: (");
|
|
MYSERIAL.print(measured_pts[i*2], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(measured_pts[i*2+1], 5);
|
|
SERIAL_ECHOPGM("); target: (");
|
|
MYSERIAL.print(pgm_read_float(true_pts+i*2 ), 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(pgm_read_float(true_pts+i*2+1), 5);
|
|
SERIAL_ECHOPGM("), error: ");
|
|
MYSERIAL.print(sqrt(
|
|
sqr(pgm_read_float(true_pts+i*2 ) - measured_pts[i*2 ]) +
|
|
sqr(pgm_read_float(true_pts+i*2+1) - measured_pts[i*2+1])), 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
}
|
|
delay_keep_alive(100);
|
|
|
|
|
|
{
|
|
// Create covariance matrix for A, collect the right hand side b.
|
|
float A[3][3] = { 0.f };
|
|
float b[3] = { 0.f };
|
|
float acc;
|
|
for (uint8_t r = 0; r < 3; ++ r) {
|
|
for (uint8_t c = 0; c < 3; ++ c) {
|
|
acc = 0;
|
|
for (uint8_t i = 0; i < npts; ++ i) {
|
|
float a = (r == 2) ? 1.f : measured_pts[2 * i + r];
|
|
float b = (c == 2) ? 1.f : measured_pts[2 * i + c];
|
|
acc += a * b;
|
|
}
|
|
A[r][c] = acc;
|
|
}
|
|
acc = 0.f;
|
|
for (uint8_t i = 0; i < npts; ++ i) {
|
|
float a = (r == 2) ? 1.f : measured_pts[2 * i + r];
|
|
float b = pgm_read_float(true_pts+i*2);
|
|
acc += a * b;
|
|
}
|
|
b[r] = acc;
|
|
}
|
|
// Solve the linear equation for ax, bx, cx.
|
|
float x[3] = { 0.f };
|
|
for (uint8_t iter = 0; iter < 100; ++ iter) {
|
|
x[0] = (b[0] - A[0][1] * x[1] - A[0][2] * x[2]) / A[0][0];
|
|
x[1] = (b[1] - A[1][0] * x[0] - A[1][2] * x[2]) / A[1][1];
|
|
x[2] = (b[2] - A[2][0] * x[0] - A[2][1] * x[1]) / A[2][2];
|
|
}
|
|
// Store the result to the output variables.
|
|
vec_x[0] = x[0];
|
|
vec_y[0] = x[1];
|
|
cntr[0] = x[2];
|
|
|
|
// Recalculate A and b for the y values.
|
|
// Note the weighting of the first row of values.
|
|
// const float weight_1st_row = 0.5f;
|
|
const float weight_1st_row = 0.2f;
|
|
for (uint8_t r = 0; r < 3; ++ r) {
|
|
for (uint8_t c = 0; c < 3; ++ c) {
|
|
acc = 0;
|
|
for (uint8_t i = 0; i < npts; ++ i) {
|
|
float w = (i < 3) ? weight_1st_row : 1.f;
|
|
float a = (r == 2) ? 1.f : measured_pts[2 * i + r];
|
|
float b = (c == 2) ? 1.f : measured_pts[2 * i + c];
|
|
acc += a * b * w;
|
|
}
|
|
A[r][c] = acc;
|
|
}
|
|
acc = 0.f;
|
|
for (uint8_t i = 0; i < npts; ++ i) {
|
|
float w = (i < 3) ? weight_1st_row : 1.f;
|
|
float a = (r == 2) ? 1.f : measured_pts[2 * i + r];
|
|
float b = pgm_read_float(true_pts+i*2+1);
|
|
acc += w * a * b;
|
|
}
|
|
b[r] = acc;
|
|
}
|
|
// Solve the linear equation for ay, by, cy.
|
|
x[0] = 0.f, x[1] = 0.f; x[2] = 0.f;
|
|
for (uint8_t iter = 0; iter < 100; ++ iter) {
|
|
x[0] = (b[0] - A[0][1] * x[1] - A[0][2] * x[2]) / A[0][0];
|
|
x[1] = (b[1] - A[1][0] * x[0] - A[1][2] * x[2]) / A[1][1];
|
|
x[2] = (b[2] - A[2][0] * x[0] - A[2][1] * x[1]) / A[2][2];
|
|
}
|
|
// Store the result to the output variables.
|
|
vec_x[1] = x[0];
|
|
vec_y[1] = x[1];
|
|
cntr[1] = x[2];
|
|
}
|
|
|
|
SERIAL_ECHOLNPGM("Error after correction: ");
|
|
for (uint8_t i = 0; i < npts; ++ i) {
|
|
float x = vec_x[0] * measured_pts[i*2] + vec_y[0] * measured_pts[i*2+1] + cntr[0];
|
|
float y = vec_x[1] * measured_pts[i*2] + vec_y[1] * measured_pts[i*2+1] + cntr[1];
|
|
SERIAL_ECHOPGM("point #");
|
|
MYSERIAL.print(int(i));
|
|
SERIAL_ECHOPGM(" measured: (");
|
|
MYSERIAL.print(measured_pts[i*2], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(measured_pts[i*2+1], 5);
|
|
SERIAL_ECHOPGM("); corrected: (");
|
|
MYSERIAL.print(x, 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(y, 5);
|
|
SERIAL_ECHOPGM("); target: (");
|
|
MYSERIAL.print(pgm_read_float(true_pts+i*2 ), 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(pgm_read_float(true_pts+i*2+1), 5);
|
|
SERIAL_ECHOPGM("), error: ");
|
|
MYSERIAL.print(sqrt(sqr(pgm_read_float(true_pts+i*2)-x)+sqr(pgm_read_float(true_pts+i*2+1)-y)));
|
|
SERIAL_ECHOLNPGM("");
|
|
}
|
|
|
|
SERIAL_ECHOPGM("X vector new, inverted: ");
|
|
MYSERIAL.print(vec_x[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(vec_x[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOPGM("Y vector new, inverted: ");
|
|
MYSERIAL.print(vec_y[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(vec_y[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOPGM("center new, inverted: ");
|
|
MYSERIAL.print(cntr[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(cntr[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
delay_keep_alive(100);
|
|
|
|
#if 0
|
|
// Normalize the vectors. We expect, that the machine axes may be skewed a bit, but the distances are correct.
|
|
// l shall be very close to 1 already.
|
|
float l = sqrt(vec_x[0]*vec_x[0] + vec_x[1] * vec_x[1]);
|
|
vec_x[0] /= l;
|
|
vec_x[1] /= l;
|
|
SERIAL_ECHOPGM("Length of the X vector: ");
|
|
MYSERIAL.print(l, 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
l = sqrt(vec_y[0]*vec_y[0] + vec_y[1] * vec_y[1]);
|
|
vec_y[0] /= l;
|
|
vec_y[1] /= l;
|
|
SERIAL_ECHOPGM("Length of the Y vector: ");
|
|
MYSERIAL.print(l, 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
// Recalculate the center using the adjusted vec_x/vec_y
|
|
{
|
|
cntr[0] = 0.f;
|
|
cntr[1] = 0.f;
|
|
for (uint8_t i = 0; i < npts; ++ i) {
|
|
cntr[0] += measured_pts[2 * i ] - pgm_read_float(true_pts+i*2) * vec_x[0] - pgm_read_float(true_pts+i*2+1) * vec_y[0];
|
|
cntr[1] += measured_pts[2 * i + 1] - pgm_read_float(true_pts+i*2) * vec_x[1] - pgm_read_float(true_pts+i*2+1) * vec_y[1];
|
|
}
|
|
cntr[0] /= float(npts);
|
|
cntr[1] /= float(npts);
|
|
}
|
|
|
|
SERIAL_ECHOPGM("X vector new, inverted, normalized: ");
|
|
MYSERIAL.print(vec_x[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(vec_x[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOPGM("Y vector new, inverted, normalized: ");
|
|
MYSERIAL.print(vec_y[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(vec_y[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOPGM("center new, inverted, normalized: ");
|
|
MYSERIAL.print(cntr[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(cntr[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
#endif
|
|
|
|
// Invert the transformation matrix made of vec_x, vec_y and cntr.
|
|
{
|
|
float d = vec_x[0] * vec_y[1] - vec_x[1] * vec_y[0];
|
|
float Ainv[2][2] = {
|
|
{ vec_y[1] / d, - vec_y[0] / d },
|
|
{ - vec_x[1] / d, vec_x[0] / d }
|
|
};
|
|
float cntrInv[2] = {
|
|
- Ainv[0][0] * cntr[0] - Ainv[0][1] * cntr[1],
|
|
- Ainv[1][0] * cntr[0] - Ainv[1][1] * cntr[1]
|
|
};
|
|
vec_x[0] = Ainv[0][0];
|
|
vec_x[1] = Ainv[1][0];
|
|
vec_y[0] = Ainv[0][1];
|
|
vec_y[1] = Ainv[1][1];
|
|
cntr[0] = cntrInv[0];
|
|
cntr[1] = cntrInv[1];
|
|
}
|
|
|
|
SERIAL_ECHOPGM("X vector, adjusted: ");
|
|
MYSERIAL.print(vec_x[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(vec_x[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOPGM("Y vector, adjusted: ");
|
|
MYSERIAL.print(vec_y[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(vec_y[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOPGM("center, adjusted: ");
|
|
MYSERIAL.print(cntr[0], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(cntr[1], 5);
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
SERIAL_ECHOLNPGM("Difference after correction: ");
|
|
for (uint8_t i = 0; i < npts; ++ i) {
|
|
float x = vec_x[0] * pgm_read_float(true_pts+i*2) + vec_y[0] * pgm_read_float(true_pts+i*2+1) + cntr[0];
|
|
float y = vec_x[1] * pgm_read_float(true_pts+i*2) + vec_y[1] * pgm_read_float(true_pts+i*2+1) + cntr[1];
|
|
SERIAL_ECHOPGM("point #");
|
|
MYSERIAL.print(int(i));
|
|
SERIAL_ECHOPGM("measured: (");
|
|
MYSERIAL.print(measured_pts[i*2], 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(measured_pts[i*2+1], 5);
|
|
SERIAL_ECHOPGM("); measured-corrected: (");
|
|
MYSERIAL.print(x, 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(y, 5);
|
|
SERIAL_ECHOPGM("); target: (");
|
|
MYSERIAL.print(pgm_read_float(true_pts+i*2 ), 5);
|
|
SERIAL_ECHOPGM(", ");
|
|
MYSERIAL.print(pgm_read_float(true_pts+i*2+1), 5);
|
|
SERIAL_ECHOPGM("), error: ");
|
|
MYSERIAL.print(sqrt(sqr(measured_pts[i*2]-x)+sqr(measured_pts[i*2+1]-y)));
|
|
SERIAL_ECHOLNPGM("");
|
|
}
|
|
delay_keep_alive(100);
|
|
|
|
return true;
|
|
}
|
|
|
|
void reset_bed_offset_and_skew()
|
|
{
|
|
eeprom_update_dword((uint32_t*)(EEPROM_BED_CALIBRATION_CENTER+0), 0x0FFFFFFFF);
|
|
eeprom_update_dword((uint32_t*)(EEPROM_BED_CALIBRATION_CENTER+4), 0x0FFFFFFFF);
|
|
eeprom_update_dword((uint32_t*)(EEPROM_BED_CALIBRATION_VEC_X +0), 0x0FFFFFFFF);
|
|
eeprom_update_dword((uint32_t*)(EEPROM_BED_CALIBRATION_VEC_X +4), 0x0FFFFFFFF);
|
|
eeprom_update_dword((uint32_t*)(EEPROM_BED_CALIBRATION_VEC_Y +0), 0x0FFFFFFFF);
|
|
eeprom_update_dword((uint32_t*)(EEPROM_BED_CALIBRATION_VEC_Y +4), 0x0FFFFFFFF);
|
|
}
|
|
|
|
void world2machine_reset()
|
|
{
|
|
// Identity transformation.
|
|
world2machine_rotation_and_skew[0][0] = 1.f;
|
|
world2machine_rotation_and_skew[0][1] = 0.f;
|
|
world2machine_rotation_and_skew[1][0] = 0.f;
|
|
world2machine_rotation_and_skew[1][1] = 1.f;
|
|
// Zero shift.
|
|
world2machine_shift[0] = 0.f;
|
|
world2machine_shift[1] = 0.f;
|
|
}
|
|
|
|
static inline bool vec_undef(const float v[2])
|
|
{
|
|
const uint32_t *vx = (const uint32_t*)v;
|
|
return vx[0] == 0x0FFFFFFFF || vx[1] == 0x0FFFFFFFF;
|
|
}
|
|
|
|
void world2machine_initialize()
|
|
{
|
|
float cntr[2] = {
|
|
eeprom_read_float((float*)(EEPROM_BED_CALIBRATION_CENTER+0)),
|
|
eeprom_read_float((float*)(EEPROM_BED_CALIBRATION_CENTER+4))
|
|
};
|
|
float vec_x[2] = {
|
|
eeprom_read_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +0)),
|
|
eeprom_read_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +4))
|
|
};
|
|
float vec_y[2] = {
|
|
eeprom_read_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +0)),
|
|
eeprom_read_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +4))
|
|
};
|
|
|
|
bool reset = false;
|
|
if (vec_undef(cntr) || vec_undef(vec_x) || vec_undef(vec_y))
|
|
reset = true;
|
|
else {
|
|
// Length of the vec_x shall be close to unity.
|
|
float l = sqrt(vec_x[0] * vec_x[0] + vec_x[1] * vec_x[1]);
|
|
if (l < 0.9 || l > 1.1) {
|
|
SERIAL_ECHOLNPGM("Invalid bed correction matrix. Length of the X vector out of range.");
|
|
reset = true;
|
|
}
|
|
// Length of the vec_y shall be close to unity.
|
|
l = sqrt(vec_y[0] * vec_y[0] + vec_y[1] * vec_y[1]);
|
|
if (l < 0.9 || l > 1.1) {
|
|
SERIAL_ECHOLNPGM("Invalid bed correction matrix. Length of the X vector out of range.");
|
|
reset = true;
|
|
}
|
|
// Correction of the zero point shall be reasonably small.
|
|
l = sqrt(cntr[0] * cntr[0] + cntr[1] * cntr[1]);
|
|
if (l > 15.f) {
|
|
SERIAL_ECHOLNPGM("Invalid bed correction matrix. Shift out of range.");
|
|
reset = true;
|
|
}
|
|
// vec_x and vec_y shall be nearly perpendicular.
|
|
l = vec_x[0] * vec_y[0] + vec_x[1] * vec_y[1];
|
|
if (fabs(l) > 0.1f) {
|
|
SERIAL_ECHOLNPGM("Invalid bed correction matrix. X/Y axes are far from being perpendicular.");
|
|
reset = true;
|
|
}
|
|
}
|
|
|
|
if (reset) {
|
|
SERIAL_ECHOLNPGM("Invalid bed correction matrix. Resetting to identity.");
|
|
reset_bed_offset_and_skew();
|
|
world2machine_reset();
|
|
} else {
|
|
world2machine_rotation_and_skew[0][0] = vec_x[0];
|
|
world2machine_rotation_and_skew[1][0] = vec_x[1];
|
|
world2machine_rotation_and_skew[0][1] = vec_y[0];
|
|
world2machine_rotation_and_skew[1][1] = vec_y[1];
|
|
world2machine_shift[0] = cntr[0];
|
|
world2machine_shift[1] = cntr[1];
|
|
}
|
|
}
|
|
|
|
// When switching from absolute to corrected coordinates,
|
|
// this will get the absolute coordinates from the servos,
|
|
// applies the inverse world2machine transformation
|
|
// and stores the result into current_position[x,y].
|
|
void world2machine_update_current()
|
|
{
|
|
// Invert the transformation matrix made of vec_x, vec_y and cntr.
|
|
float d = world2machine_rotation_and_skew[0][0] * world2machine_rotation_and_skew[1][1] - world2machine_rotation_and_skew[1][0] * world2machine_rotation_and_skew[0][1];
|
|
float Ainv[2][2] = {
|
|
{ world2machine_rotation_and_skew[1][1] / d, - world2machine_rotation_and_skew[0][1] / d },
|
|
{ - world2machine_rotation_and_skew[1][0] / d, world2machine_rotation_and_skew[0][0] / d }
|
|
};
|
|
float x = current_position[X_AXIS] - world2machine_shift[0];
|
|
float y = current_position[Y_AXIS] - world2machine_shift[1];
|
|
current_position[X_AXIS] = Ainv[0][0] * x + Ainv[0][1] * y;
|
|
current_position[Y_AXIS] = Ainv[1][0] * x + Ainv[1][1] * y;
|
|
}
|
|
|
|
static inline void go_xyz(float x, float y, float z, float fr)
|
|
{
|
|
plan_buffer_line(x, y, z, current_position[E_AXIS], fr, active_extruder);
|
|
st_synchronize();
|
|
}
|
|
|
|
static inline void go_xy(float x, float y, float fr)
|
|
{
|
|
plan_buffer_line(x, y, current_position[Z_AXIS], current_position[E_AXIS], fr, active_extruder);
|
|
st_synchronize();
|
|
}
|
|
|
|
static inline void go_to_current(float fr)
|
|
{
|
|
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], fr, active_extruder);
|
|
st_synchronize();
|
|
}
|
|
|
|
static inline void update_current_position_xyz()
|
|
{
|
|
current_position[X_AXIS] = st_get_position_mm(X_AXIS);
|
|
current_position[Y_AXIS] = st_get_position_mm(Y_AXIS);
|
|
current_position[Z_AXIS] = st_get_position_mm(Z_AXIS);
|
|
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
|
}
|
|
|
|
static inline void update_current_position_z()
|
|
{
|
|
current_position[Z_AXIS] = st_get_position_mm(Z_AXIS);
|
|
plan_set_z_position(current_position[Z_AXIS]);
|
|
}
|
|
|
|
// At the current position, find the Z stop.
|
|
inline void find_bed_induction_sensor_point_z()
|
|
{
|
|
bool endstops_enabled = enable_endstops(true);
|
|
bool endstop_z_enabled = enable_z_endstop(false);
|
|
|
|
// move down until you find the bed
|
|
current_position[Z_AXIS] = -10;
|
|
go_to_current(homing_feedrate[Z_AXIS]/60);
|
|
// we have to let the planner know where we are right now as it is not where we said to go.
|
|
update_current_position_z();
|
|
|
|
// move up the retract distance
|
|
current_position[Z_AXIS] += home_retract_mm_ext(Z_AXIS);
|
|
go_to_current(homing_feedrate[Z_AXIS]/60);
|
|
|
|
// move back down slowly to find bed
|
|
current_position[Z_AXIS] -= home_retract_mm_ext(Z_AXIS) * 2;
|
|
go_to_current(homing_feedrate[Z_AXIS]/(4*60));
|
|
// we have to let the planner know where we are right now as it is not where we said to go.
|
|
update_current_position_z();
|
|
|
|
enable_endstops(endstops_enabled);
|
|
enable_z_endstop(endstop_z_enabled);
|
|
}
|
|
|
|
// Search around the current_position[X,Y],
|
|
// look for the induction sensor response.
|
|
// Adjust the current_position[X,Y,Z] to the center of the target dot and its response Z coordinate.
|
|
#define FIND_BED_INDUCTION_SENSOR_POINT_X_RADIUS (8.f)
|
|
#define FIND_BED_INDUCTION_SENSOR_POINT_Y_RADIUS (6.f)
|
|
#define FIND_BED_INDUCTION_SENSOR_POINT_XY_STEP (1.f)
|
|
#define FIND_BED_INDUCTION_SENSOR_POINT_Z_STEP (0.5f)
|
|
inline bool find_bed_induction_sensor_point_xy()
|
|
{
|
|
float feedrate = homing_feedrate[X_AXIS] / 60.f;
|
|
bool found = false;
|
|
|
|
{
|
|
float x0 = current_position[X_AXIS] - FIND_BED_INDUCTION_SENSOR_POINT_X_RADIUS;
|
|
float x1 = current_position[X_AXIS] + FIND_BED_INDUCTION_SENSOR_POINT_X_RADIUS;
|
|
float y0 = current_position[Y_AXIS] - FIND_BED_INDUCTION_SENSOR_POINT_Y_RADIUS;
|
|
float y1 = current_position[Y_AXIS] + FIND_BED_INDUCTION_SENSOR_POINT_Y_RADIUS;
|
|
uint8_t nsteps_y;
|
|
uint8_t i;
|
|
if (x0 < X_MIN_POS)
|
|
x0 = X_MIN_POS;
|
|
if (x1 > X_MAX_POS)
|
|
x1 = X_MAX_POS;
|
|
if (y0 < Y_MIN_POS)
|
|
y0 = Y_MIN_POS;
|
|
if (y1 > Y_MAX_POS)
|
|
y1 = Y_MAX_POS;
|
|
nsteps_y = int(ceil((y1 - y0) / FIND_BED_INDUCTION_SENSOR_POINT_XY_STEP));
|
|
|
|
enable_endstops(false);
|
|
bool dir_positive = true;
|
|
|
|
// go_xyz(current_position[X_AXIS], current_position[Y_AXIS], MESH_HOME_Z_SEARCH, homing_feedrate[Z_AXIS]/60);
|
|
go_xyz(x0, y0, current_position[Z_AXIS], feedrate);
|
|
// Continously lower the Z axis.
|
|
endstops_hit_on_purpose();
|
|
enable_z_endstop(true);
|
|
while (current_position[Z_AXIS] > -10.f) {
|
|
// Do nsteps_y zig-zag movements.
|
|
current_position[Y_AXIS] = y0;
|
|
for (i = 0; i < nsteps_y; current_position[Y_AXIS] += (y1 - y0) / float(nsteps_y - 1), ++ i) {
|
|
// Run with a slightly decreasing Z axis, zig-zag movement. Stop at the Z end-stop.
|
|
current_position[Z_AXIS] -= FIND_BED_INDUCTION_SENSOR_POINT_Z_STEP / float(nsteps_y);
|
|
go_xyz(dir_positive ? x1 : x0, current_position[Y_AXIS], current_position[Z_AXIS], feedrate);
|
|
dir_positive = ! dir_positive;
|
|
if (endstop_z_hit_on_purpose())
|
|
goto endloop;
|
|
}
|
|
for (i = 0; i < nsteps_y; current_position[Y_AXIS] -= (y1 - y0) / float(nsteps_y - 1), ++ i) {
|
|
// Run with a slightly decreasing Z axis, zig-zag movement. Stop at the Z end-stop.
|
|
current_position[Z_AXIS] -= FIND_BED_INDUCTION_SENSOR_POINT_Z_STEP / float(nsteps_y);
|
|
go_xyz(dir_positive ? x1 : x0, current_position[Y_AXIS], current_position[Z_AXIS], feedrate);
|
|
dir_positive = ! dir_positive;
|
|
if (endstop_z_hit_on_purpose())
|
|
goto endloop;
|
|
}
|
|
}
|
|
endloop:
|
|
// SERIAL_ECHOLN("First hit");
|
|
|
|
// we have to let the planner know where we are right now as it is not where we said to go.
|
|
update_current_position_xyz();
|
|
|
|
// Search in this plane for the first hit. Zig-zag first in X, then in Y axis.
|
|
for (int8_t iter = 0; iter < 3; ++ iter) {
|
|
if (iter > 0) {
|
|
// Slightly lower the Z axis to get a reliable trigger.
|
|
current_position[Z_AXIS] -= 0.02f;
|
|
go_xyz(current_position[X_AXIS], current_position[Y_AXIS], MESH_HOME_Z_SEARCH, homing_feedrate[Z_AXIS]/60);
|
|
}
|
|
|
|
// Do nsteps_y zig-zag movements.
|
|
float a, b;
|
|
enable_endstops(false);
|
|
enable_z_endstop(false);
|
|
current_position[Y_AXIS] = y0;
|
|
go_xy(x0, current_position[Y_AXIS], feedrate);
|
|
enable_z_endstop(true);
|
|
found = false;
|
|
for (i = 0, dir_positive = true; i < nsteps_y; current_position[Y_AXIS] += (y1 - y0) / float(nsteps_y - 1), ++ i, dir_positive = ! dir_positive) {
|
|
go_xy(dir_positive ? x1 : x0, current_position[Y_AXIS], feedrate);
|
|
if (endstop_z_hit_on_purpose()) {
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
update_current_position_xyz();
|
|
if (! found) {
|
|
// SERIAL_ECHOLN("Search in Y - not found");
|
|
continue;
|
|
}
|
|
// SERIAL_ECHOLN("Search in Y - found");
|
|
a = current_position[Y_AXIS];
|
|
|
|
enable_z_endstop(false);
|
|
current_position[Y_AXIS] = y1;
|
|
go_xy(x0, current_position[Y_AXIS], feedrate);
|
|
enable_z_endstop(true);
|
|
found = false;
|
|
for (i = 0, dir_positive = true; i < nsteps_y; current_position[Y_AXIS] -= (y1 - y0) / float(nsteps_y - 1), ++ i, dir_positive = ! dir_positive) {
|
|
go_xy(dir_positive ? x1 : x0, current_position[Y_AXIS], feedrate);
|
|
if (endstop_z_hit_on_purpose()) {
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
update_current_position_xyz();
|
|
if (! found) {
|
|
// SERIAL_ECHOLN("Search in Y2 - not found");
|
|
continue;
|
|
}
|
|
// SERIAL_ECHOLN("Search in Y2 - found");
|
|
b = current_position[Y_AXIS];
|
|
current_position[Y_AXIS] = 0.5f * (a + b);
|
|
|
|
// Search in the X direction along a cross.
|
|
found = false;
|
|
enable_z_endstop(false);
|
|
go_xy(x0, current_position[Y_AXIS], feedrate);
|
|
enable_z_endstop(true);
|
|
go_xy(x1, current_position[Y_AXIS], feedrate);
|
|
update_current_position_xyz();
|
|
if (! endstop_z_hit_on_purpose()) {
|
|
// SERIAL_ECHOLN("Search X span 0 - not found");
|
|
continue;
|
|
}
|
|
// SERIAL_ECHOLN("Search X span 0 - found");
|
|
a = current_position[X_AXIS];
|
|
enable_z_endstop(false);
|
|
go_xy(x1, current_position[Y_AXIS], feedrate);
|
|
enable_z_endstop(true);
|
|
go_xy(x0, current_position[Y_AXIS], feedrate);
|
|
update_current_position_xyz();
|
|
if (! endstop_z_hit_on_purpose()) {
|
|
// SERIAL_ECHOLN("Search X span 1 - not found");
|
|
continue;
|
|
}
|
|
// SERIAL_ECHOLN("Search X span 1 - found");
|
|
b = current_position[X_AXIS];
|
|
// Go to the center.
|
|
enable_z_endstop(false);
|
|
current_position[X_AXIS] = 0.5f * (a + b);
|
|
go_xy(current_position[X_AXIS], current_position[Y_AXIS], feedrate);
|
|
found = true;
|
|
|
|
#if 1
|
|
// Search in the Y direction along a cross.
|
|
found = false;
|
|
enable_z_endstop(false);
|
|
go_xy(current_position[X_AXIS], y0, feedrate);
|
|
enable_z_endstop(true);
|
|
go_xy(current_position[X_AXIS], y1, feedrate);
|
|
update_current_position_xyz();
|
|
if (! endstop_z_hit_on_purpose()) {
|
|
// SERIAL_ECHOLN("Search Y2 span 0 - not found");
|
|
continue;
|
|
}
|
|
// SERIAL_ECHOLN("Search Y2 span 0 - found");
|
|
a = current_position[Y_AXIS];
|
|
enable_z_endstop(false);
|
|
go_xy(current_position[X_AXIS], y1, feedrate);
|
|
enable_z_endstop(true);
|
|
go_xy(current_position[X_AXIS], y0, feedrate);
|
|
update_current_position_xyz();
|
|
if (! endstop_z_hit_on_purpose()) {
|
|
// SERIAL_ECHOLN("Search Y2 span 1 - not found");
|
|
continue;
|
|
}
|
|
// SERIAL_ECHOLN("Search Y2 span 1 - found");
|
|
b = current_position[Y_AXIS];
|
|
// Go to the center.
|
|
enable_z_endstop(false);
|
|
current_position[Y_AXIS] = 0.5f * (a + b);
|
|
go_xy(current_position[X_AXIS], current_position[Y_AXIS], feedrate);
|
|
found = true;
|
|
#endif
|
|
break;
|
|
}
|
|
}
|
|
|
|
enable_z_endstop(false);
|
|
return found;
|
|
}
|
|
|
|
// Search around the current_position[X,Y,Z].
|
|
// It is expected, that the induction sensor is switched on at the current position.
|
|
// Look around this center point by painting a star around the point.
|
|
inline bool improve_bed_induction_sensor_point()
|
|
{
|
|
static const float search_radius = 8.f;
|
|
|
|
bool endstops_enabled = enable_endstops(false);
|
|
bool endstop_z_enabled = enable_z_endstop(false);
|
|
bool found = false;
|
|
float feedrate = homing_feedrate[X_AXIS] / 60.f;
|
|
float center_old_x = current_position[X_AXIS];
|
|
float center_old_y = current_position[Y_AXIS];
|
|
float center_x = 0.f;
|
|
float center_y = 0.f;
|
|
|
|
for (uint8_t iter = 0; iter < 4; ++ iter) {
|
|
switch (iter) {
|
|
case 0:
|
|
destination[X_AXIS] = center_old_x - search_radius * 0.707;
|
|
destination[Y_AXIS] = center_old_y - search_radius * 0.707;
|
|
break;
|
|
case 1:
|
|
destination[X_AXIS] = center_old_x + search_radius * 0.707;
|
|
destination[Y_AXIS] = center_old_y + search_radius * 0.707;
|
|
break;
|
|
case 2:
|
|
destination[X_AXIS] = center_old_x + search_radius * 0.707;
|
|
destination[Y_AXIS] = center_old_y - search_radius * 0.707;
|
|
break;
|
|
case 3:
|
|
default:
|
|
destination[X_AXIS] = center_old_x - search_radius * 0.707;
|
|
destination[Y_AXIS] = center_old_y + search_radius * 0.707;
|
|
break;
|
|
}
|
|
|
|
// Trim the vector from center_old_[x,y] to destination[x,y] by the bed dimensions.
|
|
float vx = destination[X_AXIS] - center_old_x;
|
|
float vy = destination[Y_AXIS] - center_old_y;
|
|
float l = sqrt(vx*vx+vy*vy);
|
|
float t;
|
|
if (destination[X_AXIS] < X_MIN_POS) {
|
|
// Exiting the bed at xmin.
|
|
t = (center_x - X_MIN_POS) / l;
|
|
destination[X_AXIS] = X_MIN_POS;
|
|
destination[Y_AXIS] = center_old_y + t * vy;
|
|
} else if (destination[X_AXIS] > X_MAX_POS) {
|
|
// Exiting the bed at xmax.
|
|
t = (X_MAX_POS - center_x) / l;
|
|
destination[X_AXIS] = X_MAX_POS;
|
|
destination[Y_AXIS] = center_old_y + t * vy;
|
|
}
|
|
if (destination[Y_AXIS] < Y_MIN_POS) {
|
|
// Exiting the bed at ymin.
|
|
t = (center_y - Y_MIN_POS) / l;
|
|
destination[X_AXIS] = center_old_x + t * vx;
|
|
destination[Y_AXIS] = Y_MIN_POS;
|
|
} else if (destination[Y_AXIS] > Y_MAX_POS) {
|
|
// Exiting the bed at xmax.
|
|
t = (Y_MAX_POS - center_y) / l;
|
|
destination[X_AXIS] = center_old_x + t * vx;
|
|
destination[Y_AXIS] = Y_MAX_POS;
|
|
}
|
|
|
|
// Move away from the measurement point.
|
|
enable_endstops(false);
|
|
go_xy(destination[X_AXIS], destination[Y_AXIS], feedrate);
|
|
// Move towards the measurement point, until the induction sensor triggers.
|
|
enable_endstops(true);
|
|
go_xy(center_old_x, center_old_y, feedrate);
|
|
update_current_position_xyz();
|
|
// if (! endstop_z_hit_on_purpose()) return false;
|
|
center_x += current_position[X_AXIS];
|
|
center_y += current_position[Y_AXIS];
|
|
}
|
|
|
|
// Calculate the new center, move to the new center.
|
|
center_x /= 4.f;
|
|
center_y /= 4.f;
|
|
current_position[X_AXIS] = center_x;
|
|
current_position[Y_AXIS] = center_y;
|
|
enable_endstops(false);
|
|
go_xy(current_position[X_AXIS], current_position[Y_AXIS], feedrate);
|
|
|
|
enable_endstops(endstops_enabled);
|
|
enable_z_endstop(endstop_z_enabled);
|
|
return found;
|
|
}
|
|
|
|
// Search around the current_position[X,Y,Z].
|
|
// It is expected, that the induction sensor is switched on at the current position.
|
|
// Look around this center point by painting a star around the point.
|
|
#define IMPROVE_BED_INDUCTION_SENSOR_SEARCH_RADIUS (8.f)
|
|
inline bool improve_bed_induction_sensor_point2(bool lift_z_on_min_y)
|
|
{
|
|
float center_old_x = current_position[X_AXIS];
|
|
float center_old_y = current_position[Y_AXIS];
|
|
float a, b;
|
|
|
|
enable_endstops(false);
|
|
|
|
{
|
|
float x0 = center_old_x - IMPROVE_BED_INDUCTION_SENSOR_SEARCH_RADIUS;
|
|
float x1 = center_old_x + IMPROVE_BED_INDUCTION_SENSOR_SEARCH_RADIUS;
|
|
if (x0 < X_MIN_POS)
|
|
x0 = X_MIN_POS;
|
|
if (x1 > X_MAX_POS)
|
|
x1 = X_MAX_POS;
|
|
|
|
// Search in the X direction along a cross.
|
|
enable_z_endstop(false);
|
|
go_xy(x0, current_position[Y_AXIS], homing_feedrate[X_AXIS] / 60.f);
|
|
enable_z_endstop(true);
|
|
go_xy(x1, current_position[Y_AXIS], homing_feedrate[X_AXIS] / 60.f);
|
|
update_current_position_xyz();
|
|
if (! endstop_z_hit_on_purpose()) {
|
|
current_position[X_AXIS] = center_old_x;
|
|
goto canceled;
|
|
}
|
|
a = current_position[X_AXIS];
|
|
enable_z_endstop(false);
|
|
go_xy(x1, current_position[Y_AXIS], homing_feedrate[X_AXIS] / 60.f);
|
|
enable_z_endstop(true);
|
|
go_xy(x0, current_position[Y_AXIS], homing_feedrate[X_AXIS] / 60.f);
|
|
update_current_position_xyz();
|
|
if (! endstop_z_hit_on_purpose()) {
|
|
current_position[X_AXIS] = center_old_x;
|
|
goto canceled;
|
|
}
|
|
b = current_position[X_AXIS];
|
|
|
|
// Go to the center.
|
|
enable_z_endstop(false);
|
|
current_position[X_AXIS] = 0.5f * (a + b);
|
|
go_xy(current_position[X_AXIS], current_position[Y_AXIS], homing_feedrate[X_AXIS] / 60.f);
|
|
}
|
|
|
|
{
|
|
float y0 = center_old_y - IMPROVE_BED_INDUCTION_SENSOR_SEARCH_RADIUS;
|
|
float y1 = center_old_y + IMPROVE_BED_INDUCTION_SENSOR_SEARCH_RADIUS;
|
|
if (y0 < Y_MIN_POS)
|
|
y0 = Y_MIN_POS;
|
|
if (y1 > Y_MAX_POS)
|
|
y1 = Y_MAX_POS;
|
|
|
|
// Search in the Y direction along a cross.
|
|
enable_z_endstop(false);
|
|
go_xy(current_position[X_AXIS], y0, homing_feedrate[X_AXIS] / 60.f);
|
|
if (lift_z_on_min_y) {
|
|
// The first row of points are very close to the end stop.
|
|
// Lift the sensor to disengage the trigger. This is necessary because of the sensor hysteresis.
|
|
go_xyz(current_position[X_AXIS], y0, current_position[Z_AXIS]+1.5f, homing_feedrate[Z_AXIS] / 60.f);
|
|
// and go back.
|
|
go_xyz(current_position[X_AXIS], y0, current_position[Z_AXIS], homing_feedrate[Z_AXIS] / 60.f);
|
|
}
|
|
if (lift_z_on_min_y && (READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING) == 1) {
|
|
// Already triggering before we started the move.
|
|
// Shift the trigger point slightly outwards.
|
|
// a = current_position[Y_AXIS] - 1.5f;
|
|
a = current_position[Y_AXIS];
|
|
} else {
|
|
enable_z_endstop(true);
|
|
go_xy(current_position[X_AXIS], y1, homing_feedrate[X_AXIS] / 60.f);
|
|
update_current_position_xyz();
|
|
if (! endstop_z_hit_on_purpose()) {
|
|
current_position[Y_AXIS] = center_old_y;
|
|
goto canceled;
|
|
}
|
|
a = current_position[Y_AXIS];
|
|
}
|
|
enable_z_endstop(false);
|
|
go_xy(current_position[X_AXIS], y1, homing_feedrate[X_AXIS] / 60.f);
|
|
enable_z_endstop(true);
|
|
go_xy(current_position[X_AXIS], y0, homing_feedrate[X_AXIS] / 60.f);
|
|
update_current_position_xyz();
|
|
if (! endstop_z_hit_on_purpose()) {
|
|
current_position[Y_AXIS] = center_old_y;
|
|
goto canceled;
|
|
}
|
|
b = current_position[Y_AXIS];
|
|
|
|
// Go to the center.
|
|
enable_z_endstop(false);
|
|
current_position[Y_AXIS] = 0.5f * (a + b);
|
|
go_xy(current_position[X_AXIS], current_position[Y_AXIS], homing_feedrate[X_AXIS] / 60.f);
|
|
}
|
|
|
|
return true;
|
|
|
|
canceled:
|
|
// Go back to the center.
|
|
enable_z_endstop(false);
|
|
go_xy(current_position[X_AXIS], current_position[Y_AXIS], homing_feedrate[X_AXIS] / 60.f);
|
|
return false;
|
|
}
|
|
|
|
#define MESH_BED_CALIBRATION_SHOW_LCD
|
|
|
|
bool find_bed_offset_and_skew()
|
|
{
|
|
// Reusing the z_values memory for the measurement cache.
|
|
// 7x7=49 floats, good for 16 (x,y,z) vectors.
|
|
float *pts = &mbl.z_values[0][0];
|
|
float *vec_x = pts + 2 * 4;
|
|
float *vec_y = vec_x + 2;
|
|
float *cntr = vec_y + 2;
|
|
memset(pts, 0, sizeof(float) * 7 * 7);
|
|
|
|
// Let the planner use the uncorrected coordinates.
|
|
world2machine_reset();
|
|
|
|
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
|
|
lcd_implementation_clear();
|
|
lcd_print_at_PGM(0, 0, MSG_FIND_BED_OFFSET_AND_SKEW_LINE1);
|
|
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
|
|
|
|
// Collect the rear 2x3 points.
|
|
current_position[Z_AXIS] = MESH_HOME_Z_SEARCH;
|
|
for (int k = 0; k < 4; ++ k) {
|
|
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
|
|
lcd_print_at_PGM(0, 1, MSG_FIND_BED_OFFSET_AND_SKEW_LINE2);
|
|
lcd_implementation_print_at(0, 2, k+1);
|
|
lcd_printPGM(MSG_FIND_BED_OFFSET_AND_SKEW_LINE3);
|
|
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
|
|
float *pt = pts + k * 2;
|
|
// Go up to z_initial.
|
|
go_to_current(homing_feedrate[Z_AXIS] / 60.f);
|
|
// Go to the measurement point position.
|
|
current_position[X_AXIS] = pgm_read_float(bed_ref_points_4+k*2);
|
|
current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4+k*2+1);
|
|
go_to_current(homing_feedrate[X_AXIS] / 60.f);
|
|
if (! find_bed_induction_sensor_point_xy())
|
|
return false;
|
|
find_bed_induction_sensor_point_z();
|
|
pt[0] = current_position[X_AXIS];
|
|
pt[1] = current_position[Y_AXIS];
|
|
// Start searching for the other points at 3mm above the last point.
|
|
current_position[Z_AXIS] += 3.f;
|
|
cntr[0] += pt[0];
|
|
cntr[1] += pt[1];
|
|
}
|
|
|
|
#if 0
|
|
// Average the X and Y vectors. They may not be perpendicular, if the printer is built incorrectly.
|
|
{
|
|
float len;
|
|
// Average the center point.
|
|
cntr[0] *= 1.f/4.f;
|
|
cntr[1] *= 1.f/4.f;
|
|
cntr[2] *= 1.f/4.f;
|
|
// Average the X vector.
|
|
vec_x[0] = (pts[2 * 1 + 0] - pts[2 * 3 + 0]) / 2.f;
|
|
vec_x[1] = (pts[2 * 1 + 1] - pts[2 * 3 + 1]) / 2.f;
|
|
len = sqrt(vec_x[0]*vec_x[0] + vec_x[1]*vec_x[1]);
|
|
if (0) {
|
|
// if (len < MEAS_NUM_X_DIST) {
|
|
// Scale the vector up to MEAS_NUM_X_DIST lenght.
|
|
float factor = MEAS_NUM_X_DIST / len;
|
|
vec_x[0] *= factor;
|
|
vec_x[0] *= factor;
|
|
} else {
|
|
// The vector is longer than MEAS_NUM_X_DIST. The X/Y axes are skewed.
|
|
// Verify the maximum skew?
|
|
}
|
|
// Average the Y vector.
|
|
vec_y[0] = (pts[2 * 2 + 0] - pts[2 * 0 + 0]) / 2.f;
|
|
vec_y[1] = (pts[2 * 2 + 1] - pts[2 * 0 + 1]) / 2.f;
|
|
len = sqrt(vec_y[0]*vec_y[0] + vec_y[1]*vec_y[1]);
|
|
if (0) {
|
|
// if (len < MEAS_NUM_Y_DIST) {
|
|
// Scale the vector up to MEAS_NUM_X_DIST lenght.
|
|
float factor = MEAS_NUM_Y_DIST / len;
|
|
vec_y[1] *= factor;
|
|
vec_y[1] *= factor;
|
|
} else {
|
|
// The vector is longer than MEAS_NUM_X_DIST. The X/Y axes are skewed.
|
|
// Verify the maximum skew?
|
|
}
|
|
|
|
// Fearlessly store the calibration values into the eeprom.
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_CENTER+0), cntr [0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_CENTER+4), cntr [1]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +0), vec_x[0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +4), vec_x[1]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +0), vec_y[0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +4), vec_y[1]);
|
|
|
|
#if 0
|
|
SERIAL_ECHOLN("Calibration done.");
|
|
SERIAL_ECHO("Center: ");
|
|
SERIAL_ECHO(cntr[0]);
|
|
SERIAL_ECHO(",");
|
|
SERIAL_ECHO(cntr[1]);
|
|
SERIAL_ECHO(", x: ");
|
|
SERIAL_ECHO(vec_x[0]);
|
|
SERIAL_ECHO(",");
|
|
SERIAL_ECHO(vec_x[1]);
|
|
SERIAL_ECHO(", y: ");
|
|
SERIAL_ECHO(vec_y[0]);
|
|
SERIAL_ECHO(",");
|
|
SERIAL_ECHO(vec_y[1]);
|
|
SERIAL_ECHOLN("");
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
calculate_machine_skew_and_offset_LS(pts, 4, bed_ref_points_4, vec_x, vec_y, cntr);
|
|
world2machine_rotation_and_skew[0][0] = vec_x[0];
|
|
world2machine_rotation_and_skew[1][0] = vec_x[1];
|
|
world2machine_rotation_and_skew[0][1] = vec_y[0];
|
|
world2machine_rotation_and_skew[1][1] = vec_y[1];
|
|
world2machine_shift[0] = cntr[0];
|
|
world2machine_shift[1] = cntr[1];
|
|
#if 1
|
|
// Fearlessly store the calibration values into the eeprom.
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_CENTER+0), cntr [0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_CENTER+4), cntr [1]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +0), vec_x[0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +4), vec_x[1]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +0), vec_y[0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +4), vec_y[1]);
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
|
|
bool improve_bed_offset_and_skew(int8_t method)
|
|
{
|
|
// Reusing the z_values memory for the measurement cache.
|
|
// 7x7=49 floats, good for 16 (x,y,z) vectors.
|
|
float *pts = &mbl.z_values[0][0];
|
|
float *vec_x = pts + 2 * 9;
|
|
float *vec_y = vec_x + 2;
|
|
float *cntr = vec_y + 2;
|
|
memset(pts, 0, sizeof(float) * 7 * 7);
|
|
|
|
// Cache the current correction matrix.
|
|
vec_x[0] = world2machine_rotation_and_skew[0][0];
|
|
vec_x[1] = world2machine_rotation_and_skew[1][0];
|
|
vec_y[0] = world2machine_rotation_and_skew[0][1];
|
|
vec_y[1] = world2machine_rotation_and_skew[1][1];
|
|
cntr[0] = world2machine_shift[0];
|
|
cntr[1] = world2machine_shift[1];
|
|
// and reset the correction matrix, so the planner will not do anything.
|
|
world2machine_reset();
|
|
|
|
bool endstops_enabled = enable_endstops(false);
|
|
bool endstop_z_enabled = enable_z_endstop(false);
|
|
|
|
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
|
|
lcd_implementation_clear();
|
|
lcd_print_at_PGM(0, 0, MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1);
|
|
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
|
|
|
|
// Collect a matrix of 9x9 points.
|
|
for (int8_t mesh_point = 0; mesh_point < 9; ++ mesh_point) {
|
|
// Print the decrasing ID of the measurement point.
|
|
#ifdef MESH_BED_CALIBRATION_SHOW_LCD
|
|
lcd_print_at_PGM(0, 1, MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2);
|
|
lcd_implementation_print_at(0, 2, mesh_point+1);
|
|
lcd_printPGM(MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE3);
|
|
#endif /* MESH_BED_CALIBRATION_SHOW_LCD */
|
|
|
|
// Move up.
|
|
current_position[Z_AXIS] = MESH_HOME_Z_SEARCH;
|
|
enable_endstops(false);
|
|
enable_z_endstop(false);
|
|
go_to_current(homing_feedrate[Z_AXIS]/60);
|
|
// Go to the measurement point.
|
|
// Use the coorrected coordinate, which is a result of find_bed_offset_and_skew().
|
|
current_position[X_AXIS] = vec_x[0] * pgm_read_float(bed_ref_points+mesh_point*2) + vec_y[0] * pgm_read_float(bed_ref_points+mesh_point*2+1) + cntr[0];
|
|
current_position[Y_AXIS] = vec_x[1] * pgm_read_float(bed_ref_points+mesh_point*2) + vec_y[1] * pgm_read_float(bed_ref_points+mesh_point*2+1) + cntr[1];
|
|
// The calibration points are very close to the min Y.
|
|
if (current_position[Y_AXIS] < Y_MIN_POS)
|
|
current_position[Y_AXIS] = Y_MIN_POS;
|
|
go_to_current(homing_feedrate[X_AXIS]/60);
|
|
// Find its Z position by running the normal vertical search.
|
|
// delay_keep_alive(3000);
|
|
find_bed_induction_sensor_point_z();
|
|
// delay_keep_alive(3000);
|
|
// Improve the point position by searching its center in a current plane.
|
|
int8_t n_errors = 3;
|
|
for (int8_t iter = 0; iter < 8; ) {
|
|
bool found = false;
|
|
switch (method) {
|
|
case 0: found = improve_bed_induction_sensor_point(); break;
|
|
case 1: found = improve_bed_induction_sensor_point2(mesh_point < 3); break;
|
|
default: break;
|
|
}
|
|
if (found) {
|
|
if (iter > 3) {
|
|
// Average the last 4 measurements.
|
|
pts[mesh_point*2 ] += current_position[X_AXIS];
|
|
pts[mesh_point*2+1] += current_position[Y_AXIS];
|
|
}
|
|
++ iter;
|
|
} else if (n_errors -- == 0) {
|
|
// Give up.
|
|
goto canceled;
|
|
} else {
|
|
// Try to move the Z axis down a bit to increase a chance of the sensor to trigger.
|
|
current_position[Z_AXIS] -= 0.025f;
|
|
enable_endstops(false);
|
|
enable_z_endstop(false);
|
|
go_to_current(homing_feedrate[Z_AXIS]);
|
|
}
|
|
}
|
|
delay_keep_alive(3000);
|
|
}
|
|
|
|
// Average the last 4 measurements.
|
|
for (int8_t i = 0; i < 18; ++ i)
|
|
pts[i] *= (1.f/4.f);
|
|
|
|
// Test the positions. Are the positions reproducible?
|
|
#if 1
|
|
enable_endstops(false);
|
|
enable_z_endstop(false);
|
|
for (int8_t mesh_point = 0; mesh_point < 9; ++ mesh_point) {
|
|
// Go to the measurement point.
|
|
// Use the coorrected coordinate, which is a result of find_bed_offset_and_skew().
|
|
current_position[X_AXIS] = pts[mesh_point*2];
|
|
current_position[Y_AXIS] = pts[mesh_point*2+1];
|
|
go_to_current(homing_feedrate[X_AXIS]/60);
|
|
delay_keep_alive(3000);
|
|
}
|
|
#endif
|
|
|
|
#if 0
|
|
// Average the X and Y vectors. They may not be perpendicular, if the printer is built incorrectly.
|
|
// Average the center point.
|
|
cntr[0] *= 1.f/9.f;
|
|
cntr[1] *= 1.f/9.f;
|
|
// Average the X vector.
|
|
vec_x[0] = (pts[2 * 2 + 0] - pts[2 * 0 + 0] + pts[2 * 5 + 0] - pts[2 * 3 + 0] + pts[2 * 8 + 0] - pts[2 * 6 + 0]) / 6.f;
|
|
vec_x[1] = (pts[2 * 2 + 1] - pts[2 * 0 + 1] + pts[2 * 5 + 1] - pts[2 * 3 + 1] + pts[2 * 8 + 1] - pts[2 * 6 + 1]) / 6.f;
|
|
// Average the Y vector.
|
|
vec_y[0] = (pts[2 * 6 + 0] - pts[2 * 0 + 0] + pts[2 * 7 + 0] - pts[2 * 1 + 0] + pts[2 * 8 + 0] - pts[2 * 2 + 0]) / 6.f;
|
|
vec_y[1] = (pts[2 * 6 + 1] - pts[2 * 0 + 1] + pts[2 * 7 + 1] - pts[2 * 1 + 1] + pts[2 * 8 + 1] - pts[2 * 2 + 1]) / 6.f;
|
|
#if 1
|
|
// Fearlessly store the calibration values into the eeprom.
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_CENTER+0), cntr [0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_CENTER+4), cntr [1]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +0), vec_x[0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +4), vec_x[1]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +0), vec_y[0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +4), vec_y[1]);
|
|
#endif
|
|
#else
|
|
calculate_machine_skew_and_offset_LS(pts, 9, bed_ref_points, vec_x, vec_y, cntr);
|
|
world2machine_rotation_and_skew[0][0] = vec_x[0];
|
|
world2machine_rotation_and_skew[1][0] = vec_x[1];
|
|
world2machine_rotation_and_skew[0][1] = vec_y[0];
|
|
world2machine_rotation_and_skew[1][1] = vec_y[1];
|
|
world2machine_shift[0] = cntr[0];
|
|
world2machine_shift[1] = cntr[1];
|
|
#if 1
|
|
// Fearlessly store the calibration values into the eeprom.
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_CENTER+0), cntr [0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_CENTER+4), cntr [1]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +0), vec_x[0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_X +4), vec_x[1]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +0), vec_y[0]);
|
|
eeprom_update_float((float*)(EEPROM_BED_CALIBRATION_VEC_Y +4), vec_y[1]);
|
|
#endif
|
|
#endif
|
|
|
|
// Test the positions. Are the positions reproducible? Now the calibration is active in the planner.
|
|
#if 1
|
|
enable_endstops(false);
|
|
enable_z_endstop(false);
|
|
delay_keep_alive(3000);
|
|
for (int8_t mesh_point = 0; mesh_point < 9; ++ mesh_point) {
|
|
// Go to the measurement point.
|
|
// Use the coorrected coordinate, which is a result of find_bed_offset_and_skew().
|
|
current_position[X_AXIS] = pgm_read_float(bed_ref_points+mesh_point*2);
|
|
current_position[Y_AXIS] = pgm_read_float(bed_ref_points+mesh_point*2+1);
|
|
go_to_current(homing_feedrate[X_AXIS]/60);
|
|
delay_keep_alive(3000);
|
|
}
|
|
#endif
|
|
|
|
#if 0
|
|
// and let us know the result.
|
|
SERIAL_ECHOLN("Calibration done.");
|
|
SERIAL_ECHO("Center: ");
|
|
SERIAL_ECHO(cntr[0]);
|
|
SERIAL_ECHO(",");
|
|
SERIAL_ECHO(cntr[1]);
|
|
SERIAL_ECHO(", x: ");
|
|
SERIAL_ECHO(vec_x[0]);
|
|
SERIAL_ECHO(",");
|
|
SERIAL_ECHO(vec_x[1]);
|
|
SERIAL_ECHO(", y: ");
|
|
SERIAL_ECHO(vec_y[0]);
|
|
SERIAL_ECHO(",");
|
|
SERIAL_ECHO(vec_y[1]);
|
|
SERIAL_ECHOLN("");
|
|
#endif
|
|
|
|
enable_endstops(endstops_enabled);
|
|
enable_z_endstop(endstop_z_enabled);
|
|
return true;
|
|
|
|
canceled:
|
|
// Store the identity matrix to EEPROM.
|
|
reset_bed_offset_and_skew();
|
|
enable_endstops(endstops_enabled);
|
|
enable_z_endstop(endstop_z_enabled);
|
|
return false;
|
|
}
|