MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No lcd_map_control needed in quick_stop

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-06 16:19:11 -06:00
parent 3b30cc90f1
commit 574153a810
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/stepper.cpp
View File

@ -1224,12 +1224,7 @@ void Stepper::finish_and_disable() {
} }
void Stepper::quick_stop() { void Stepper::quick_stop() {
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL) cleaning_buffer_counter = 5000;
if (!ubl.lcd_map_control)
cleaning_buffer_counter = 5000;
#else
cleaning_buffer_counter = 5000;
#endif
DISABLE_STEPPER_DRIVER_INTERRUPT(); DISABLE_STEPPER_DRIVER_INTERRUPT();
while (planner.blocks_queued()) planner.discard_current_block(); while (planner.blocks_queued()) planner.discard_current_block();
current_block = NULL; current_block = NULL;

3
Marlin/stepper.h
View File

@ -101,10 +101,11 @@ class Stepper {
static uint32_t motor_current_setting[3]; static uint32_t motor_current_setting[3];
#endif #endif
static int16_t cleaning_buffer_counter;
private: private:
static uint8_t last_direction_bits; // The next stepping-bits to be output static uint8_t last_direction_bits; // The next stepping-bits to be output
static int16_t cleaning_buffer_counter;
#if ENABLED(X_DUAL_ENDSTOPS) #if ENABLED(X_DUAL_ENDSTOPS)
static bool locked_x_motor, locked_x2_motor; static bool locked_x_motor, locked_x2_motor;

26
Marlin/ultralcd.cpp
View File

@ -559,7 +559,7 @@ uint16_t max_display_update_time = 0;
if (no_reentry) return; if (no_reentry) return;
// Make this the current handler till all moves are done // Make this the current handler till all moves are done
no_reentry = true; no_reentry = true;
screenFunc_t old_screen = currentScreen; const screenFunc_t old_screen = currentScreen;
lcd_goto_screen(_lcd_synchronize); lcd_goto_screen(_lcd_synchronize);
stepper.synchronize(); stepper.synchronize();
no_reentry = false; no_reentry = false;
@ -2336,6 +2336,19 @@ void kill_screen(const char* lcd_msg) {
void set_current_from_steppers_for_axis(const AxisEnum axis); void set_current_from_steppers_for_axis(const AxisEnum axis);
void sync_plan_position(); void sync_plan_position();
void _lcd_do_nothing() {}
void _lcd_hard_stop() {
stepper.quick_stop();
const screenFunc_t old_screen = currentScreen;
currentScreen = _lcd_do_nothing;
while (planner.movesplanned()) idle();
currentScreen = old_screen;
stepper.cleaning_buffer_counter = 0;
set_current_from_steppers_for_axis(ALL_AXES);
sync_plan_position();
refresh_cmd_timeout();
}
void _lcd_ubl_output_map_lcd() { void _lcd_ubl_output_map_lcd() {
static int16_t step_scaler = 0; static int16_t step_scaler = 0;
@ -2380,15 +2393,10 @@ void kill_screen(const char* lcd_msg) {
if (lcdDrawUpdate) { if (lcdDrawUpdate) {
lcd_implementation_ubl_plot(x_plot, y_plot); lcd_implementation_ubl_plot(x_plot, y_plot);
ubl_map_move_to_xy(); // Move to current location if (planner.movesplanned()) // If the nozzle is already moving, cancel the move.
_lcd_hard_stop();
if (planner.movesplanned() > 1) { // if the nozzle is moving, cancel the move. There is a new location ubl_map_move_to_xy(); // Move to new location
stepper.quick_stop();
set_current_from_steppers_for_axis(ALL_AXES);
sync_plan_position();
ubl_map_move_to_xy(); // Move to new location
refresh_cmd_timeout();
}
} }
} }