mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-08-30 13:26:58 +00:00
Fix ignored filament-specific ironing speed override (#15082)
Fix overridden ironing speed Use filament_ironing_speed for the active filament when configured, falling back to the process setting when unset.
This commit is contained in:
@@ -7650,8 +7650,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
|
|||||||
if (sloped) {
|
if (sloped) {
|
||||||
speed = std::min(speed, m_config.scarf_joint_speed.get_abs_value(speed));
|
speed = std::min(speed, m_config.scarf_joint_speed.get_abs_value(speed));
|
||||||
}
|
}
|
||||||
}
|
} else if(path.role() == erInternalBridgeInfill) {
|
||||||
else if(path.role() == erInternalBridgeInfill) {
|
|
||||||
speed = m_config.get_abs_value_at("internal_bridge_speed", get_nozzle_config_index(m_writer.filament()->id()));
|
speed = m_config.get_abs_value_at("internal_bridge_speed", get_nozzle_config_index(m_writer.filament()->id()));
|
||||||
} else if (path.role() == erOverhangPerimeter || path.role() == erSupportTransition || path.role() == erBridgeInfill) {
|
} else if (path.role() == erOverhangPerimeter || path.role() == erSupportTransition || path.role() == erBridgeInfill) {
|
||||||
speed = NOZZLE_CONFIG(bridge_speed);
|
speed = NOZZLE_CONFIG(bridge_speed);
|
||||||
@@ -7662,7 +7661,10 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
|
|||||||
} else if (path.role() == erTopSolidInfill) {
|
} else if (path.role() == erTopSolidInfill) {
|
||||||
speed = NOZZLE_CONFIG(top_surface_speed);
|
speed = NOZZLE_CONFIG(top_surface_speed);
|
||||||
} else if (path.role() == erIroning) {
|
} else if (path.role() == erIroning) {
|
||||||
speed = m_config.get_abs_value("ironing_speed");
|
const size_t filament_idx = get_filament_config_index(m_writer.filament()->id());
|
||||||
|
speed = m_config.filament_ironing_speed.is_nil(filament_idx)
|
||||||
|
? m_config.get_abs_value("ironing_speed")
|
||||||
|
: m_config.filament_ironing_speed.get_at(filament_idx);
|
||||||
} else if (path.role() == erBottomSurface) {
|
} else if (path.role() == erBottomSurface) {
|
||||||
speed = NOZZLE_CONFIG(initial_layer_infill_speed);
|
speed = NOZZLE_CONFIG(initial_layer_infill_speed);
|
||||||
} else if (path.role() == erGapFill) {
|
} else if (path.role() == erGapFill) {
|
||||||
|
|||||||
Reference in New Issue
Block a user