Browse Source

Use current (raw) Z if omitted from G29 WXY or G29 WIJ.

pull/1/head
Scott Lahteine 8 years ago
parent
commit
5c59ee4e93
  1. 6
      Marlin/Marlin_main.cpp

6
Marlin/Marlin_main.cpp

@ -4183,7 +4183,7 @@ void home_all_axes() { gcode_G28(true); }
* W Write a mesh point. (Ignored during leveling.) * W Write a mesh point. (Ignored during leveling.)
* X Required X for mesh point * X Required X for mesh point
* Y Required Y for mesh point * Y Required Y for mesh point
* Z Required Z for mesh point * Z Z for mesh point. Otherwise, current Z minus Z probe offset.
* *
* Without PROBE_MANUALLY: * Without PROBE_MANUALLY:
* *
@ -4316,8 +4316,8 @@ void home_all_axes() { gcode_G28(true); }
return; return;
} }
const float z = parser.seen('Z') && parser.has_value() ? parser.value_float() : NAN; const float z = parser.seen('Z') && parser.has_value() ? parser.value_float() : RAW_CURRENT_POSITION(Z);
if (!isnan(z) || !WITHIN(z, -10, 10)) { if (!WITHIN(z, -10, 10)) {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLNPGM("Bad Z value"); SERIAL_ERRORLNPGM("Bad Z value");
return; return;

Loading…
Cancel
Save