3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move lcd_map_control to UBL

Browse source 
For parity with bugfix-2.0.x
This commit is contained in:
Scott Lahteine 2017-11-22 18:28:43 -06:00
parent 73ddc762c8
commit 99b71c1dde
7 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Marlin/stepper.cpp
View file

@ -54,6 +54,10 @@
#include "cardreader.h"
#include "speed_lookuptable.h"
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL)
#include "ubl.h"
#endif
#if HAS_DIGIPOTSS
#include <SPI.h>
#endif
@ -62,10 +66,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)
@ -1224,7 +1224,7 @@ void Stepper::finish_and_disable() {
void Stepper::quick_stop() {
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL)
if (!ubl_lcd_map_control)
if (!ubl.lcd_map_control)
cleaning_buffer_counter = 5000;
#else
cleaning_buffer_counter = 5000;