3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 06:57:36 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed an issue where the Max Volumetric Speed doesn't consider the Filament Flow Ratio (#9218)

Browse source 
* Rework extrusion-per-mm and speed-cap logic to enforce max vol speed

* Fix _mm3_per_mm typo
This commit is contained in:
Shantanu Nair 2025-04-20 21:30:10 +05:30 • committed by GitHub
parent 2349ea063d
commit ee7ebda584
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Extruder.hpp
View file

@ -34,7 +34,9 @@ public:
double unretract(); double unretract();
double E() const { return m_share_extruder ? m_share_E : m_E; } double E() const { return m_share_extruder ? m_share_E : m_E; }
void reset_E() { m_E = 0.; m_share_E = 0.; } void reset_E() { m_E = 0.; m_share_E = 0.; }
// e_per_mm is extrusion_per_mm = geometric volume * (filament flow ratio / cross-sectional area) [Doesn't account for print_flow_ratio, or modifiers like bridge flow ratio etc.]
double e_per_mm(double mm3_per_mm) const { return mm3_per_mm * m_e_per_mm3; } double e_per_mm(double mm3_per_mm) const { return mm3_per_mm * m_e_per_mm3; }
// e_per_mm3 is extrusion_per_mm3 = filament flow ratio / cross-sectional area [Doesn't account for print_flow_ratio, or modifiers like bridge flow ratio etc.]
double e_per_mm3() const { return m_e_per_mm3; } double e_per_mm3() const { return m_e_per_mm3; }
// Used filament volume in mm^3. // Used filament volume in mm^3.
double extruded_volume() const; double extruded_volume() const;

12
src/libslic3r/GCode.cpp
View file

@ -5270,8 +5270,11 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
gcode += m_writer.set_jerk_xy(jerk); gcode += m_writer.set_jerk_xy(jerk);
} }
// calculate extrusion length per distance unit // calculate effective extrusion length per distance unit (e_per_mm)
double filament_flow_ratio = m_config.option<ConfigOptionFloats>("filament_flow_ratio")->get_at(0);
// We set _mm3_per_mm to effectove flow = Geometric volume * print flow ratio * filament flow ratio * role-based-flow-ratios
auto _mm3_per_mm = path.mm3_per_mm * this->config().print_flow_ratio; auto _mm3_per_mm = path.mm3_per_mm * this->config().print_flow_ratio;
_mm3_per_mm *= filament_flow_ratio;
if (path.role() == erTopSolidInfill) if (path.role() == erTopSolidInfill)
_mm3_per_mm *= m_config.top_solid_infill_flow_ratio; _mm3_per_mm *= m_config.top_solid_infill_flow_ratio;
else if (path.role() == erBottomSurface) else if (path.role() == erBottomSurface)
@ -5280,9 +5283,12 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
_mm3_per_mm *= m_config.internal_bridge_flow; _mm3_per_mm *= m_config.internal_bridge_flow;
else if(sloped) else if(sloped)
_mm3_per_mm *= m_config.scarf_joint_flow_ratio; _mm3_per_mm *= m_config.scarf_joint_flow_ratio;
// Effective extrusion length per distance unit = (filament_flow_ratio/cross_section) * mm3_per_mm / print flow ratio
// m_writer.extruder()->e_per_mm3() below is (filament flow ratio / cross-sectional area)
double e_per_mm = m_writer.extruder()->e_per_mm3() * _mm3_per_mm; double e_per_mm = m_writer.extruder()->e_per_mm3() * _mm3_per_mm;
e_per_mm /= filament_flow_ratio;
// set speed // set speed
if (speed == -1) { if (speed == -1) {