Calculate time for firmware retractions.

vovodroid · Jun 12, 2024 · 6efed2c · 6efed2c
1 parent 5626009
commit 6efed2c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -3147,14 +3147,19 @@ void GCodeProcessor::process_G10(const GCodeReader::GCodeLine& line)
         }
     }
 
-    // stores retract move
-    store_move_vertex(EMoveType::Retract);
+    std::array<std::optional<double>, 4> g1_axes = { std::nullopt, std::nullopt, std::nullopt, std::nullopt };
+    g1_axes[E] = - this->m_parser.config().retract_length.get_at(m_extruder_id);
+    float g1_feedrate = this->m_parser.config().retract_speed.get_at(m_extruder_id) * 60;
+    process_G1(g1_axes, g1_feedrate);
 }
 
 void GCodeProcessor::process_G11(const GCodeReader::GCodeLine& line)
 {
-    // stores unretract move
-    store_move_vertex(EMoveType::Unretract);
+
+    std::array<std::optional<double>, 4> g1_axes = { std::nullopt, std::nullopt, std::nullopt, std::nullopt };
+    g1_axes[E] = this->m_parser.config().retract_length.get_at(m_extruder_id) + this->m_parser.config().retract_restart_extra.get_at(m_extruder_id);
+    float g1_feedrate = this->m_parser.config().deretract_speed.get_at(m_extruder_id) * 60;
+    process_G1(g1_axes, g1_feedrate);
 }
 
 void GCodeProcessor::process_G20(const GCodeReader::GCodeLine& line)
@@ -4354,7 +4359,10 @@ void GCodeProcessor::post_process()
                     if (!processed)
                         processed = process_used_filament(gcode_line);
                     if (!processed && !is_temporary_decoration(gcode_line)) {
-                        if (GCodeReader::GCodeLine::cmd_is(gcode_line, "G0") || GCodeReader::GCodeLine::cmd_is(gcode_line, "G1")) {
+                        if (GCodeReader::GCodeLine::cmd_is(gcode_line, "G0") || GCodeReader::GCodeLine::cmd_is(gcode_line, "G1")
+                            || GCodeReader::GCodeLine::cmd_is(gcode_line, "G10")
+                            || GCodeReader::GCodeLine::cmd_is(gcode_line, "G11")
+                            ) {
                             export_lines.append_line(gcode_line);
                             // add lines M73 where needed
                             process_line_G1(g1_lines_counter++);

diff --git a/src/libslic3r/GCodeReader.hpp b/src/libslic3r/GCodeReader.hpp
@@ -164,6 +164,8 @@ class GCodeReader {
     char   extrusion_axis() const { return m_extrusion_axis; }
 //  void   set_extrusion_axis(char axis) { m_extrusion_axis = axis; }
 
+    GCodeConfig& config() { return m_config; };
+
 private:
     template<typename ParseLineCallback, typename LineEndCallback>
     bool        parse_file_raw_internal(const std::string &filename, ParseLineCallback parse_line_callback, LineEndCallback line_end_callback);