Add zprobe_zoffset in set_bed_level_equation_*
- Also a small tweak to SanityCheck.h
This commit is contained in:
parent
78090275a9
commit
04328d7537
@ -1090,7 +1090,7 @@ static void set_bed_level_equation_lsq(double *plane_equation_coefficients)
|
|||||||
// corrected_position.debug("position after");
|
// corrected_position.debug("position after");
|
||||||
current_position[X_AXIS] = corrected_position.x;
|
current_position[X_AXIS] = corrected_position.x;
|
||||||
current_position[Y_AXIS] = corrected_position.y;
|
current_position[Y_AXIS] = corrected_position.y;
|
||||||
current_position[Z_AXIS] = corrected_position.z;
|
current_position[Z_AXIS] = corrected_position.z + zprobe_zoffset;
|
||||||
|
|
||||||
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
||||||
}
|
}
|
||||||
@ -1116,10 +1116,9 @@ static void set_bed_level_equation_3pts(float z_at_pt_1, float z_at_pt_2, float
|
|||||||
vector_3 corrected_position = plan_get_position();
|
vector_3 corrected_position = plan_get_position();
|
||||||
current_position[X_AXIS] = corrected_position.x;
|
current_position[X_AXIS] = corrected_position.x;
|
||||||
current_position[Y_AXIS] = corrected_position.y;
|
current_position[Y_AXIS] = corrected_position.y;
|
||||||
current_position[Z_AXIS] = corrected_position.z;
|
current_position[Z_AXIS] = corrected_position.z + zprobe_zoffset;
|
||||||
|
|
||||||
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // AUTO_BED_LEVELING_GRID
|
#endif // AUTO_BED_LEVELING_GRID
|
||||||
|
@ -104,13 +104,13 @@
|
|||||||
|
|
||||||
// Make sure probing points are reachable
|
// Make sure probing points are reachable
|
||||||
#if LEFT_PROBE_BED_POSITION < MIN_PROBE_X
|
#if LEFT_PROBE_BED_POSITION < MIN_PROBE_X
|
||||||
#error The given LEFT_PROBE_BED_POSITION can't be reached by the probe.
|
#error "The given LEFT_PROBE_BED_POSITION can't be reached by the probe."
|
||||||
#elif RIGHT_PROBE_BED_POSITION > MAX_PROBE_X
|
#elif RIGHT_PROBE_BED_POSITION > MAX_PROBE_X
|
||||||
#error The given RIGHT_PROBE_BED_POSITION can't be reached by the probe.
|
#error "The given RIGHT_PROBE_BED_POSITION can't be reached by the probe."
|
||||||
#elif FRONT_PROBE_BED_POSITION < MIN_PROBE_Y
|
#elif FRONT_PROBE_BED_POSITION < MIN_PROBE_Y
|
||||||
#error The given FRONT_PROBE_BED_POSITION can't be reached by the probe.
|
#error "The given FRONT_PROBE_BED_POSITION can't be reached by the probe."
|
||||||
#elif BACK_PROBE_BED_POSITION > MAX_PROBE_Y
|
#elif BACK_PROBE_BED_POSITION > MAX_PROBE_Y
|
||||||
#error The given BACK_PROBE_BED_POSITION can't be reached by the probe.
|
#error "The given BACK_PROBE_BED_POSITION can't be reached by the probe."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PROBE_SIZE_X (X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1))
|
#define PROBE_SIZE_X (X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1))
|
||||||
|
Loading…
Reference in New Issue
Block a user