amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix a regression issue that retraction is not correct when wipe is off

Browse source 
Fix #2697
This commit is contained in:
SoftFever 2023-11-12 01:17:44 +08:00
parent da4e7817a8
commit 15358b211d
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Extruder.hpp
View file

@ -33,7 +33,7 @@ public:
double retract(double length, double restart_extra); double retract(double length, double restart_extra);
double unretract(); double unretract();
double E() const { return m_share_extruder ? m_share_E : m_E; } double E() const { return m_share_extruder ? m_share_E : m_E; }
void reset_E() { reset(); } void reset_E() { m_E = 0.; m_share_E = 0.; }
double e_per_mm(double mm3_per_mm) const { return mm3_per_mm * m_e_per_mm3; } double e_per_mm(double mm3_per_mm) const { return mm3_per_mm * m_e_per_mm3; }
double e_per_mm3() const { return m_e_per_mm3; } double e_per_mm3() const { return m_e_per_mm3; }
// Used filament volume in mm^3. // Used filament volume in mm^3.

2
src/libslic3r/GCode.cpp
View file

@ -710,7 +710,7 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
if (is_ramming) if (is_ramming)
gcodegen.m_wipe.reset_path(); // We don't want wiping on the ramming lines. gcodegen.m_wipe.reset_path(); // We don't want wiping on the ramming lines.
toolchange_gcode_str = gcodegen.set_extruder(new_extruder_id, tcr.print_z); // TODO: toolchange_z vs print_z toolchange_gcode_str = gcodegen.set_extruder(new_extruder_id, tcr.print_z); // TODO: toolchange_z vs print_z
if (gcodegen.config().has_prime_tower) if (gcodegen.config().enable_prime_tower)
deretraction_str = gcodegen.unretract(); deretraction_str = gcodegen.unretract();
} }

1
src/libslic3r/PrintConfig.hpp
View file

@ -1124,7 +1124,6 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
// BBS: project filaments // BBS: project filaments
((ConfigOptionFloats, filament_colour_new)) ((ConfigOptionFloats, filament_colour_new))
// BBS: not in any preset, calculated before slicing // BBS: not in any preset, calculated before slicing
((ConfigOptionBool, has_prime_tower))
((ConfigOptionFloat, nozzle_volume)) ((ConfigOptionFloat, nozzle_volume))
((ConfigOptionPoints, start_end_points)) ((ConfigOptionPoints, start_end_points))
((ConfigOptionEnum<TimelapseType>, timelapse_type)) ((ConfigOptionEnum<TimelapseType>, timelapse_type))