Browse Source

Use NAN for G29 W omitted parameters

Scott Lahteine 8 years ago
parent
commit
4cece2d72e
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      Marlin/Marlin_main.cpp

+ 5
- 5
Marlin/Marlin_main.cpp View File

@@ -4233,19 +4233,19 @@ void home_all_axes() { gcode_G28(true); }
4233 4233
             return;
4234 4234
           }
4235 4235
 
4236
-          const float z = parser.seen('Z') && parser.has_value() ? parser.value_float() : 99999;
4237
-          if (!WITHIN(z, -10, 10)) {
4236
+          const float z = parser.seen('Z') && parser.has_value() ? parser.value_float() : NAN;
4237
+          if (!isnan(z) || !WITHIN(z, -10, 10)) {
4238 4238
             SERIAL_ERROR_START;
4239 4239
             SERIAL_ERRORLNPGM("Bad Z value");
4240 4240
             return;
4241 4241
           }
4242 4242
 
4243
-          const float x = parser.seen('X') && parser.has_value() ? parser.value_float() : 99999,
4244
-                      y = parser.seen('Y') && parser.has_value() ? parser.value_float() : 99999;
4243
+          const float x = parser.seen('X') && parser.has_value() ? parser.value_float() : NAN,
4244
+                      y = parser.seen('Y') && parser.has_value() ? parser.value_float() : NAN;
4245 4245
           int8_t i = parser.seen('I') && parser.has_value() ? parser.value_byte() : -1,
4246 4246
                  j = parser.seen('J') && parser.has_value() ? parser.value_byte() : -1;
4247 4247
 
4248
-          if (x < 99998 && y < 99998) {
4248
+          if (!isnan(x) && !isnan(y)) {
4249 4249
             // Get nearest i / j from x / y
4250 4250
             i = (x - LOGICAL_X_POSITION(bilinear_start[X_AXIS]) + 0.5 * xGridSpacing) / xGridSpacing;
4251 4251
             j = (y - LOGICAL_Y_POSITION(bilinear_start[Y_AXIS]) + 0.5 * yGridSpacing) / yGridSpacing;

Loading…
Cancel
Save