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

Fix #2697
SoftFever · Nov 11, 2023 · 471ce39 · 471ce39
1 parent 4f48afd
commit 471ce39
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp
@@ -33,7 +33,7 @@ class Extruder
     double retract(double length, double restart_extra);
     double unretract();
     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_mm3() const { return m_e_per_mm3; }
     // Used filament volume in mm^3.

diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
@@ -710,7 +710,7 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
             if (is_ramming)
                 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
-            if (gcodegen.config().has_prime_tower)
+            if (gcodegen.config().enable_prime_tower)
                 deretraction_str = gcodegen.unretract();
         }
 

diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
@@ -1124,7 +1124,6 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
     // BBS: project filaments
     ((ConfigOptionFloats,             filament_colour_new))
     // BBS: not in any preset, calculated before slicing
-    ((ConfigOptionBool,               has_prime_tower))
     ((ConfigOptionFloat,              nozzle_volume))
     ((ConfigOptionPoints,             start_end_points))
     ((ConfigOptionEnum<TimelapseType>,    timelapse_type))