juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented filament start / g-codes.

Browse Source 
https://github.com/prusa3d/Slic3r/issues/265
https://github.com/prusa3d/Slic3r/issues/319
Based on the implementation by @lordofhyphens
19eea19d91
This commit is contained in:
bubnikv
2017-06-05 11:30:57 +02:00
parent b5f38dd23f
commit ad3be1a69e
5 changed files with 68 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xs/src/libslic3r/GCode.cpp
View File

@@ -229,8 +229,10 @@ inline void write(FILE *file, const std::string &what)
inline void writeln(FILE *file, const std::string &what)
{
write(file, what);
fprintf(file, "\n");
if (! what.empty()) {
write(file, what);
fprintf(file, "\n");
}
}
// Collect pairs of object_layer + support_layer sorted by print_z.
@@ -486,7 +488,10 @@ bool GCode::do_export(FILE *file, Print &print)
this->_print_first_layer_extruder_temperatures(file, print, initial_extruder_id, false);
// Let the start-up script prime the 1st printing tool.
m_placeholder_parser.set("initial_tool", initial_extruder_id);
fprintf(file, "%s\n", m_placeholder_parser.process(print.config.start_gcode.value).c_str());
writeln(file, m_placeholder_parser.process(print.config.start_gcode.value));
// Process filament-specific gcode in extruder order.
for (const std::string &start_gcode : print.config.start_filament_gcode.values)
writeln(file, m_placeholder_parser.process(start_gcode));
this->_print_first_layer_extruder_temperatures(file, print, initial_extruder_id, true);
// Set other general things.
@@ -623,14 +628,17 @@ bool GCode::do_export(FILE *file, Print &print)
write(file, m_wipe_tower->finalize(*this));
}
// write end commands to file
// Write end commands to file.
write(file, this->retract());
write(file, m_writer.set_fan(false));
// Process filament-specific gcode in extruder order.
for (const std::string &end_gcode : print.config.end_filament_gcode.values)
writeln(file, m_placeholder_parser.process(end_gcode));
writeln(file, m_placeholder_parser.process(print.config.end_gcode));
write(file, m_writer.update_progress(m_layer_count, m_layer_count, true)); // 100%
write(file, m_writer.postamble());
// get filament stats
// Get filament stats.
print.filament_stats.clear();
print.total_used_filament = 0.;
print.total_extruded_volume = 0.;