GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 09:56:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Label objects: List of objects moved before custom start gcode, quotes added for M486 A on RRF

Browse Source
This commit is contained in:
Lukas Matena 2023-09-06 09:33:41 +02:00
parent ef31e4f487
commit 37dc3378ec
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libslic3r/GCode.cpp
View File

@ -121,7 +121,8 @@ namespace Slic3r {
else if (label_object_style == LabelObjects::Firmware) { else if (label_object_style == LabelObjects::Firmware) {
if (flavor == GCodeFlavor::gcfMarlinFirmware || flavor == GCodeFlavor::gcfMarlinLegacy || flavor == GCodeFlavor::gcfRepRapFirmware) { if (flavor == GCodeFlavor::gcfMarlinFirmware || flavor == GCodeFlavor::gcfMarlinLegacy || flavor == GCodeFlavor::gcfRepRapFirmware) {
out += std::string("M486 S") + std::to_string(unique_id) + "\n"; out += std::string("M486 S") + std::to_string(unique_id) + "\n";
out += std::string("M486 A") + name + "\n"; out += std::string("M486 A");
out += (flavor == GCodeFlavor::gcfRepRapFirmware ? (std::string("\"") + name + "\"") : name) + "\n";
} else { } else {
// Not supported by / implemented for the other firmware flavors. // Not supported by / implemented for the other firmware flavors.
} }
@ -1205,6 +1206,9 @@ void GCodeGenerator::_do_export(Print& print, GCodeOutputStream &file, Thumbnail
// Emit machine envelope limits for the Marlin firmware. // Emit machine envelope limits for the Marlin firmware.
this->print_machine_envelope(file, print); this->print_machine_envelope(file, print);
// Label all objects so printer knows about them since the start.
file.write(label_all_objects(config().gcode_label_objects, config().gcode_flavor, print));
// Update output variables after the extruders were initialized. // Update output variables after the extruders were initialized.
m_placeholder_parser_integration.init(m_writer); m_placeholder_parser_integration.init(m_writer);
// Let the start-up script prime the 1st printing tool. // Let the start-up script prime the 1st printing tool.
@ -1276,9 +1280,6 @@ void GCodeGenerator::_do_export(Print& print, GCodeOutputStream &file, Thumbnail
// Set other general things. // Set other general things.
file.write(this->preamble()); file.write(this->preamble());
// Label all objects so printer knows about them since the start.
file.write(label_all_objects(config().gcode_label_objects, config().gcode_flavor, print));
print.throw_if_canceled(); print.throw_if_canceled();
// Collect custom seam data from all objects. // Collect custom seam data from all objects.