|
|
@ -1851,30 +1851,25 @@ void process_commands() |
|
|
|
// Probe at 3 arbitrary points
|
|
|
|
// Enhanced G29
|
|
|
|
|
|
|
|
float z_at_pt_1,z_at_pt_2,z_at_pt_3; |
|
|
|
float z_at_pt_1, z_at_pt_2, z_at_pt_3; |
|
|
|
|
|
|
|
if (code_seen('E') || code_seen('e') ) |
|
|
|
{ |
|
|
|
// probe 1
|
|
|
|
z_at_pt_1 = probe_pt(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, Z_RAISE_BEFORE_PROBING,1); |
|
|
|
// probe 2
|
|
|
|
z_at_pt_2 = probe_pt(ABL_PROBE_PT_2_X, ABL_PROBE_PT_2_Y, current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS,2); |
|
|
|
// probe 3
|
|
|
|
z_at_pt_3 = probe_pt(ABL_PROBE_PT_3_X, ABL_PROBE_PT_3_Y, current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS,3); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
// probe 1
|
|
|
|
float z_at_pt_1 = probe_pt(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, Z_RAISE_BEFORE_PROBING); |
|
|
|
|
|
|
|
// probe 2
|
|
|
|
float z_at_pt_2 = probe_pt(ABL_PROBE_PT_2_X, ABL_PROBE_PT_2_Y, current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); |
|
|
|
|
|
|
|
// probe 3
|
|
|
|
float z_at_pt_3 = probe_pt(ABL_PROBE_PT_3_X, ABL_PROBE_PT_3_Y, current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); |
|
|
|
} |
|
|
|
if (code_seen('E') || code_seen('e')) { |
|
|
|
// probe 1
|
|
|
|
z_at_pt_1 = probe_pt(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, Z_RAISE_BEFORE_PROBING,1); |
|
|
|
// probe 2
|
|
|
|
z_at_pt_2 = probe_pt(ABL_PROBE_PT_2_X, ABL_PROBE_PT_2_Y, current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS,2); |
|
|
|
// probe 3
|
|
|
|
z_at_pt_3 = probe_pt(ABL_PROBE_PT_3_X, ABL_PROBE_PT_3_Y, current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS,3); |
|
|
|
} |
|
|
|
else { |
|
|
|
// probe 1
|
|
|
|
z_at_pt_1 = probe_pt(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, Z_RAISE_BEFORE_PROBING); |
|
|
|
// probe 2
|
|
|
|
z_at_pt_2 = probe_pt(ABL_PROBE_PT_2_X, ABL_PROBE_PT_2_Y, current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); |
|
|
|
// probe 3
|
|
|
|
z_at_pt_3 = probe_pt(ABL_PROBE_PT_3_X, ABL_PROBE_PT_3_Y, current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); |
|
|
|
} |
|
|
|
clean_up_after_endstop_move(); |
|
|
|
|
|
|
|
set_bed_level_equation_3pts(z_at_pt_1, z_at_pt_2, z_at_pt_3); |
|
|
|
|
|
|
|
|
|
|
|