GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 21:25:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add M486 to reprapfirmware

Browse Source
This commit is contained in:
supermerill 2021-06-03 20:07:28 +02:00
parent 8de7e353c0
commit 4c803b5880
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/GCode.cpp
View File

@ -1185,7 +1185,7 @@ void GCode::_do_export(Print& print, FILE* file, ThumbnailsGeneratorCallback thu
nb_items++; nb_items++;
} }
} }
if (this->config().gcode_label_objects && print.config().gcode_flavor.value == gcfMarlin) { if (this->config().gcode_label_objects && (print.config().gcode_flavor.value == gcfMarlin || print.config().gcode_flavor.value == gcfRepRap)) {
_write(file, "; Total objects to print: " + std::to_string(nb_items) + "\n"); _write(file, "; Total objects to print: " + std::to_string(nb_items) + "\n");
_write(file, "M486 T" + std::to_string(nb_items) + "\n"); _write(file, "M486 T" + std::to_string(nb_items) + "\n");
} }
@ -2481,7 +2481,7 @@ void GCode::process_layer(
gcode += std::string("; INIT printing object ") + instance_to_print.print_object.model_object()->name gcode += std::string("; INIT printing object ") + instance_to_print.print_object.model_object()->name
+ " id:" + std::to_string(std::find(this->m_ordered_objects.begin(), this->m_ordered_objects.end(), &instance_to_print.print_object) - this->m_ordered_objects.begin()) + " id:" + std::to_string(std::find(this->m_ordered_objects.begin(), this->m_ordered_objects.end(), &instance_to_print.print_object) - this->m_ordered_objects.begin())
+ " copy " + std::to_string(instance_to_print.instance_id) + "\n"; + " copy " + std::to_string(instance_to_print.instance_id) + "\n";
if (print.config().gcode_flavor.value == gcfMarlin) { if (print.config().gcode_flavor.value == gcfMarlin || print.config().gcode_flavor.value == gcfRepRap) {
size_t instance_plater_id = 0; size_t instance_plater_id = 0;
//get index of the current copy in the whole itemset; //get index of the current copy in the whole itemset;
for (const PrintObject* obj : this->m_ordered_objects) for (const PrintObject* obj : this->m_ordered_objects)
@ -2537,7 +2537,7 @@ void GCode::process_layer(
gcode += std::string("; INIT stop printing object ") + instance_to_print.print_object.model_object()->name gcode += std::string("; INIT stop printing object ") + instance_to_print.print_object.model_object()->name
+ " id:" + std::to_string((std::find(this->m_ordered_objects.begin(), this->m_ordered_objects.end(), &instance_to_print.print_object) - this->m_ordered_objects.begin())) + " id:" + std::to_string((std::find(this->m_ordered_objects.begin(), this->m_ordered_objects.end(), &instance_to_print.print_object) - this->m_ordered_objects.begin()))
+ " copy " + std::to_string(instance_to_print.instance_id) + "\n"; + " copy " + std::to_string(instance_to_print.instance_id) + "\n";
if (print.config().gcode_flavor.value == gcfMarlin) { if (print.config().gcode_flavor.value == gcfMarlin || print.config().gcode_flavor.value == gcfRepRap) {
m_gcode_label_objects_end += std::string("M486 S-1") + "\n"; m_gcode_label_objects_end += std::string("M486 S-1") + "\n";
} }
} }