3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 20:18:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #8073 from thinkyhead/bf1_fix_M600

Browse Source 
[1.1.x] Fix position sync in M600 pause/resume
This commit is contained in:
Scott Lahteine 2017-10-24 14:56:01 -05:00 committed by GitHub
commit 3235beef6d
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Marlin/Marlin_main.cpp
View File

@ -6157,12 +6157,6 @@ inline void gcode_M17() {
enable_all_steppers(); enable_all_steppers();
} }
#if IS_KINEMATIC
#define RUNPLAN(RATE_MM_S) planner.buffer_line_kinematic(destination, RATE_MM_S, active_extruder)
#else
#define RUNPLAN(RATE_MM_S) line_to_destination(RATE_MM_S)
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
static float resume_position[XYZE]; static float resume_position[XYZE];
@ -6206,6 +6200,23 @@ inline void gcode_M17() {
} }
} }
#if IS_KINEMATIC
#define RUNPLAN(RATE_MM_S) planner.buffer_line_kinematic(destination, RATE_MM_S, active_extruder)
#else
#define RUNPLAN(RATE_MM_S) line_to_destination(RATE_MM_S)
#endif
void do_pause_e_move(const float &length, const float fr) {
current_position[E_AXIS] += length;
set_destination_from_current();
#if IS_KINEMATIC
planner.buffer_line_kinematic(destination, fr, active_extruder);
#else
line_to_destination(fr);
#endif
stepper.synchronize();
}
static bool pause_print(const float &retract, const float &z_lift, const float &x_pos, const float &y_pos, static bool pause_print(const float &retract, const float &z_lift, const float &x_pos, const float &y_pos,
const float &unload_length = 0 , const int8_t max_beep_count = 0, const bool show_lcd = false const float &unload_length = 0 , const int8_t max_beep_count = 0, const bool show_lcd = false
) { ) {
@ -6247,13 +6258,8 @@ inline void gcode_M17() {
stepper.synchronize(); stepper.synchronize();
COPY(resume_position, current_position); COPY(resume_position, current_position);
if (retract) { // Initial retract before move to filament change position
// Initial retract before move to filament change position if (retract) do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
set_destination_from_current();
destination[E_AXIS] += retract;
RUNPLAN(PAUSE_PARK_RETRACT_FEEDRATE);
stepper.synchronize();
}
// Lift Z axis // Lift Z axis
if (z_lift > 0) if (z_lift > 0)
@ -6271,10 +6277,7 @@ inline void gcode_M17() {
} }
// Unload filament // Unload filament
set_destination_from_current(); do_pause_e_move(unload_length, FILAMENT_CHANGE_UNLOAD_FEEDRATE);
destination[E_AXIS] += unload_length;
RUNPLAN(FILAMENT_CHANGE_UNLOAD_FEEDRATE);
stepper.synchronize();
} }
if (show_lcd) { if (show_lcd) {
@ -6400,9 +6403,7 @@ inline void gcode_M17() {
#endif #endif
// Load filament // Load filament
destination[E_AXIS] += load_length; do_pause_e_move(load_length, FILAMENT_CHANGE_LOAD_FEEDRATE);
RUNPLAN(FILAMENT_CHANGE_LOAD_FEEDRATE);
stepper.synchronize();
} }
#if ENABLED(ULTIPANEL) && ADVANCED_PAUSE_EXTRUDE_LENGTH > 0 #if ENABLED(ULTIPANEL) && ADVANCED_PAUSE_EXTRUDE_LENGTH > 0
@ -6415,9 +6416,7 @@ inline void gcode_M17() {
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_EXTRUDE); lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_EXTRUDE);
// Extrude filament to get into hotend // Extrude filament to get into hotend
destination[E_AXIS] += extrude_length; do_pause_e_move(extrude_length, ADVANCED_PAUSE_EXTRUDE_FEEDRATE);
RUNPLAN(ADVANCED_PAUSE_EXTRUDE_FEEDRATE);
stepper.synchronize();
} }
// Show "Extrude More" / "Resume" menu and wait for reply // Show "Extrude More" / "Resume" menu and wait for reply