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

change print flow ratio to float.

Browse source 
Also fixed an issue that maximum volumetric speed is not respected
#93 #103
This commit is contained in:
SoftFever 2023-01-04 11:29:13 +08:00
parent 6d99cfbaa2
commit 60acc6b4e8
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libslic3r/GCode.cpp
View file

@ -3699,7 +3699,8 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
}
// calculate extrusion length per distance unit
double e_per_mm = m_writer.extruder()->e_per_mm3() * path.mm3_per_mm * this->config().print_flow_ratio.get_abs_value(1);
const auto _mm3_per_mm = path.mm3_per_mm * this->config().print_flow_ratio;
double e_per_mm = m_writer.extruder()->e_per_mm3() * _mm3_per_mm;
double min_speed = double(m_config.slow_down_min_speed.get_at(m_writer.extruder()->id()));
// set speed
@ -3743,7 +3744,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
}
//BBS: if not set the speed, then use the filament_max_volumetric_speed directly
if (speed == 0)
speed = EXTRUDER_CONFIG(filament_max_volumetric_speed) / path.mm3_per_mm;
speed = EXTRUDER_CONFIG(filament_max_volumetric_speed) / _mm3_per_mm;
if (this->on_first_layer()) {
//BBS: for solid infill of initial layer, speed can be higher as long as
//wall lines have be attached
@ -3757,14 +3758,14 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
// // cap speed with max_volumetric_speed anyway (even if user is not using autospeed)
// speed = std::min(
// speed,
// m_config.max_volumetric_speed.value / path.mm3_per_mm
// m_config.max_volumetric_speed.value / _mm3_per_mm
// );
//}
if (EXTRUDER_CONFIG(filament_max_volumetric_speed) > 0) {
// cap speed with max_volumetric_speed anyway (even if user is not using autospeed)
speed = std::min(
speed,
EXTRUDER_CONFIG(filament_max_volumetric_speed) / path.mm3_per_mm
EXTRUDER_CONFIG(filament_max_volumetric_speed) / _mm3_per_mm
);
}
double F = speed * 60; // convert mm/sec to mm/min