|
|
|
|
1480
|
|
1480
|
|
1481
|
// Probe bed height at position (x,y), returns the measured z value
|
1481
|
// Probe bed height at position (x,y), returns the measured z value
|
1482
|
static float probe_pt(float x, float y, float z_before, ProbeAction probe_action=ProbeDeployAndStow, int verbose_level=1) {
|
1482
|
static float probe_pt(float x, float y, float z_before, ProbeAction probe_action=ProbeDeployAndStow, int verbose_level=1) {
|
1483
|
- // move to right place
|
|
|
|
|
1483
|
+ // Move Z up to the z_before height, then move the probe to the given XY
|
1484
|
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z_before); // this also updates current_position
|
1484
|
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z_before); // this also updates current_position
|
1485
|
do_blocking_move_to(x - X_PROBE_OFFSET_FROM_EXTRUDER, y - Y_PROBE_OFFSET_FROM_EXTRUDER, current_position[Z_AXIS]); // this also updates current_position
|
1485
|
do_blocking_move_to(x - X_PROBE_OFFSET_FROM_EXTRUDER, y - Y_PROBE_OFFSET_FROM_EXTRUDER, current_position[Z_AXIS]); // this also updates current_position
|
1486
|
|
1486
|
|
|
|
|
|
1491
|
run_z_probe();
|
1491
|
run_z_probe();
|
1492
|
float measured_z = current_position[Z_AXIS];
|
1492
|
float measured_z = current_position[Z_AXIS];
|
1493
|
|
1493
|
|
1494
|
- #if Z_RAISE_BETWEEN_PROBINGS > 0
|
|
|
1495
|
- if (probe_action == ProbeStay) {
|
|
|
1496
|
- do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); // this also updates current_position
|
|
|
1497
|
- st_synchronize();
|
|
|
1498
|
- }
|
|
|
1499
|
- #endif
|
|
|
1500
|
-
|
|
|
1501
|
#if !defined(Z_PROBE_SLED) && !defined(Z_PROBE_ALLEN_KEY)
|
1494
|
#if !defined(Z_PROBE_SLED) && !defined(Z_PROBE_ALLEN_KEY)
|
1502
|
if (probe_action & ProbeStow) stow_z_probe();
|
1495
|
if (probe_action & ProbeStow) stow_z_probe();
|
1503
|
#endif
|
1496
|
#endif
|