Module updates

Marlin/src/module/stepper.cpp

@@ -44,21 +44,29 @@
 /* The timer calculations of this module informed by the 'RepRap cartesian firmware' by Zack Smith
    and Philipp Tiefenbacher. */
 
-#include "Marlin.h"
 #include "stepper.h"
-#include "endstops.h"
-#include "planner.h"
-#if MB(ALLIGATOR)
-  #include "dac_dac084s085.h"
-#endif
-#include "temperature.h"
-#include "ultralcd.h"
-#include "language.h"
-#include "cardreader.h"
+
 #ifdef ARDUINO_ARCH_AVR
   #include "speed_lookuptable.h"
 #endif
 
+#include "endstops.h"
+#include "planner.h"
+
+#include "../Marlin.h"
+#include "../module/temperature.h"
+#include "../lcd/ultralcd.h"
+#include "../core/language.h"
+#include "../sd/cardreader.h"
+
+#if MB(ALLIGATOR)
+  #include "../feature/dac/dac_dac084s085.h"
+#endif
+
+#if HAS_LEVELING
+  #include "../feature/bedlevel/bedlevel.h"
+#endif
+
 #if HAS_DIGIPOTSS
   #include <SPI.h>
 #endif
@@ -67,10 +75,6 @@ Stepper stepper; // Singleton
 
 // public:
 
-#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL)
-  extern bool ubl_lcd_map_control;
-#endif
-
 block_t* Stepper::current_block = NULL;  // A pointer to the block currently being traced
 
 #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
@@ -1272,12 +1276,12 @@ void Stepper::finish_and_disable() {
 }
 
 void Stepper::quick_stop() {
+
   #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL)
-    if (!ubl_lcd_map_control)
-      cleaning_buffer_counter = 5000;
-  #else
-    cleaning_buffer_counter = 5000;
+    if (!ubl.lcd_map_control)
   #endif
+      cleaning_buffer_counter = 5000;
+
   DISABLE_STEPPER_DRIVER_INTERRUPT();
   while (planner.blocks_queued()) planner.discard_current_block();
   current_block = NULL;