mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: missing EXTRUDE_END 

Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I62bd19a58d04653b3a471aca5edf1aa78f8d2a27
This commit is contained in:
qing.zhang 2024-09-29 16:52:32 +08:00 committed by Lane.Wei
parent 0faf8d5e10
commit 658c0a5452
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libslic3r/GCode.cpp
View File

@ -4908,21 +4908,22 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
} }
std::string comment; std::string comment;
bool cooling_extrude = false;
if (m_enable_cooling_markers) { if (m_enable_cooling_markers) {
if (EXTRUDER_CONFIG(enable_overhang_bridge_fan)) { if (EXTRUDER_CONFIG(enable_overhang_bridge_fan)) {
//BBS: Overhang_threshold_none means Overhang_threshold_1_4 and forcing cooling for all external perimeter //BBS: Overhang_threshold_none means Overhang_threshold_1_4 and forcing cooling for all external perimeter
int overhang_threshold = EXTRUDER_CONFIG(overhang_fan_threshold) == Overhang_threshold_none ? int overhang_threshold = EXTRUDER_CONFIG(overhang_fan_threshold) == Overhang_threshold_none ?
Overhang_threshold_none : EXTRUDER_CONFIG(overhang_fan_threshold) - 1; Overhang_threshold_none : EXTRUDER_CONFIG(overhang_fan_threshold) - 1;
if ((EXTRUDER_CONFIG(overhang_fan_threshold) == Overhang_threshold_none && path.role() == erExternalPerimeter)) { if ((EXTRUDER_CONFIG(overhang_fan_threshold) == Overhang_threshold_none && path.role() == erExternalPerimeter || (path.get_overhang_degree() > overhang_threshold ||
gcode += ";_OVERHANG_FAN_START\n"; is_bridge(path.role())))) {
} else if (path.get_overhang_degree() > overhang_threshold ||
is_bridge(path.role()))
gcode += ";_OVERHANG_FAN_START\n"; gcode += ";_OVERHANG_FAN_START\n";
}
} }
int overhang_boundary_for_cooling = EXTRUDER_CONFIG(overhang_threshold_participating_cooling); int overhang_boundary_for_cooling = EXTRUDER_CONFIG(overhang_threshold_participating_cooling);
if (!is_bridge(path.role()) && path.get_overhang_degree() <= overhang_boundary_for_cooling) { if (!is_bridge(path.role()) && path.get_overhang_degree() <= overhang_boundary_for_cooling) {
cooling_extrude = true;
comment = ";_EXTRUDE_SET_SPEED"; comment = ";_EXTRUDE_SET_SPEED";
} }
@ -5017,22 +5018,17 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
} }
} }
if (m_enable_cooling_markers) { if (m_enable_cooling_markers) {
if (cooling_extrude)
gcode += ";_EXTRUDE_END\n";
if (EXTRUDER_CONFIG(enable_overhang_bridge_fan)) { if (EXTRUDER_CONFIG(enable_overhang_bridge_fan)) {
//BBS: Overhang_threshold_none means Overhang_threshold_1_4 and forcing cooling for all external perimeter //BBS: Overhang_threshold_none means Overhang_threshold_1_4 and forcing cooling for all external perimeter
int overhang_threshold = EXTRUDER_CONFIG(overhang_fan_threshold) == Overhang_threshold_none ? int overhang_threshold = EXTRUDER_CONFIG(overhang_fan_threshold) == Overhang_threshold_none ?
Overhang_threshold_none : EXTRUDER_CONFIG(overhang_fan_threshold) - 1; Overhang_threshold_none : EXTRUDER_CONFIG(overhang_fan_threshold) - 1;
if ((EXTRUDER_CONFIG(overhang_fan_threshold) == Overhang_threshold_none && path.role() == erExternalPerimeter)) { if ((EXTRUDER_CONFIG(overhang_fan_threshold) == Overhang_threshold_none && path.role() == erExternalPerimeter || (path.get_overhang_degree() > overhang_threshold ||
gcode += ";_EXTRUDE_END\n"; is_bridge(path.role()))))
gcode += ";_OVERHANG_FAN_END\n"; gcode += ";_OVERHANG_FAN_END\n";
} else if (path.get_overhang_degree() > overhang_threshold ||
is_bridge(path.role()))
gcode += ";_OVERHANG_FAN_END\n";
else
gcode += ";_EXTRUDE_END\n";
}
else {
gcode += ";_EXTRUDE_END\n";
} }
} }