MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify sample_set probe_pt call in M48

Browse Source
This commit is contained in:
Scott Lahteine 2016-06-18 03:15:49 -07:00
parent a647b05f82
commit 46d3ef2223
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@ -4362,18 +4362,18 @@ inline void gcode_M42() {
/** /**
* We don't really have to do this move, but if we don't we can see a * We don't really have to do this move, but if we don't we can see a
* funny shift in the Z Height because the user might not have the * funny shift in the Z Height because the user might not have the
* Z_RAISE_BEFORE_PROBING height identical to the Z_RAISE_BETWEEN_PROBING * Z_RAISE_BEFORE_PROBING height identical to the Z_RAISE_BETWEEN_PROBINGS
* height. This gets us back to the probe location at the same height that * height. This gets us back to the probe location at the same height that
* we have been running around the circle at. * we have been running around the circle at.
*/ */
bool last_probe = (n == n_samples - 1);
do_blocking_move_to_xy(X_probe_location - (X_PROBE_OFFSET_FROM_EXTRUDER), Y_probe_location - (Y_PROBE_OFFSET_FROM_EXTRUDER)); do_blocking_move_to_xy(X_probe_location - (X_PROBE_OFFSET_FROM_EXTRUDER), Y_probe_location - (Y_PROBE_OFFSET_FROM_EXTRUDER));
if (deploy_probe_for_each_reading) sample_set[n] = probe_pt(
sample_set[n] = probe_pt(X_probe_location, Y_probe_location, Z_RAISE_BEFORE_PROBING, ProbeDeployAndStow, verbose_level); X_probe_location, Y_probe_location,
else { Z_RAISE_BEFORE_PROBING,
if (n == n_samples - 1) deploy_probe_for_each_reading ? ProbeDeployAndStow : last_probe ? ProbeStow : ProbeStay,
sample_set[n] = probe_pt(X_probe_location, Y_probe_location, Z_RAISE_BEFORE_PROBING, ProbeStow, verbose_level); else verbose_level
sample_set[n] = probe_pt(X_probe_location, Y_probe_location, Z_RAISE_BEFORE_PROBING, ProbeStay, verbose_level); );
}
/** /**
* Get the current mean for the data points we have so far * Get the current mean for the data points we have so far
@ -4408,7 +4408,7 @@ inline void gcode_M42() {
} }
if (verbose_level > 0) SERIAL_EOL; if (verbose_level > 0) SERIAL_EOL;
delay(50); delay(50);
do_blocking_move_to_z(current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); do_blocking_move_to_z(current_position[Z_AXIS] + (last_probe ? Z_RAISE_AFTER_PROBING : Z_RAISE_BETWEEN_PROBINGS));
} // End of probe loop code } // End of probe loop code
if (verbose_level > 0) { if (verbose_level > 0) {