mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
small tweaks
This commit is contained in:
parent
cae9ca950f
commit
5269e3a2cd
2 changed files with 4 additions and 4 deletions
|
@ -797,7 +797,7 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
|
||||||
check_add_eol(toolchange_gcode_str);
|
check_add_eol(toolchange_gcode_str);
|
||||||
|
|
||||||
// SoftFever: set new PA for new filament
|
// SoftFever: set new PA for new filament
|
||||||
if (gcodegen.config().enable_pressure_advance.get_at(new_extruder_id)) {
|
if (new_extruder_id != -1 && gcodegen.config().enable_pressure_advance.get_at(new_extruder_id)) {
|
||||||
gcode += gcodegen.writer().set_pressure_advance(gcodegen.config().pressure_advance.get_at(new_extruder_id));
|
gcode += gcodegen.writer().set_pressure_advance(gcodegen.config().pressure_advance.get_at(new_extruder_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -909,7 +909,7 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
|
||||||
if (!gcodegen.is_BBL_Printer()) {
|
if (!gcodegen.is_BBL_Printer()) {
|
||||||
for (const WipeTower::ToolChangeResult &tcr : m_priming) {
|
for (const WipeTower::ToolChangeResult &tcr : m_priming) {
|
||||||
if (!tcr.extrusions.empty())
|
if (!tcr.extrusions.empty())
|
||||||
gcode += append_tcr(gcodegen, tcr, tcr.new_tool);
|
gcode += append_tcr2(gcodegen, tcr, tcr.new_tool);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return gcode;
|
return gcode;
|
||||||
|
@ -987,7 +987,7 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
|
||||||
if (!gcodegen.is_BBL_Printer()) {
|
if (!gcodegen.is_BBL_Printer()) {
|
||||||
if (std::abs(gcodegen.writer().get_position().z() - m_final_purge.print_z) > EPSILON)
|
if (std::abs(gcodegen.writer().get_position().z() - m_final_purge.print_z) > EPSILON)
|
||||||
gcode += gcodegen.change_layer(m_final_purge.print_z);
|
gcode += gcodegen.change_layer(m_final_purge.print_z);
|
||||||
gcode += append_tcr(gcodegen, m_final_purge, -1);
|
gcode += append_tcr2(gcodegen, m_final_purge, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return gcode;
|
return gcode;
|
||||||
|
|
|
@ -303,7 +303,7 @@ std::string GCodeWriter::toolchange(unsigned int extruder_id)
|
||||||
// return the toolchange command
|
// return the toolchange command
|
||||||
// if we are running a single-extruder setup, just set the extruder and return nothing
|
// if we are running a single-extruder setup, just set the extruder and return nothing
|
||||||
std::ostringstream gcode;
|
std::ostringstream gcode;
|
||||||
if (this->multiple_extruders) {
|
if (this->multiple_extruders || (this->config.filament_diameter.values.size() > 1 && !is_bbl_printers())) {
|
||||||
gcode << this->toolchange_prefix() << extruder_id;
|
gcode << this->toolchange_prefix() << extruder_id;
|
||||||
//BBS
|
//BBS
|
||||||
if (GCodeWriter::full_gcode_comment)
|
if (GCodeWriter::full_gcode_comment)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue