bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Followup to probe_at_point change (#15342)

Browse Source
This commit is contained in:
Robby Candra 2019-09-25 14:29:10 +07:00 committed by Scott Lahteine
parent 149e9b733e
commit 9c288a682d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/feature/bedlevel/ubl/ubl.cpp
View File

@ -177,8 +177,8 @@
serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n")); serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n"));
} }
// Add XY probe offset from extruder because probe_pt() subtracts them when // Add XY probe offset from extruder because probe_at_point() subtracts them when
// moving to the xy position to be measured. This ensures better agreement between // moving to the XY position to be measured. This ensures better agreement between
// the current Z position after G28 and the mesh values. // the current Z position after G28 and the mesh values.
const float current_xi = find_closest_x_index(current_position[X_AXIS] + probe_offset[X_AXIS]), const float current_xi = find_closest_x_index(current_position[X_AXIS] + probe_offset[X_AXIS]),
current_yi = find_closest_y_index(current_position[Y_AXIS] + probe_offset[Y_AXIS]); current_yi = find_closest_y_index(current_position[Y_AXIS] + probe_offset[Y_AXIS]);

2
Marlin/src/gcode/calibrate/G34_M422.cpp
View File

@ -277,7 +277,7 @@ void GcodeSuite::G34() {
// After this operation the z position needs correction // After this operation the z position needs correction
set_axis_is_not_at_home(Z_AXIS); set_axis_is_not_at_home(Z_AXIS);
// Stow the probe, as the last call to probe_pt(...) left // Stow the probe, as the last call to probe_at_point(...) left
// the probe deployed if it was successful. // the probe deployed if it was successful.
STOW_PROBE(); STOW_PROBE();

6
Marlin/src/module/probe.cpp
View File

@ -532,7 +532,7 @@ static bool do_probe_move(const float z, const float fr_mm_s) {
/** /**
* @brief Probe at the current XY (possibly more than once) to find the bed Z. * @brief Probe at the current XY (possibly more than once) to find the bed Z.
* *
* @details Used by probe_pt to get the bed Z height at the current XY. * @details Used by probe_at_point to get the bed Z height at the current XY.
* Leaves current_position[Z_AXIS] at the height where the probe triggered. * Leaves current_position[Z_AXIS] at the height where the probe triggered.
* *
* @return The Z position of the bed at the current XY or NAN on error. * @return The Z position of the bed at the current XY or NAN on error.
@ -686,7 +686,7 @@ static float run_z_probe() {
float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) { float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) {
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
DEBUG_ECHOLNPAIR( DEBUG_ECHOLNPAIR(
">>> probe_pt(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry), ">>> probe_at_point(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none", ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none",
", ", int(verbose_level), ", ", int(verbose_level),
", ", probe_relative ? "probe" : "nozzle", "_relative)" ", ", probe_relative ? "probe" : "nozzle", "_relative)"
@ -743,7 +743,7 @@ float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_
SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED); SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
} }
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< probe_pt"); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< probe_at_point");
return measured_z; return measured_z;
} }