andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Indent tool_change_prime

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
c0a3931595
commit
d2e1e9a0ac
1 changed files with 56 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 111
      Marlin/src/module/tool_change.cpp

111
Marlin/src/module/tool_change.cpp
View File

@ -793,75 +793,76 @@ inline void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_a
*/ */
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP) #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
void tool_change_prime() { void tool_change_prime() {
if (toolchange_settings.extra_prime > 0 if (toolchange_settings.extra_prime > 0
&& TERN(PREVENT_COLD_EXTRUSION, !thermalManager.targetTooColdToExtrude(active_extruder), 1) && TERN(PREVENT_COLD_EXTRUSION, !thermalManager.targetTooColdToExtrude(active_extruder), 1)
) { ) {
destination = current_position; // Remember the old position destination = current_position; // Remember the old position
const bool ok = TERN1(TOOLCHANGE_PARK, all_axes_homed() && toolchange_settings.enable_park);
#if HAS_FAN && TOOLCHANGE_FS_FAN >= 0 const bool ok = TERN1(TOOLCHANGE_PARK, all_axes_homed() && toolchange_settings.enable_park);
// Store and stop fan. Restored on any exit.
REMEMBER(fan, thermalManager.fan_speed[TOOLCHANGE_FS_FAN], 0);
#endif
// Z raise #if HAS_FAN && TOOLCHANGE_FS_FAN >= 0
if (ok) { // Store and stop fan. Restored on any exit.
// Do a small lift to avoid the workpiece in the move back (below) REMEMBER(fan, thermalManager.fan_speed[TOOLCHANGE_FS_FAN], 0);
current_position.z += toolchange_settings.z_raise;
#if HAS_SOFTWARE_ENDSTOPS
NOMORE(current_position.z, soft_endstop.max.z);
#endif #endif
fast_line_to_current(Z_AXIS);
planner.synchronize();
}
// Park // Z raise
#if ENABLED(TOOLCHANGE_PARK)
if (ok) { if (ok) {
IF_DISABLED(TOOLCHANGE_PARK_Y_ONLY, current_position.x = toolchange_settings.change_point.x); // Do a small lift to avoid the workpiece in the move back (below)
IF_DISABLED(TOOLCHANGE_PARK_X_ONLY, current_position.y = toolchange_settings.change_point.y); current_position.z += toolchange_settings.z_raise;
planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), active_extruder); #if HAS_SOFTWARE_ENDSTOPS
NOMORE(current_position.z, soft_endstop.max.z);
#endif
fast_line_to_current(Z_AXIS);
planner.synchronize(); planner.synchronize();
} }
#endif
// Prime (All distances are added and slowed down to ensure secure priming in all circumstances) // Park
unscaled_e_move(toolchange_settings.swap_length + toolchange_settings.extra_prime, MMM_TO_MMS(toolchange_settings.prime_speed)); #if ENABLED(TOOLCHANGE_PARK)
if (ok) {
IF_DISABLED(TOOLCHANGE_PARK_Y_ONLY, current_position.x = toolchange_settings.change_point.x);
IF_DISABLED(TOOLCHANGE_PARK_X_ONLY, current_position.y = toolchange_settings.change_point.y);
planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), active_extruder);
planner.synchronize();
}
#endif
// Cutting retraction // Prime (All distances are added and slowed down to ensure secure priming in all circumstances)
#if TOOLCHANGE_FS_WIPE_RETRACT unscaled_e_move(toolchange_settings.swap_length + toolchange_settings.extra_prime, MMM_TO_MMS(toolchange_settings.prime_speed));
unscaled_e_move(-(TOOLCHANGE_FS_WIPE_RETRACT), MMM_TO_MMS(toolchange_settings.retract_speed));
#endif
// Cool down with fan // Cutting retraction
#if HAS_FAN && TOOLCHANGE_FS_FAN >= 0 #if TOOLCHANGE_FS_WIPE_RETRACT
thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = toolchange_settings.fan_speed; unscaled_e_move(-(TOOLCHANGE_FS_WIPE_RETRACT), MMM_TO_MMS(toolchange_settings.retract_speed));
gcode.dwell(toolchange_settings.fan_time * 1000); #endif
thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = 0;
#endif
// Move back // Cool down with fan
#if ENABLED(TOOLCHANGE_PARK) #if HAS_FAN && TOOLCHANGE_FS_FAN >= 0
if (ok) { thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = toolchange_settings.fan_speed;
#if ENABLED(TOOLCHANGE_NO_RETURN) gcode.dwell(toolchange_settings.fan_time * 1000);
do_blocking_move_to_z(destination.z, planner.settings.max_feedrate_mm_s[Z_AXIS]); thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = 0;
#else #endif
do_blocking_move_to(destination, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE));
#endif // Move back
} #if ENABLED(TOOLCHANGE_PARK)
#endif if (ok) {
#if ENABLED(TOOLCHANGE_NO_RETURN)
do_blocking_move_to_z(destination.z, planner.settings.max_feedrate_mm_s[Z_AXIS]);
#else
do_blocking_move_to(destination, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE));
#endif
}
#endif
// Cutting recover // Cutting recover
unscaled_e_move(toolchange_settings.extra_resume + TOOLCHANGE_FS_WIPE_RETRACT, MMM_TO_MMS(toolchange_settings.unretract_speed)); unscaled_e_move(toolchange_settings.extra_resume + TOOLCHANGE_FS_WIPE_RETRACT, MMM_TO_MMS(toolchange_settings.unretract_speed));
planner.synchronize(); planner.synchronize();
current_position.e = destination.e; current_position.e = destination.e;
sync_plan_position_e(); // Resume at the old E position sync_plan_position_e(); // Resume at the old E position
}
} }
}
#endif #endif // TOOLCHANGE_FILAMENT_SWAP
/** /**
* Perform a tool-change, which may result in moving the * Perform a tool-change, which may result in moving the

Write Preview
Loading…
Cancel
Save