diff options
| author | bubnikv <bubnikv@gmail.com> | 2017-08-28 15:57:00 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2017-08-28 15:57:00 +0300 |
| commit | 48f826c2c52344c5422a88c96aa5aedad66e61b5 (patch) | |
| tree | 4c95909b65bca96c49e41bfe6e60596bce3c5c10 | |
| parent | 61b89865ff22b2cea4167cfb8860148d95953376 (diff) | |
Disabled a limit of the nozzle diameter 0.4mm for the Prusa Wipe Tower.
Allowed scaling of the extrusion amount over the Prusa Wipe Tower
for layer heights over 0.2mm.
| -rw-r--r-- | xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp | 6 | ||||
| -rw-r--r-- | xs/src/libslic3r/Print.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp b/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp index c799601ce..baf01f427 100644 --- a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp +++ b/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp @@ -94,8 +94,10 @@ public: m_current_shape = (! is_first_layer && m_current_shape == SHAPE_NORMAL) ? SHAPE_REVERSED : SHAPE_NORMAL; ++ m_num_layer_changes; // Extrusion rate for an extrusion aka perimeter width 0.35mm. - m_extrusion_flow = std::min(0.2f, layer_height) * 0.145f; - int layer_idx = int(std::floor(layer_height * 1000) + 0.5f); + // Clamp the extrusion height to a 0.2mm layer height, independent of the nozzle diameter. +// m_extrusion_flow = std::min(0.2f, layer_height) * 0.145f; + // Use a strictly + m_extrusion_flow = layer_height * 0.145f; } // Return the wipe tower position. diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp index 5190372f3..6ae36ec58 100644 --- a/xs/src/libslic3r/Print.cpp +++ b/xs/src/libslic3r/Print.cpp @@ -558,9 +558,11 @@ std::string Print::validate() const } if (this->has_wipe_tower() && ! this->objects.empty()) { + #if 0 for (auto dmr : this->config.nozzle_diameter.values) if (std::abs(dmr - 0.4) > EPSILON) return "The Wipe Tower is currently only supported for the 0.4mm nozzle diameter."; + #endif if (this->config.gcode_flavor != gcfRepRap) return "The Wipe Tower is currently only supported for the RepRap (Marlin / Sprinter) G-code flavor."; if (! this->config.use_relative_e_distances) |