|
@@ -119,7 +119,7 @@ static bool ensure_safe_temperature(const AdvancedPauseMode mode=ADVANCED_PAUSE_
|
119
|
119
|
static void do_pause_e_move(const float &length, const float &fr) {
|
120
|
120
|
set_destination_from_current();
|
121
|
121
|
destination[E_AXIS] += length / planner.e_factor[active_extruder];
|
122
|
|
- buffer_line_to_destination(fr);
|
|
122
|
+ planner.buffer_line_kinematic(destination, fr, active_extruder);
|
123
|
123
|
stepper.synchronize();
|
124
|
124
|
set_current_from_destination();
|
125
|
125
|
}
|
|
@@ -137,8 +137,8 @@ static void do_pause_e_move(const float &length, const float &fr) {
|
137
|
137
|
* Returns 'true' if load was completed, 'false' for abort
|
138
|
138
|
*/
|
139
|
139
|
bool load_filament(const float &load_length/*=0*/, const float &purge_length/*=0*/, const int8_t max_beep_count/*=0*/,
|
140
|
|
- const bool show_lcd/*=false*/, const bool pause_for_user/*=false*/,
|
141
|
|
- const AdvancedPauseMode mode/*=ADVANCED_PAUSE_MODE_PAUSE_PRINT*/
|
|
140
|
+ const bool show_lcd/*=false*/, const bool pause_for_user/*=false*/,
|
|
141
|
+ const AdvancedPauseMode mode/*=ADVANCED_PAUSE_MODE_PAUSE_PRINT*/
|
142
|
142
|
) {
|
143
|
143
|
#if DISABLED(ULTIPANEL)
|
144
|
144
|
UNUSED(show_lcd);
|
|
@@ -232,7 +232,7 @@ bool load_filament(const float &load_length/*=0*/, const float &purge_length/*=0
|
232
|
232
|
* Returns 'true' if unload was completed, 'false' for abort
|
233
|
233
|
*/
|
234
|
234
|
bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
|
235
|
|
- const AdvancedPauseMode mode/*=ADVANCED_PAUSE_MODE_PAUSE_PRINT*/
|
|
235
|
+ const AdvancedPauseMode mode/*=ADVANCED_PAUSE_MODE_PAUSE_PRINT*/
|
236
|
236
|
) {
|
237
|
237
|
if (!ensure_safe_temperature(mode)) {
|
238
|
238
|
#if ENABLED(ULTIPANEL)
|
|
@@ -336,8 +336,11 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u
|
336
|
336
|
if (retract && thermalManager.hotEnoughToExtrude(active_extruder))
|
337
|
337
|
do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
|
338
|
338
|
|
339
|
|
- // Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos)
|
340
|
|
- Nozzle::park(2, park_point);
|
|
339
|
+ #if ENABLED(NO_MOTION_BEFORE_HOMING)
|
|
340
|
+ if (!axis_unhomed_error())
|
|
341
|
+ #endif
|
|
342
|
+ // Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos)
|
|
343
|
+ Nozzle::park(2, park_point);
|
341
|
344
|
|
342
|
345
|
// Unload the filament
|
343
|
346
|
if (unload_length)
|