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

#855 standby temp for reprap moved after header, at their correct place.

Browse Source
This commit is contained in:
remi durand 2021-01-23 17:58:48 +01:00
parent b6d3143c86
commit 7e68efb3f7
2 changed files with 5 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

@ -1015,7 +1015,7 @@ std::vector<const PrintInstance*> sort_object_instances_by_model_order(const Pri
// set standby temp for extruders
// Parse the custom G-code, try to find T, and add it if not present
static void init_multiextruders(FILE *file, Print &print, GCodeWriter & writer, ToolOrdering &tool_ordering, const std::string &custom_gcode )
void GCode::_init_multiextruders(FILE *file, Print &print, GCodeWriter & writer, ToolOrdering &tool_ordering, const std::string &custom_gcode )
{
//set standby temp for reprap
@ -1025,7 +1025,7 @@ static void init_multiextruders(FILE *file, Print &print, GCodeWriter & writer,
if (standby_temp > 0) {
if (print.config().ooze_prevention.value)
standby_temp += print.config().standby_temperature_delta.value;
fprintf(file, "G10 P%d R%d ; sets the standby temperature\n",
_write_format(file, "G10 P%d R%d ; sets the standby temperature\n",
tool_id,
standby_temp);
}
@ -1321,7 +1321,7 @@ void GCode::_do_export(Print& print, FILE* file, ThumbnailsGeneratorCallback thu
this->_print_first_layer_bed_temperature(file, print, start_gcode, initial_extruder_id, false);
//init extruders
init_multiextruders(file, print, m_writer, tool_ordering, start_gcode);
this->_init_multiextruders(file, print, m_writer, tool_ordering, start_gcode);
// Set extruder(s) temperature before and after start G-code.
if (this->config().gcode_flavor != gcfKlipper || print.config().start_gcode.value.empty())

2
src/libslic3r/GCode.hpp
View File

@ -200,6 +200,8 @@ public:
private:
void _do_export(Print &print, FILE *file, ThumbnailsGeneratorCallback thumbnail_cb);
void _init_multiextruders(FILE* file, Print& print, GCodeWriter& writer, ToolOrdering& tool_ordering, const std::string& custom_gcode);
static std::vector<LayerToPrint> collect_layers_to_print(const PrintObject &object);
static std::vector<std::pair<coordf_t, std::vector<LayerToPrint>>> collect_layers_to_print(const Print &print);
void process_layer(