Browse Source

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

Scott Lahteine 7 years ago
parent
commit
5c59ee4e93
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/Marlin_main.cpp

+ 3
- 3
Marlin/Marlin_main.cpp View File

4183
    *  W  Write a mesh point. (Ignored during leveling.)
4183
    *  W  Write a mesh point. (Ignored during leveling.)
4184
    *  X  Required X for mesh point
4184
    *  X  Required X for mesh point
4185
    *  Y  Required Y for mesh point
4185
    *  Y  Required Y for mesh point
4186
-   *  Z  Required Z for mesh point
4186
+   *  Z  Z for mesh point. Otherwise, current Z minus Z probe offset.
4187
    *
4187
    *
4188
    * Without PROBE_MANUALLY:
4188
    * Without PROBE_MANUALLY:
4189
    *
4189
    *
4316
             return;
4316
             return;
4317
           }
4317
           }
4318
 
4318
 
4319
-          const float z = parser.seen('Z') && parser.has_value() ? parser.value_float() : NAN;
4320
-          if (!isnan(z) || !WITHIN(z, -10, 10)) {
4319
+          const float z = parser.seen('Z') && parser.has_value() ? parser.value_float() : RAW_CURRENT_POSITION(Z);
4320
+          if (!WITHIN(z, -10, 10)) {
4321
             SERIAL_ERROR_START();
4321
             SERIAL_ERROR_START();
4322
             SERIAL_ERRORLNPGM("Bad Z value");
4322
             SERIAL_ERRORLNPGM("Bad Z value");
4323
             return;
4323
             return;

Loading…
Cancel
Save