3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 21:58:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improvement related to 'separate z travel speed':

Browse source 
default to zero = use good old travel speed. This is to
ensure backwards compatibility with existing profiles
This commit is contained in:
Lukas Matena 2021-05-31 10:56:57 +02:00
parent bd6badf123
commit 4657e0d670
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libslic3r/GCodeWriter.cpp
View file

@ -316,6 +316,11 @@ std::string GCodeWriter::travel_to_xy(const Vec2d &point, const std::string &com
std::string GCodeWriter::travel_to_xyz(const Vec3d &point, const std::string &comment) std::string GCodeWriter::travel_to_xyz(const Vec3d &point, const std::string &comment)
{ {
// FIXME: This function was not being used when travel_speed_z was separated (bd6badf).
// Calculation of feedrate was not updated accordingly. If you want to use
// this function, fix it first.
std::terminate();
/* 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
@ -368,9 +373,13 @@ std::string GCodeWriter::_travel_to_z(double z, const std::string &comment)
{ {
m_pos(2) = z; m_pos(2) = z;
double speed = this->config.travel_speed_z.value;
if (speed == 0.)
speed = this->config.travel_speed.value;
std::ostringstream gcode; std::ostringstream gcode;
gcode << "G1 Z" << XYZF_NUM(z) gcode << "G1 Z" << XYZF_NUM(z)
<< " F" << XYZF_NUM(this->config.travel_speed_z.value * 60.0); << " F" << XYZF_NUM(speed * 60.0);
COMMENT(comment); COMMENT(comment);
gcode << "\n"; gcode << "\n";
return gcode.str(); return gcode.str();

7
src/libslic3r/PrintConfig.cpp
View file

@ -2740,11 +2740,12 @@ void PrintConfigDef::init_fff_params()
def = this->add("travel_speed_z", coFloat); def = this->add("travel_speed_z", coFloat);
def->label = L("Z travel"); def->label = L("Z travel");
def->tooltip = L("Speed for movements along the Z axis."); def->tooltip = L("Speed for movements along the Z axis.\nWhen set to zero, the value "
"is ignored and regular travel speed is used instead.");
def->sidetext = L("mm/s"); def->sidetext = L("mm/s");
def->min = 1; def->min = 0;
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(12)); def->set_default_value(new ConfigOptionFloat(0.));
def = this->add("use_firmware_retraction", coBool); def = this->add("use_firmware_retraction", coBool);
def->label = L("Use firmware retraction"); def->label = L("Use firmware retraction");