3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set the bed temperature based on the active extruder settings.

Browse source 
https://github.com/prusa3d/Slic3r/issues/157
This commit is contained in:
bubnikv 2017-06-21 17:45:55 +02:00
parent f0325575c2
commit c1146e298b
3 changed files with 116 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
xs/src/libslic3r/GCode.cpp
View file

@ -443,16 +443,6 @@ bool GCode::do_export(FILE *file, Print &print)
// Prepare the helper object for replacing placeholders in custom G-code and output filename. // Prepare the helper object for replacing placeholders in custom G-code and output filename.
m_placeholder_parser = print.placeholder_parser; m_placeholder_parser = print.placeholder_parser;
m_placeholder_parser.update_timestamp(); m_placeholder_parser.update_timestamp();
// Disable fan.
if (print.config.cooling.values.front() && print.config.disable_fan_first_layers.values.front())
write(file, m_writer.set_fan(0, true));
// Set bed temperature if the start G-code does not contain any bed temp control G-codes.
if (print.config.first_layer_bed_temperature.values.front() > 0 &&
boost::ifind_first(print.config.start_gcode.value, std::string("M140")).empty() &&
boost::ifind_first(print.config.start_gcode.value, std::string("M190")).empty())
write(file, m_writer.set_bed_temperature(print.config.first_layer_bed_temperature.values.front(), true));
// Get optimal tool ordering to minimize tool switches of a multi-exruder print. // Get optimal tool ordering to minimize tool switches of a multi-exruder print.
// For a print by objects, find the 1st printing object. // For a print by objects, find the 1st printing object.
@ -484,6 +474,21 @@ bool GCode::do_export(FILE *file, Print &print)
assert(final_extruder_id != (unsigned int)-1); assert(final_extruder_id != (unsigned int)-1);
} }
// Disable fan.
if (print.config.cooling.get_at(initial_extruder_id) && print.config.disable_fan_first_layers.get_at(initial_extruder_id))
write(file, m_writer.set_fan(0, true));
// Set bed temperature if the start G-code does not contain any bed temp control G-codes.
{
// Always call m_writer.set_bed_temperature() so it will set the internal "current" state of the bed temp as if
// the custom start G-code emited these.
//FIXME Should one parse the custom G-code to initialize the "current" bed temp state at m_writer?
std::string gcode = m_writer.set_bed_temperature(print.config.first_layer_bed_temperature.get_at(initial_extruder_id), true);
if (boost::ifind_first(print.config.start_gcode.value, std::string("M140")).empty() &&
boost::ifind_first(print.config.start_gcode.value, std::string("M190")).empty())
write(file, gcode);
}
// Set extruder(s) temperature before and after start G-code. // Set extruder(s) temperature before and after start G-code.
this->_print_first_layer_extruder_temperatures(file, print, initial_extruder_id, false); this->_print_first_layer_extruder_temperatures(file, print, initial_extruder_id, false);
// Let the start-up script prime the 1st printing tool. // Let the start-up script prime the 1st printing tool.
@ -582,8 +587,7 @@ bool GCode::do_export(FILE *file, Print &print)
// Ff we are printing the bottom layer of an object, and we have already finished // Ff we are printing the bottom layer of an object, and we have already finished
// another one, set first layer temperatures. This happens before the Z move // another one, set first layer temperatures. This happens before the Z move
// is triggered, so machine has more time to reach such temperatures. // is triggered, so machine has more time to reach such temperatures.
if (print.config.first_layer_bed_temperature.values.front() > 0) write(file, m_writer.set_bed_temperature(print.config.first_layer_bed_temperature.get_at(initial_extruder_id)));
write(file, m_writer.set_bed_temperature(print.config.first_layer_bed_temperature.values.front()));
// Set first layer extruder. // Set first layer extruder.
this->_print_first_layer_extruder_temperatures(file, print, initial_extruder_id, false); this->_print_first_layer_extruder_temperatures(file, print, initial_extruder_id, false);
} }
@ -767,7 +771,7 @@ void GCode::process_layer(
const Layer &layer = (object_layer != nullptr) ? *object_layer : *support_layer; const Layer &layer = (object_layer != nullptr) ? *object_layer : *support_layer;
coordf_t print_z = layer.print_z; coordf_t print_z = layer.print_z;
bool first_layer = layer.id() == 0; bool first_layer = layer.id() == 0;
unsigned int first_extruder_id = layer_tools.extruders.empty() ? 0 : layer_tools.extruders.front(); unsigned int first_extruder_id = layer_tools.extruders.front();
// Initialize config with the 1st object to be printed at this layer. // Initialize config with the 1st object to be printed at this layer.
m_config.apply(layer.object()->config, true); m_config.apply(layer.object()->config, true);
@ -819,8 +823,7 @@ void GCode::process_layer(
if (temperature > 0 && temperature != print.config.first_layer_temperature.get_at(extruder.id)) if (temperature > 0 && temperature != print.config.first_layer_temperature.get_at(extruder.id))
gcode += m_writer.set_temperature(temperature, false, extruder.id); gcode += m_writer.set_temperature(temperature, false, extruder.id);
} }
if (print.config.bed_temperature.values.front() > 0 && print.config.bed_temperature.values.front() != print.config.first_layer_bed_temperature.values.front()) gcode += m_writer.set_bed_temperature(print.config.bed_temperature.get_at(first_extruder_id));
gcode += m_writer.set_bed_temperature(print.config.bed_temperature.values.front());
// Mark the temperature transition from 1st to 2nd layer to be finished. // Mark the temperature transition from 1st to 2nd layer to be finished.
m_second_layer_things_done = true; m_second_layer_things_done = true;
} }

171
xs/src/libslic3r/GCodeWriter.cpp
View file

@ -16,7 +16,7 @@ namespace Slic3r {
void GCodeWriter::apply_print_config(const PrintConfig &print_config) void GCodeWriter::apply_print_config(const PrintConfig &print_config)
{ {
this->config.apply(print_config, true); this->config.apply(print_config, true);
this->_extrusion_axis = this->config.get_extrusion_axis(); m_extrusion_axis = this->config.get_extrusion_axis();
this->m_single_extruder_multi_material = print_config.single_extruder_multi_material.value; this->m_single_extruder_multi_material = print_config.single_extruder_multi_material.value;
} }
@ -94,8 +94,14 @@ std::string GCodeWriter::set_temperature(unsigned int temperature, bool wait, in
return gcode.str(); return gcode.str();
} }
std::string GCodeWriter::set_bed_temperature(unsigned int temperature, bool wait) const std::string GCodeWriter::set_bed_temperature(unsigned int temperature, bool wait)
{ {
if (temperature == m_last_bed_temperature && (! wait || m_last_bed_temperature_reached))
return std::string();
m_last_bed_temperature = temperature;
m_last_bed_temperature_reached = wait;
std::string code, comment; std::string code, comment;
if (wait && FLAVOR_IS_NOT(gcfTeacup)) { if (wait && FLAVOR_IS_NOT(gcfTeacup)) {
if (FLAVOR_IS(gcfMakerWare) || FLAVOR_IS(gcfSailfish)) { if (FLAVOR_IS(gcfMakerWare) || FLAVOR_IS(gcfSailfish)) {
@ -124,12 +130,11 @@ std::string GCodeWriter::set_bed_temperature(unsigned int temperature, bool wait
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::set_fan(unsigned int speed, bool dont_save)
GCodeWriter::set_fan(unsigned int speed, bool dont_save)
{ {
std::ostringstream gcode; std::ostringstream gcode;
if (this->_last_fan_speed != speed || dont_save) { if (m_last_fan_speed != speed || dont_save) {
if (!dont_save) this->_last_fan_speed = speed; if (!dont_save) m_last_fan_speed = speed;
if (speed == 0) { if (speed == 0) {
if (FLAVOR_IS(gcfTeacup)) { if (FLAVOR_IS(gcfTeacup)) {
@ -160,13 +165,12 @@ GCodeWriter::set_fan(unsigned int speed, bool dont_save)
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::set_acceleration(unsigned int acceleration)
GCodeWriter::set_acceleration(unsigned int acceleration)
{ {
if (acceleration == 0 || acceleration == this->_last_acceleration) if (acceleration == 0 || acceleration == m_last_acceleration)
return ""; return std::string();
this->_last_acceleration = acceleration; m_last_acceleration = acceleration;
std::ostringstream gcode; std::ostringstream gcode;
if (FLAVOR_IS(gcfRepetier)) { if (FLAVOR_IS(gcfRepetier)) {
@ -183,23 +187,22 @@ GCodeWriter::set_acceleration(unsigned int acceleration)
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::reset_e(bool force)
GCodeWriter::reset_e(bool force)
{ {
if (FLAVOR_IS(gcfMach3) if (FLAVOR_IS(gcfMach3)
|| FLAVOR_IS(gcfMakerWare) || FLAVOR_IS(gcfMakerWare)
|| FLAVOR_IS(gcfSailfish)) || FLAVOR_IS(gcfSailfish))
return ""; return "";
if (this->_extruder != nullptr) { if (m_extruder != nullptr) {
if (this->_extruder->E == 0. && ! force) if (m_extruder->E == 0. && ! force)
return ""; return "";
this->_extruder->E = 0.; m_extruder->E = 0.;
} }
if (!this->_extrusion_axis.empty() && !this->config.use_relative_e_distances) { if (! m_extrusion_axis.empty() && ! this->config.use_relative_e_distances) {
std::ostringstream gcode; std::ostringstream gcode;
gcode << "G92 " << this->_extrusion_axis << "0"; gcode << "G92 " << m_extrusion_axis << "0";
if (this->config.gcode_comments) gcode << " ; reset extrusion distance"; if (this->config.gcode_comments) gcode << " ; reset extrusion distance";
gcode << "\n"; gcode << "\n";
return gcode.str(); return gcode.str();
@ -208,13 +211,12 @@ GCodeWriter::reset_e(bool force)
} }
} }
std::string std::string GCodeWriter::update_progress(unsigned int num, unsigned int tot, bool allow_100) const
GCodeWriter::update_progress(unsigned int num, unsigned int tot, bool allow_100) const
{ {
if (FLAVOR_IS_NOT(gcfMakerWare) && FLAVOR_IS_NOT(gcfSailfish)) if (FLAVOR_IS_NOT(gcfMakerWare) && FLAVOR_IS_NOT(gcfSailfish))
return ""; return "";
unsigned int percent = 100.0 * num / tot; unsigned int percent = (unsigned int)floor(100.0 * num / tot + 0.5);
if (!allow_100) percent = std::min(percent, (unsigned int)99); if (!allow_100) percent = std::min(percent, (unsigned int)99);
std::ostringstream gcode; std::ostringstream gcode;
@ -227,7 +229,7 @@ GCodeWriter::update_progress(unsigned int num, unsigned int tot, bool allow_100)
std::string GCodeWriter::toolchange(unsigned int extruder_id) std::string GCodeWriter::toolchange(unsigned int extruder_id)
{ {
// set the new extruder // set the new extruder
this->_extruder = const_cast<Extruder*>(&*this->extruders.find(Extruder::key(extruder_id))); m_extruder = const_cast<Extruder*>(&*this->extruders.find(Extruder::key(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
@ -249,9 +251,7 @@ std::string GCodeWriter::toolchange(unsigned int extruder_id)
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::set_speed(double F, const std::string &comment, const std::string &cooling_marker) const
GCodeWriter::set_speed(double F, const std::string &comment,
const std::string &cooling_marker) const
{ {
std::ostringstream gcode; std::ostringstream gcode;
gcode << "G1 F" << F; gcode << "G1 F" << F;
@ -261,11 +261,10 @@ GCodeWriter::set_speed(double F, const std::string &comment,
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::travel_to_xy(const Pointf &point, const std::string &comment)
GCodeWriter::travel_to_xy(const Pointf &point, const std::string &comment)
{ {
this->_pos.x = point.x; m_pos.x = point.x;
this->_pos.y = point.y; m_pos.y = point.y;
std::ostringstream gcode; std::ostringstream gcode;
gcode << "G1 X" << XYZF_NUM(point.x) gcode << "G1 X" << XYZF_NUM(point.x)
@ -276,23 +275,22 @@ GCodeWriter::travel_to_xy(const Pointf &point, const std::string &comment)
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::travel_to_xyz(const Pointf3 &point, const std::string &comment)
GCodeWriter::travel_to_xyz(const Pointf3 &point, const std::string &comment)
{ {
/* If target Z is lower than current Z but higher than nominal Z we /* If target Z is lower than current Z but higher than nominal Z we
don't perform the Z move but we only move in the XY plane and don't perform the Z move but we only move in the XY plane and
adjust the nominal Z by reducing the lift amount that will be adjust the nominal Z by reducing the lift amount that will be
used for unlift. */ used for unlift. */
if (!this->will_move_z(point.z)) { if (!this->will_move_z(point.z)) {
double nominal_z = this->_pos.z - this->_lifted; double nominal_z = m_pos.z - m_lifted;
this->_lifted = this->_lifted - (point.z - nominal_z); m_lifted = m_lifted - (point.z - nominal_z);
return this->travel_to_xy(point); return this->travel_to_xy(point);
} }
/* In all the other cases, we perform an actual XYZ move and cancel /* In all the other cases, we perform an actual XYZ move and cancel
the lift. */ the lift. */
this->_lifted = 0; m_lifted = 0;
this->_pos = point; m_pos = point;
std::ostringstream gcode; std::ostringstream gcode;
gcode << "G1 X" << XYZF_NUM(point.x) gcode << "G1 X" << XYZF_NUM(point.x)
@ -304,28 +302,26 @@ GCodeWriter::travel_to_xyz(const Pointf3 &point, const std::string &comment)
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::travel_to_z(double z, const std::string &comment)
GCodeWriter::travel_to_z(double z, const std::string &comment)
{ {
/* If target Z is lower than current Z but higher than nominal Z /* If target Z is lower than current Z but higher than nominal Z
we don't perform the move but we only adjust the nominal Z by we don't perform the move but we only adjust the nominal Z by
reducing the lift amount that will be used for unlift. */ reducing the lift amount that will be used for unlift. */
if (!this->will_move_z(z)) { if (!this->will_move_z(z)) {
double nominal_z = this->_pos.z - this->_lifted; double nominal_z = m_pos.z - m_lifted;
this->_lifted = this->_lifted - (z - nominal_z); m_lifted = m_lifted - (z - nominal_z);
return ""; return "";
} }
/* In all the other cases, we perform an actual Z move and cancel /* In all the other cases, we perform an actual Z move and cancel
the lift. */ the lift. */
this->_lifted = 0; m_lifted = 0;
return this->_travel_to_z(z, comment); return this->_travel_to_z(z, comment);
} }
std::string std::string GCodeWriter::_travel_to_z(double z, const std::string &comment)
GCodeWriter::_travel_to_z(double z, const std::string &comment)
{ {
this->_pos.z = z; m_pos.z = z;
std::ostringstream gcode; std::ostringstream gcode;
gcode << "G1 Z" << XYZF_NUM(z) gcode << "G1 Z" << XYZF_NUM(z)
@ -335,47 +331,44 @@ GCodeWriter::_travel_to_z(double z, const std::string &comment)
return gcode.str(); return gcode.str();
} }
bool bool GCodeWriter::will_move_z(double z) const
GCodeWriter::will_move_z(double z) const
{ {
/* If target Z is lower than current Z but higher than nominal Z /* If target Z is lower than current Z but higher than nominal Z
we don't perform an actual Z move. */ we don't perform an actual Z move. */
if (this->_lifted > 0) { if (m_lifted > 0) {
double nominal_z = this->_pos.z - this->_lifted; double nominal_z = m_pos.z - m_lifted;
if (z >= nominal_z && z <= this->_pos.z) if (z >= nominal_z && z <= m_pos.z)
return false; return false;
} }
return true; return true;
} }
std::string std::string GCodeWriter::extrude_to_xy(const Pointf &point, double dE, const std::string &comment)
GCodeWriter::extrude_to_xy(const Pointf &point, double dE, const std::string &comment)
{ {
this->_pos.x = point.x; m_pos.x = point.x;
this->_pos.y = point.y; m_pos.y = point.y;
this->_extruder->extrude(dE); m_extruder->extrude(dE);
std::ostringstream gcode; std::ostringstream gcode;
gcode << "G1 X" << XYZF_NUM(point.x) gcode << "G1 X" << XYZF_NUM(point.x)
<< " Y" << XYZF_NUM(point.y) << " Y" << XYZF_NUM(point.y)
<< " " << this->_extrusion_axis << E_NUM(this->_extruder->E); << " " << m_extrusion_axis << E_NUM(m_extruder->E);
COMMENT(comment); COMMENT(comment);
gcode << "\n"; gcode << "\n";
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::extrude_to_xyz(const Pointf3 &point, double dE, const std::string &comment)
GCodeWriter::extrude_to_xyz(const Pointf3 &point, double dE, const std::string &comment)
{ {
this->_pos = point; m_pos = point;
this->_lifted = 0; m_lifted = 0;
this->_extruder->extrude(dE); m_extruder->extrude(dE);
std::ostringstream gcode; std::ostringstream gcode;
gcode << "G1 X" << XYZF_NUM(point.x) gcode << "G1 X" << XYZF_NUM(point.x)
<< " Y" << XYZF_NUM(point.y) << " Y" << XYZF_NUM(point.y)
<< " Z" << XYZF_NUM(point.z) << " Z" << XYZF_NUM(point.z)
<< " " << this->_extrusion_axis << E_NUM(this->_extruder->E); << " " << m_extrusion_axis << E_NUM(m_extruder->E);
COMMENT(comment); COMMENT(comment);
gcode << "\n"; gcode << "\n";
return gcode.str(); return gcode.str();
@ -383,28 +376,27 @@ GCodeWriter::extrude_to_xyz(const Pointf3 &point, double dE, const std::string &
std::string GCodeWriter::retract(bool before_wipe) std::string GCodeWriter::retract(bool before_wipe)
{ {
double factor = before_wipe ? this->_extruder->retract_before_wipe() : 1.; double factor = before_wipe ? m_extruder->retract_before_wipe() : 1.;
assert(factor >= 0. && factor <= 1. + EPSILON); assert(factor >= 0. && factor <= 1. + EPSILON);
return this->_retract( return this->_retract(
factor * this->_extruder->retract_length(), factor * m_extruder->retract_length(),
factor * this->_extruder->retract_restart_extra(), factor * m_extruder->retract_restart_extra(),
"retract" "retract"
); );
} }
std::string GCodeWriter::retract_for_toolchange(bool before_wipe) std::string GCodeWriter::retract_for_toolchange(bool before_wipe)
{ {
double factor = before_wipe ? this->_extruder->retract_before_wipe() : 1.; double factor = before_wipe ? m_extruder->retract_before_wipe() : 1.;
assert(factor >= 0. && factor <= 1. + EPSILON); assert(factor >= 0. && factor <= 1. + EPSILON);
return this->_retract( return this->_retract(
factor * this->_extruder->retract_length_toolchange(), factor * m_extruder->retract_length_toolchange(),
factor * this->_extruder->retract_restart_extra_toolchange(), factor * m_extruder->retract_restart_extra_toolchange(),
"retract for toolchange" "retract for toolchange"
); );
} }
std::string std::string GCodeWriter::_retract(double length, double restart_extra, const std::string &comment)
GCodeWriter::_retract(double length, double restart_extra, const std::string &comment)
{ {
std::ostringstream gcode; std::ostringstream gcode;
@ -415,13 +407,13 @@ GCodeWriter::_retract(double length, double restart_extra, const std::string &co
// If we use volumetric E values we turn lengths into volumes */ // If we use volumetric E values we turn lengths into volumes */
if (this->config.use_volumetric_e) { if (this->config.use_volumetric_e) {
double d = this->_extruder->filament_diameter(); double d = m_extruder->filament_diameter();
double area = d * d * PI/4; double area = d * d * PI/4;
length = length * area; length = length * area;
restart_extra = restart_extra * area; restart_extra = restart_extra * area;
} }
double dE = this->_extruder->retract(length, restart_extra); double dE = m_extruder->retract(length, restart_extra);
if (dE != 0) { if (dE != 0) {
if (this->config.use_firmware_retraction) { if (this->config.use_firmware_retraction) {
if (FLAVOR_IS(gcfMachinekit)) if (FLAVOR_IS(gcfMachinekit))
@ -429,8 +421,8 @@ GCodeWriter::_retract(double length, double restart_extra, const std::string &co
else else
gcode << "G10 ; retract\n"; gcode << "G10 ; retract\n";
} else { } else {
gcode << "G1 " << this->_extrusion_axis << E_NUM(this->_extruder->E) gcode << "G1 " << m_extrusion_axis << E_NUM(m_extruder->E)
<< " F" << float(this->_extruder->retract_speed() * 60.); << " F" << float(m_extruder->retract_speed() * 60.);
COMMENT(comment); COMMENT(comment);
gcode << "\n"; gcode << "\n";
} }
@ -442,15 +434,14 @@ GCodeWriter::_retract(double length, double restart_extra, const std::string &co
return gcode.str(); return gcode.str();
} }
std::string std::string GCodeWriter::unretract()
GCodeWriter::unretract()
{ {
std::ostringstream gcode; std::ostringstream gcode;
if (FLAVOR_IS(gcfMakerWare)) if (FLAVOR_IS(gcfMakerWare))
gcode << "M101 ; extruder on\n"; gcode << "M101 ; extruder on\n";
double dE = this->_extruder->unretract(); double dE = m_extruder->unretract();
if (dE != 0) { if (dE != 0) {
if (this->config.use_firmware_retraction) { if (this->config.use_firmware_retraction) {
if (FLAVOR_IS(gcfMachinekit)) if (FLAVOR_IS(gcfMachinekit))
@ -460,8 +451,8 @@ GCodeWriter::unretract()
gcode << this->reset_e(); gcode << this->reset_e();
} else { } else {
// use G1 instead of G0 because G0 will blend the restart with the previous travel move // use G1 instead of G0 because G0 will blend the restart with the previous travel move
gcode << "G1 " << this->_extrusion_axis << E_NUM(this->_extruder->E) gcode << "G1 " << m_extrusion_axis << E_NUM(m_extruder->E)
<< " F" << float(this->_extruder->deretract_speed() * 60.); << " F" << float(m_extruder->deretract_speed() * 60.);
if (this->config.gcode_comments) gcode << " ; unretract"; if (this->config.gcode_comments) gcode << " ; unretract";
gcode << "\n"; gcode << "\n";
} }
@ -473,31 +464,29 @@ GCodeWriter::unretract()
/* If this method is called more than once before calling unlift(), /* If this method is called more than once before calling unlift(),
it will not perform subsequent lifts, even if Z was raised manually it will not perform subsequent lifts, even if Z was raised manually
(i.e. with travel_to_z()) and thus _lifted was reduced. */ (i.e. with travel_to_z()) and thus _lifted was reduced. */
std::string std::string GCodeWriter::lift()
GCodeWriter::lift()
{ {
// check whether the above/below conditions are met // check whether the above/below conditions are met
double target_lift = 0; double target_lift = 0;
{ {
double above = this->config.retract_lift_above.get_at(this->_extruder->id); double above = this->config.retract_lift_above.get_at(m_extruder->id);
double below = this->config.retract_lift_below.get_at(this->_extruder->id); double below = this->config.retract_lift_below.get_at(m_extruder->id);
if (this->_pos.z >= above && (below == 0 || this->_pos.z <= below)) if (m_pos.z >= above && (below == 0 || m_pos.z <= below))
target_lift = this->config.retract_lift.get_at(this->_extruder->id); target_lift = this->config.retract_lift.get_at(m_extruder->id);
} }
if (this->_lifted == 0 && target_lift > 0) { if (m_lifted == 0 && target_lift > 0) {
this->_lifted = target_lift; m_lifted = target_lift;
return this->_travel_to_z(this->_pos.z + target_lift, "lift Z"); return this->_travel_to_z(m_pos.z + target_lift, "lift Z");
} }
return ""; return "";
} }
std::string std::string GCodeWriter::unlift()
GCodeWriter::unlift()
{ {
std::string gcode; std::string gcode;
if (this->_lifted > 0) { if (m_lifted > 0) {
gcode += this->_travel_to_z(this->_pos.z - this->_lifted, "restore layer Z"); gcode += this->_travel_to_z(m_pos.z - m_lifted, "restore layer Z");
this->_lifted = 0; m_lifted = 0;
} }
return gcode; return gcode;
} }

32
xs/src/libslic3r/GCodeWriter.hpp
View file

@ -16,13 +16,15 @@ public:
bool multiple_extruders; bool multiple_extruders;
GCodeWriter() : GCodeWriter() :
multiple_extruders(false), _extrusion_axis("E"), _extruder(nullptr), multiple_extruders(false), m_extrusion_axis("E"), m_extruder(nullptr),
m_single_extruder_multi_material(false), m_single_extruder_multi_material(false),
_last_acceleration(0), _last_fan_speed(0), _lifted(0) m_last_acceleration(0), m_last_fan_speed(0),
m_last_bed_temperature(0), m_last_bed_temperature_reached(true),
m_lifted(0)
{} {}
Extruder* extruder() { return this->_extruder; } Extruder* extruder() { return m_extruder; }
const Extruder* extruder() const { return this->_extruder; } const Extruder* extruder() const { return m_extruder; }
std::string extrusion_axis() const { return this->_extrusion_axis; } std::string extrusion_axis() const { return m_extrusion_axis; }
void apply_print_config(const PrintConfig &print_config); void apply_print_config(const PrintConfig &print_config);
void set_extruders(const std::vector<unsigned int> &extruder_ids); void set_extruders(const std::vector<unsigned int> &extruder_ids);
std::vector<unsigned int> extruder_ids() const { std::vector<unsigned int> extruder_ids() const {
@ -35,14 +37,14 @@ public:
std::string preamble(); std::string preamble();
std::string postamble() const; std::string postamble() const;
std::string set_temperature(unsigned int temperature, bool wait = false, int tool = -1) const; std::string set_temperature(unsigned int temperature, bool wait = false, int tool = -1) const;
std::string set_bed_temperature(unsigned int temperature, bool wait = false) const; std::string set_bed_temperature(unsigned int temperature, bool wait = false);
std::string set_fan(unsigned int speed, bool dont_save = false); std::string set_fan(unsigned int speed, bool dont_save = false);
std::string set_acceleration(unsigned int acceleration); std::string set_acceleration(unsigned int acceleration);
std::string reset_e(bool force = false); std::string reset_e(bool force = false);
std::string update_progress(unsigned int num, unsigned int tot, bool allow_100 = false) const; std::string update_progress(unsigned int num, unsigned int tot, bool allow_100 = false) const;
// return false if this extruder was already selected // return false if this extruder was already selected
bool need_toolchange(unsigned int extruder_id) const bool need_toolchange(unsigned int extruder_id) const
{ return (this->_extruder == nullptr) || (this->_extruder->id != extruder_id); } { return m_extruder == nullptr || m_extruder->id != extruder_id; }
std::string set_extruder(unsigned int extruder_id) std::string set_extruder(unsigned int extruder_id)
{ return this->need_toolchange(extruder_id) ? this->toolchange(extruder_id) : ""; } { return this->need_toolchange(extruder_id) ? this->toolchange(extruder_id) : ""; }
std::string toolchange(unsigned int extruder_id); std::string toolchange(unsigned int extruder_id);
@ -58,16 +60,18 @@ public:
std::string unretract(); std::string unretract();
std::string lift(); std::string lift();
std::string unlift(); std::string unlift();
Pointf3 get_position() const { return this->_pos; } Pointf3 get_position() const { return m_pos; }
private: private:
std::string _extrusion_axis; std::string m_extrusion_axis;
bool m_single_extruder_multi_material; bool m_single_extruder_multi_material;
Extruder* _extruder; Extruder* m_extruder;
unsigned int _last_acceleration; unsigned int m_last_acceleration;
unsigned int _last_fan_speed; unsigned int m_last_fan_speed;
double _lifted; unsigned int m_last_bed_temperature;
Pointf3 _pos; bool m_last_bed_temperature_reached;
double m_lifted;
Pointf3 m_pos;
std::string _travel_to_z(double z, const std::string &comment); std::string _travel_to_z(double z, const std::string &comment);
std::string _retract(double length, double restart_extra, const std::string &comment); std::string _retract(double length, double restart_extra, const std::string &comment);