diff options
author | Enrico Turri <enricoturri@seznam.cz> | 2018-01-05 12:35:04 +0300 |
---|---|---|
committer | Enrico Turri <enricoturri@seznam.cz> | 2018-01-05 12:35:04 +0300 |
commit | ae0688f351752525a6acdacfbe2c85461b1ba45e (patch) | |
tree | 5344be18bf4b13aad1c5c05af6441c947967470e /xs/src | |
parent | 69e3ea6581da8377976429adf7f3992ab73774eb (diff) |
GCodeTimeEstimator - added processing of commands M221 (Set extrude factor override percentage)
Diffstat (limited to 'xs/src')
-rw-r--r-- | xs/src/libslic3r/GCodeTimeEstimator.cpp | 28 | ||||
-rw-r--r-- | xs/src/libslic3r/GCodeTimeEstimator.hpp | 7 |
2 files changed, 35 insertions, 0 deletions
diff --git a/xs/src/libslic3r/GCodeTimeEstimator.cpp b/xs/src/libslic3r/GCodeTimeEstimator.cpp index cc1461db6..2ebeb9fd2 100644 --- a/xs/src/libslic3r/GCodeTimeEstimator.cpp +++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp @@ -15,6 +15,7 @@ static const float DEFAULT_AXIS_MAX_ACCELERATION[] = { 9000.0f, 9000.0f, 500.0f, static const float DEFAULT_AXIS_MAX_JERK[] = { 10.0f, 10.0f, 0.2f, 2.5f }; // from Prusa Firmware (Configuration.h) static const float DEFAULT_MINIMUM_FEEDRATE = 0.0f; // from Prusa Firmware (Configuration_adv.h) static const float DEFAULT_MINIMUM_TRAVEL_FEEDRATE = 0.0f; // from Prusa Firmware (Configuration_adv.h) +static const float DEFAULT_EXTRUDE_FACTOR_OVERRIDE_PERCENTAGE = 1.0f; // 100 percent static const float PREVIOUS_FEEDRATE_THRESHOLD = 0.0001f; @@ -291,6 +292,16 @@ namespace Slic3r { return _state.minimum_travel_feedrate; } + void GCodeTimeEstimator::set_extrude_factor_override_percentage(float percentage) + { + _state.extrude_factor_override_percentage = percentage; + } + + float GCodeTimeEstimator::get_extrude_factor_override_percentage() const + { + return _state.extrude_factor_override_percentage; + } + void GCodeTimeEstimator::set_dialect(GCodeTimeEstimator::EDialect dialect) { _state.dialect = dialect; @@ -358,6 +369,7 @@ namespace Slic3r { set_retract_acceleration(DEFAULT_RETRACT_ACCELERATION); set_minimum_feedrate(DEFAULT_MINIMUM_FEEDRATE); set_minimum_travel_feedrate(DEFAULT_MINIMUM_TRAVEL_FEEDRATE); + set_extrude_factor_override_percentage(DEFAULT_EXTRUDE_FACTOR_OVERRIDE_PERCENTAGE); for (unsigned char a = X; a < Num_Axis; ++a) { @@ -528,6 +540,11 @@ namespace Slic3r { _processM205(line); break; } + case 221: // Set extrude factor override percentage + { + _processM221(line); + break; + } case 566: // Set allowable instantaneous speed change { _processM566(line); @@ -593,6 +610,9 @@ namespace Slic3r { for (unsigned char a = X; a < Num_Axis; ++a) { _curr.axis_feedrate[a] = _curr.feedrate * block.delta_pos[a] * invDistance; + if (a == E) + _curr.axis_feedrate[a] *= get_extrude_factor_override_percentage(); + _curr.abs_axis_feedrate[a] = std::abs(_curr.axis_feedrate[a]); if (_curr.abs_axis_feedrate[a] > 0.0f) min_feedrate_factor = std::min(min_feedrate_factor, get_axis_max_feedrate((EAxis)a) / _curr.abs_axis_feedrate[a]); @@ -904,6 +924,14 @@ namespace Slic3r { set_minimum_travel_feedrate(value); } + void GCodeTimeEstimator::_processM221(const GCodeReader::GCodeLine& line) + { + float value_s; + float value_t; + if (line.has_value('S', value_s) && !line.has_value('T', value_t)) + set_extrude_factor_override_percentage(value_s * 0.01f); + } + void GCodeTimeEstimator::_processM566(const GCodeReader::GCodeLine& line) { if (line.has_x()) diff --git a/xs/src/libslic3r/GCodeTimeEstimator.hpp b/xs/src/libslic3r/GCodeTimeEstimator.hpp index 2ec283da7..46f866972 100644 --- a/xs/src/libslic3r/GCodeTimeEstimator.hpp +++ b/xs/src/libslic3r/GCodeTimeEstimator.hpp @@ -73,6 +73,7 @@ namespace Slic3r { float additional_time; // s float minimum_feedrate; // mm/s float minimum_travel_feedrate; // mm/s + float extrude_factor_override_percentage; }; public: @@ -218,6 +219,9 @@ namespace Slic3r { void set_minimum_travel_feedrate(float feedrate_mm_sec); float get_minimum_travel_feedrate() const; + void set_extrude_factor_override_percentage(float percentage); + float get_extrude_factor_override_percentage() const; + void set_dialect(EDialect dialect); EDialect get_dialect() const; @@ -302,6 +306,9 @@ namespace Slic3r { // Advanced settings void _processM205(const GCodeReader::GCodeLine& line); + // Set extrude factor override percentage + void _processM221(const GCodeReader::GCodeLine& line); + // Set allowable instantaneous speed change void _processM566(const GCodeReader::GCodeLine& line); |