Browse Source

Tweak set_bed_leveling_enabled

Scott Lahteine 7 years ago
parent
commit
7d5cd7e0d7
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      Marlin/Marlin_main.cpp

+ 6
- 4
Marlin/Marlin_main.cpp View File

2424
         if (enable && mbl.has_mesh()) planner.unapply_leveling(current_position);
2424
         if (enable && mbl.has_mesh()) planner.unapply_leveling(current_position);
2425
       }
2425
       }
2426
 
2426
 
2427
-    #elif HAS_ABL && !ENABLED(AUTO_BED_LEVELING_UBL)
2427
+    #elif ENABLED(AUTO_BED_LEVELING_UBL)
2428
+
2429
+      ubl.state.active = enable;
2430
+      //set_current_from_steppers_for_axis(Z_AXIS);
2431
+
2432
+    #elif HAS_ABL
2428
 
2433
 
2429
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
2434
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
2430
         const bool can_change = (!enable || (bilinear_grid_spacing[0] && bilinear_grid_spacing[1]));
2435
         const bool can_change = (!enable || (bilinear_grid_spacing[0] && bilinear_grid_spacing[1]));
2452
         else
2457
         else
2453
           planner.unapply_leveling(current_position);
2458
           planner.unapply_leveling(current_position);
2454
       }
2459
       }
2455
-    #elif ENABLED(AUTO_BED_LEVELING_UBL)
2456
-      ubl.state.active = enable;
2457
-      //set_current_from_steppers_for_axis(Z_AXIS);
2458
     #endif
2460
     #endif
2459
   }
2461
   }
2460
 
2462
 

Loading…
Cancel
Save