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

[1.1.x] Fix change filament for delta machines (#9296)

Browse Source
This commit is contained in:
Thomas Moore 2018-01-22 10:19:00 -06:00 committed by Scott Lahteine
parent 3175266681
commit b818543045
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Conditionals_post.h
View File

@ -1169,4 +1169,10 @@
#endif #endif
#endif #endif
// Nozzle park
#if ENABLED(NOZZLE_PARK_FEATURE) && ENABLED(DELTA)
#undef NOZZLE_PARK_Z_FEEDRATE
#define NOZZLE_PARK_Z_FEEDRATE NOZZLE_PARK_XY_FEEDRATE
#endif
#endif // CONDITIONALS_POST_H #endif // CONDITIONALS_POST_H

19
Marlin/Marlin_main.cpp
View File

@ -6271,7 +6271,7 @@ inline void gcode_M17() {
void do_pause_e_move(const float &length, const float &fr) { void do_pause_e_move(const float &length, const float &fr) {
set_destination_from_current(); set_destination_from_current();
destination[E_AXIS] += length / planner.e_factor[active_extruder]; destination[E_AXIS] += length / planner.e_factor[active_extruder];
buffer_line_to_destination(fr); planner.buffer_line_kinematic(destination, fr, active_extruder);
stepper.synchronize(); stepper.synchronize();
set_current_from_destination(); set_current_from_destination();
} }
@ -6532,8 +6532,11 @@ inline void gcode_M17() {
if (retract && thermalManager.hotEnoughToExtrude(active_extruder)) if (retract && thermalManager.hotEnoughToExtrude(active_extruder))
do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE); do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
// Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos) #if ENABLED(NO_MOTION_BEFORE_HOMING)
Nozzle::park(2, park_point); if (!axis_unhomed_error())
#endif
// Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos)
Nozzle::park(2, park_point);
// Unload the filament // Unload the filament
if (unload_length) if (unload_length)
@ -10197,6 +10200,11 @@ inline void gcode_M502() {
inline void gcode_M701() { inline void gcode_M701() {
point_t park_point = NOZZLE_PARK_POINT; point_t park_point = NOZZLE_PARK_POINT;
#if ENABLED(NO_MOTION_BEFORE_HOMING)
// Only raise Z if the machine is homed
if (axis_unhomed_error()) park_point.z = 0;
#endif
if (get_target_extruder_from_command(701)) return; if (get_target_extruder_from_command(701)) return;
// Z axis lift // Z axis lift
@ -10254,6 +10262,11 @@ inline void gcode_M502() {
inline void gcode_M702() { inline void gcode_M702() {
point_t park_point = NOZZLE_PARK_POINT; point_t park_point = NOZZLE_PARK_POINT;
#if ENABLED(NO_MOTION_BEFORE_HOMING)
// Only raise Z if the machine is homed
if (axis_unhomed_error()) park_point.z = 0;
#endif
if (get_target_extruder_from_command(702)) return; if (get_target_extruder_from_command(702)) return;
// Z axis lift // Z axis lift