diff options
| author | supermerill <merill@fr.fr> | 2018-07-03 15:03:58 +0300 |
|---|---|---|
| committer | supermerill <merill@fr.fr> | 2018-07-29 10:45:33 +0300 |
| commit | 7509e65fcac271fc183b8a3aa8ac68b0770d49a6 (patch) | |
| tree | 2b8264f273a1c4cc308791854da44037643bda91 | |
| parent | 4a88075334de19b6861086bbfaae32a6130245ae (diff) | |
Octoprint-Cancelobject compatibility (when verbose gcode)cancelobject-pr
| -rw-r--r-- | xs/src/libslic3r/GCode.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xs/src/libslic3r/GCode.cpp b/xs/src/libslic3r/GCode.cpp index 94634f4e4..33b4fb8b3 100644 --- a/xs/src/libslic3r/GCode.cpp +++ b/xs/src/libslic3r/GCode.cpp @@ -1457,6 +1457,9 @@ void GCode::process_layer( unsigned int copy_id = 0; for (const Point © : copies) { + if (this->config().gcode_comments){ + gcode += ((std::ostringstream&)(std::ostringstream() << "; printing object " << print_object->model_object()->name << " id:" << layer_id << " copy " << copy_id << "\n")).str(); + } // When starting a new object, use the external motion planner for the first travel move. std::pair<const PrintObject*, Point> this_object_copy(print_object, copy); if (m_last_obj_copy != this_object_copy) @@ -1481,6 +1484,9 @@ void GCode::process_layer( gcode += this->extrude_infill(print,by_region_specific); } } + if (this->config().gcode_comments){ + gcode += ((std::ostringstream&)(std::ostringstream() << "; stop printing object " << print_object->model_object()->name << " id:" << layer_id << " copy " << copy_idx << "\n")).str(); + } ++copy_id; } } @@ -2456,6 +2462,10 @@ std::string GCode::retract(bool toolchange) if (m_writer.extruder() == nullptr) return gcode; + + // We need to reset e before any extrusion or wipe to allow the reset to happen at the real + // begining of an object gcode + gcode += m_writer.reset_e(); // wipe (if it's enabled for this extruder and we have a stored wipe path) if (EXTRUDER_CONFIG(wipe) && m_wipe.has_path()) { @@ -2469,7 +2479,6 @@ std::string GCode::retract(bool toolchange) length is honored in case wipe path was too short. */ gcode += toolchange ? m_writer.retract_for_toolchange() : m_writer.retract(); - gcode += m_writer.reset_e(); if (m_writer.extruder()->retract_length() > 0 || m_config.use_firmware_retraction) gcode += m_writer.lift(); |