|
@@ -20,7 +20,7 @@ float world2machine_shift[2];
|
|
|
#define WEIGHT_FIRST_ROW_Y_LOW (0.0f)
|
|
|
|
|
|
#define BED_ZERO_REF_X (- 22.f + X_PROBE_OFFSET_FROM_EXTRUDER) // -22 + 23 = 1
|
|
|
-#define BED_ZERO_REF_Y (- 0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER) // -0.6 + 9 = 8.4
|
|
|
+#define BED_ZERO_REF_Y (- 0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER) // -0.6 + 5 = 4.4
|
|
|
|
|
|
// Scaling of the real machine axes against the programmed dimensions in the firmware.
|
|
|
// The correction is tiny, here around 0.5mm on 250mm length.
|
|
@@ -56,24 +56,24 @@ const float bed_skew_angle_extreme = (0.25f * M_PI / 180.f);
|
|
|
// 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 = {
|
|
|
- 13.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y,
|
|
|
- 221.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y,
|
|
|
- 221.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y,
|
|
|
- 13.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y
|
|
|
+ 13.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y,
|
|
|
+ 221.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y,
|
|
|
+ 221.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y,
|
|
|
+ 13.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y
|
|
|
};
|
|
|
|
|
|
const float bed_ref_points[] PROGMEM = {
|
|
|
- 13.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y,
|
|
|
- 115.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y,
|
|
|
- 216.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y,
|
|
|
+ 13.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y,
|
|
|
+ 115.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y,
|
|
|
+ 216.f - BED_ZERO_REF_X, 10.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,
|
|
|
+ 216.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y,
|
|
|
+ 115.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y,
|
|
|
+ 13.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y,
|
|
|
|
|
|
- 13.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y,
|
|
|
- 115.f - BED_ZERO_REF_X, 200.4f - BED_ZERO_REF_Y,
|
|
|
- 216.f - BED_ZERO_REF_X, 200.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
|
|
|
};
|
|
|
#else
|
|
|
|
|
@@ -958,7 +958,7 @@ inline bool find_bed_induction_sensor_point_xy(int verbosity_level)
|
|
|
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);
|
|
|
+ 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())
|
|
@@ -966,7 +966,7 @@ inline bool find_bed_induction_sensor_point_xy(int verbosity_level)
|
|
|
}
|
|
|
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);
|
|
|
+ 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())
|