Browse Source

Fix compilation with UBL and Arc/Bézier

Fix #10660
Scott Lahteine 6 years ago
parent
commit
a225d2e99e
1 changed files with 6 additions and 14 deletions
  1. 6
    14
      Marlin/src/module/planner.h

+ 6
- 14
Marlin/src/module/planner.h View File

@@ -405,33 +405,25 @@ class Planner {
405 405
     #endif // SKEW_CORRECTION
406 406
 
407 407
     #if PLANNER_LEVELING || HAS_UBL_AND_CURVES
408
-
409 408
       /**
410 409
        * Apply leveling to transform a cartesian position
411 410
        * as it will be given to the planner and steppers.
412 411
        */
413 412
       static void apply_leveling(float &rx, float &ry, float &rz);
414 413
       FORCE_INLINE static void apply_leveling(float (&raw)[XYZ]) { apply_leveling(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS]); }
414
+    #endif
415 415
 
416
-      #if PLANNER_LEVELING
417
-
418
-        #define ARG_X float rx
419
-        #define ARG_Y float ry
420
-        #define ARG_Z float rz
421
-
422
-        static void unapply_leveling(float raw[XYZ]);
423
-
424
-      #endif
425
-
416
+    #if PLANNER_LEVELING
417
+      #define ARG_X float rx
418
+      #define ARG_Y float ry
419
+      #define ARG_Z float rz
420
+      static void unapply_leveling(float raw[XYZ]);
426 421
     #else
427
-
428 422
       #define ARG_X const float &rx
429 423
       #define ARG_Y const float &ry
430 424
       #define ARG_Z const float &rz
431
-
432 425
     #endif
433 426
 
434
-
435 427
     /**
436 428
      * Planner::get_next_free_block
437 429
      *

Loading…
Cancel
Save