diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp index d4ebb64362..27c180b742 100644 --- a/src/libslic3r/GCodeWriter.cpp +++ b/src/libslic3r/GCodeWriter.cpp @@ -585,12 +585,9 @@ std::string GCodeWriter::_spiral_travel_to_z(double z, const Vec2d &ij_offset, c { m_pos(2) = z; - double speed = this->config.travel_speed_z.value; - if (speed == 0.) { - speed = m_is_first_layer ? this->config.get_abs_value("initial_layer_travel_speed") - : this->config.travel_speed.value; - } - + //Orca: always use travel speed for spiral lift + auto speed = m_is_first_layer ? this->config.get_abs_value("initial_layer_travel_speed") : this->config.travel_speed.value; + std::string output = "G17\n"; GCodeG2G3Formatter w(true); w.emit_z(z); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index b43a91ae1f..ff8da72ee1 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -4829,13 +4829,13 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionFloat(120)); def = this->add("travel_speed_z", coFloat); - //def->label = L("Z travel"); - //def->tooltip = L("Speed of vertical travel along z axis. " - // "This is typically lower because build plate or gantry is hard to be moved. " - // "Zero means using travel speed directly in gcode, but will be limited by printer's ability when run gcode"); + def->label = L("Z travel"); + def->tooltip = L("Speed of vertical travel along z axis. " + "This is typically lower because build plate or gantry is hard to be moved. " + "Zero means using travel speed directly in gcode, but will be limited by printer's ability when run gcode. This value will affect normalDefault is 0."); def->sidetext = L("mm/s"); def->min = 0; - def->mode = comDevelop; + def->mode = comDevelop; //Orca: keep it comDevelop as it is not really needed for most users def->set_default_value(new ConfigOptionFloat(0.)); def = this->add("wipe", coBools); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 9fd2f823a0..11ca54b789 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2173,6 +2173,7 @@ void TabPrint::build() optgroup = page->new_optgroup(L("Travel speed"), L"param_travel_speed", 15); optgroup->append_single_option_line("travel_speed"); + optgroup->append_single_option_line("travel_speed_z"); optgroup = page->new_optgroup(L("Acceleration"), L"param_acceleration", 15); optgroup->append_single_option_line("default_acceleration");