|
|
|
@ -100,11 +100,30 @@
|
|
|
|
#endif // DO_SWITCH_EXTRUDER
|
|
|
|
#endif // DO_SWITCH_EXTRUDER
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(SWITCHING_NOZZLE)
|
|
|
|
#if ENABLED(SWITCHING_NOZZLE)
|
|
|
|
void move_nozzle_servo(const uint8_t e) {
|
|
|
|
|
|
|
|
|
|
|
|
#if SWITCHING_NOZZLE_TWO_SERVOS
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
inline void _move_nozzle_servo(const uint8_t e, const uint8_t angle_index) {
|
|
|
|
|
|
|
|
constexpr int8_t sns_index[2] = { SWITCHING_NOZZLE_SERVO_NR, SWITCHING_NOZZLE_E1_SERVO_NR };
|
|
|
|
|
|
|
|
constexpr int16_t sns_angles[2] = SWITCHING_NOZZLE_SERVO_ANGLES;
|
|
|
|
|
|
|
|
planner.synchronize();
|
|
|
|
|
|
|
|
MOVE_SERVO(sns_index[e], sns_angles[angle_index]);
|
|
|
|
|
|
|
|
safe_delay(500);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void lower_nozzle(const uint8_t e) { _move_nozzle_servo(e, 0); }
|
|
|
|
|
|
|
|
void raise_nozzle(const uint8_t e) { _move_nozzle_servo(e, 1); }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void move_nozzle_servo(const uint8_t angle_index) {
|
|
|
|
planner.synchronize();
|
|
|
|
planner.synchronize();
|
|
|
|
MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, servo_angles[SWITCHING_NOZZLE_SERVO_NR][e]);
|
|
|
|
MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, servo_angles[SWITCHING_NOZZLE_SERVO_NR][e]);
|
|
|
|
safe_delay(500);
|
|
|
|
safe_delay(500);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#endif // SWITCHING_NOZZLE
|
|
|
|
#endif // SWITCHING_NOZZLE
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(PARKING_EXTRUDER)
|
|
|
|
#if ENABLED(PARKING_EXTRUDER)
|
|
|
|
@ -581,6 +600,11 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
|
|
|
|
#endif // TOOLCHANGE_FILAMENT_SWAP
|
|
|
|
#endif // TOOLCHANGE_FILAMENT_SWAP
|
|
|
|
|
|
|
|
|
|
|
|
if (tmp_extruder != active_extruder) {
|
|
|
|
if (tmp_extruder != active_extruder) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if SWITCHING_NOZZLE_TWO_SERVOS
|
|
|
|
|
|
|
|
raise_nozzle(active_extruder);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
const float old_feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : feedrate_mm_s;
|
|
|
|
const float old_feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : feedrate_mm_s;
|
|
|
|
feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : XY_PROBE_FEEDRATE_MM_S;
|
|
|
|
feedrate_mm_s = fr_mm_s > 0.0 ? fr_mm_s : XY_PROBE_FEEDRATE_MM_S;
|
|
|
|
|
|
|
|
|
|
|
|
@ -639,8 +663,9 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
|
|
|
|
parking_extruder_tool_change(tmp_extruder, no_move);
|
|
|
|
parking_extruder_tool_change(tmp_extruder, no_move);
|
|
|
|
#elif ENABLED(SWITCHING_TOOLHEAD) // Switching Toolhead
|
|
|
|
#elif ENABLED(SWITCHING_TOOLHEAD) // Switching Toolhead
|
|
|
|
switching_toolhead_tool_change(tmp_extruder, fr_mm_s, no_move);
|
|
|
|
switching_toolhead_tool_change(tmp_extruder, fr_mm_s, no_move);
|
|
|
|
#elif ENABLED(SWITCHING_NOZZLE)
|
|
|
|
#elif ENABLED(SWITCHING_NOZZLE) && !SWITCHING_NOZZLE_TWO_SERVOS
|
|
|
|
// Always raise by a configured distance to avoid workpiece
|
|
|
|
// Raise by a configured distance to avoid workpiece, except with
|
|
|
|
|
|
|
|
// SWITCHING_NOZZLE_TWO_SERVOS, as both nozzles will lift instead.
|
|
|
|
current_position[Z_AXIS] += MAX(-zdiff, 0.0) + toolchange_settings.z_raise;
|
|
|
|
current_position[Z_AXIS] += MAX(-zdiff, 0.0) + toolchange_settings.z_raise;
|
|
|
|
#if HAS_SOFTWARE_ENDSTOPS
|
|
|
|
#if HAS_SOFTWARE_ENDSTOPS
|
|
|
|
NOMORE(current_position[Z_AXIS], soft_endstop_max[Z_AXIS]);
|
|
|
|
NOMORE(current_position[Z_AXIS], soft_endstop_max[Z_AXIS]);
|
|
|
|
@ -729,6 +754,9 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
|
|
|
|
mmu2.toolChange(tmp_extruder);
|
|
|
|
mmu2.toolChange(tmp_extruder);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if SWITCHING_NOZZLE_TWO_SERVOS
|
|
|
|
|
|
|
|
lower_nozzle(active_extruder);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
} // (tmp_extruder != active_extruder)
|
|
|
|
} // (tmp_extruder != active_extruder)
|
|
|
|
|
|
|
|
|
|
|
|
planner.synchronize();
|
|
|
|
planner.synchronize();
|
|
|
|
|
Marcio Teixeira
6 years ago
committed by