Skip to content

Commit 1155616

Browse files
committed
fixup
1 parent fefebf5 commit 1155616

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Marlin/src/gcode/calibrate/G34_M422.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
* I<int> Number of test iterations. If omitted, Z_STEPPER_ALIGN_ITERATIONS. (1-30)
6969
* T<float> Target Accuracy factor. If omitted, Z_STEPPER_ALIGN_ACC. (0.01-1.0)
7070
* A<float> Provide an Amplification value. If omitted, Z_STEPPER_ALIGN_AMP. (0.5-2.0)
71+
* E<bool> Stow or raise the probe after probing. 0=raise (default), 1=stow.
7172
* R Recalculate points based on current probe offsets
7273
*
7374
* Example:

Marlin/src/gcode/probe/G38.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ inline bool G38_run_probe(const ProbePtRaise raise_after) {
5757
);
5858
msg.echoln();
5959
TERN_(VERBOSE_SINGLE_PROBE, ui.set_status(msg));
60-
if ((!endstops.z_probe_enabled) || (DIFF_TERN(HAS_HOTEND_OFFSET, probe.offset, hotend_offset[active_extruder].z) >= 0)) {
60+
cpnst xyz_pos_t diff = DIFF_TERN(HAS_HOTEND_OFFSET, probe.offset, hotend_offset[active_extruder].z);
61+
62+
// If the probe is stowed or above the nozzle, move the nozzle to the position of the probe
63+
if ((!endstops.z_probe_enabled) || (probe.offset.z >= TERN0(HAS_HOTEND_OFFSET, hotend_offset[active_extruder].z))) {
6164
destination = measured;
6265
do_blocking_move_to(destination);
6366
planner.synchronize();
@@ -84,7 +87,7 @@ inline bool G38_run_probe(const ProbePtRaise raise_after) {
8487
* X Probe X position (default current X)
8588
* Y Probe Y position (default current Y)
8689
* Z Probe Z position (default current Z)
87-
* S Engage the probe for each probe (default 0)
90+
* S Stow the probe after probing (default: 0)
8891
*/
8992
void GcodeSuite::G38(const int8_t subcode) {
9093

0 commit comments

Comments
 (0)