diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index bd4afb8adc..86c732f29b 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -12999,6 +12999,18 @@ msgstr "" msgid "Travel speed of the first layer." msgstr "" +msgid "First layer travel acceleration" +msgstr "" + +msgid "Travel acceleration of first layer." +msgstr "" + +msgid "First layer travel jerk" +msgstr "" + +msgid "Travel jerk of first layer." +msgstr "" + msgid "Number of slow layers" msgstr "" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 2a338e7afe..f507299180 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -15193,6 +15193,18 @@ msgstr "Bewegung" msgid "Travel speed of the first layer." msgstr "Bewegungsgeschwindigkeit der ersten Schicht" +msgid "First layer travel acceleration" +msgstr "Eilgang Beschleunigung" + +msgid "Travel acceleration of first layer." +msgstr "Eilgang Beschleunigung der ersten Schicht." + +msgid "First layer travel jerk" +msgstr "Eilgang Ruck" + +msgid "Travel jerk of first layer." +msgstr "Eilgang Ruck der ersten Schicht." + msgid "Number of slow layers" msgstr "Anzahl der langsamen Schichten" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 3c6b7b9040..b1b8aad458 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -13280,6 +13280,18 @@ msgstr "" msgid "Travel speed of the first layer." msgstr "" +msgid "First layer travel acceleration" +msgstr "" + +msgid "Travel acceleration of first layer." +msgstr "" + +msgid "First layer travel jerk" +msgstr "" + +msgid "Travel jerk of first layer." +msgstr "" + #, fuzzy msgid "Number of slow layers" msgstr "This is the number of top interface layers." diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 2f10c40757..7e362e4ccb 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -7225,16 +7225,25 @@ std::string GCode::travel_to(const Point& point, ExtrusionRole role, std::string unsigned int acceleration_to_set = 0; if (this->on_first_layer()) { - if (m_config.default_acceleration.value > 0 && m_config.initial_layer_acceleration.value > 0) { - acceleration_to_set = (unsigned int) floor(m_config.initial_layer_acceleration.value + 0.5); + unsigned int initial_layer_travel_acceleration = m_config.get_abs_value("initial_layer_travel_acceleration"); + double initial_layer_travel_jerk = m_config.get_abs_value("initial_layer_travel_jerk"); + + if (m_config.default_acceleration.value > 0 && initial_layer_travel_acceleration > 0) { + acceleration_to_set = (unsigned int) floor(initial_layer_travel_acceleration + 0.5); } - - if (m_config.default_jerk.value > 0 && m_config.initial_layer_jerk.value > 0) { - jerk_to_set = m_config.initial_layer_jerk.value; + if (m_config.default_jerk.value > 0 && initial_layer_travel_jerk > 0) { + jerk_to_set = initial_layer_travel_jerk; } - } else { + } else { // ORCA: Handle short-travel acceleration and jerk for outer perimeters (if applicable) + const bool is_short_travel = travel.length() < scale_(EXTRUDER_CONFIG(retraction_minimum_travel)); + if (m_config.default_acceleration.value > 0) { - if (role == erExternalPerimeter && travel.length() < scale_(EXTRUDER_CONFIG(retraction_minimum_travel))) { + if (role == erOverhangPerimeter && is_short_travel) { + const double bridge_acceleration = m_config.get_abs_value("bridge_acceleration"); + + if (bridge_acceleration > 0) + acceleration_to_set = (unsigned int) floor(bridge_acceleration + 0.5); + } else if (role == erExternalPerimeter && is_short_travel) { if (m_config.outer_wall_acceleration.value > 0) acceleration_to_set = (unsigned int) floor(m_config.outer_wall_acceleration.value + 0.5); } else { @@ -7244,7 +7253,7 @@ std::string GCode::travel_to(const Point& point, ExtrusionRole role, std::string } if (m_config.default_jerk.value > 0) { - if (role == erExternalPerimeter && travel.length() < scale_(EXTRUDER_CONFIG(retraction_minimum_travel))) { + if ((role == erExternalPerimeter || role == erOverhangPerimeter) && is_short_travel) { if (m_config.outer_wall_jerk.value > 0) jerk_to_set = m_config.outer_wall_jerk.value; } else { diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp index 1fa4d58bb0..f8827923f4 100644 --- a/src/libslic3r/PerimeterGenerator.cpp +++ b/src/libslic3r/PerimeterGenerator.cpp @@ -1562,9 +1562,9 @@ void PerimeterGenerator::process_classic() } // for each loop of an island // fill gaps - if (! gaps.empty()) { - // collapse - double min = 0.2 * perimeter_width * (1 - INSET_OVERLAP_TOLERANCE); + if (! gaps.empty()) { // collapse + // ORCA: Use the smaller width as the lower bound to avoid overestimating safe overlap + double min = 0.2 * std::min(perimeter_width, ext_perimeter_width) * (1 - INSET_OVERLAP_TOLERANCE); double max = 2. * perimeter_spacing; ExPolygons gaps_ex = diff_ex( //FIXME offset2 would be enough and cheaper. diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index fd63b1b41f..79eaac2f13 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -950,7 +950,7 @@ static std::vector s_Preset_print_options { "bridge_density","internal_bridge_density", "precise_outer_wall", "bridge_acceleration", "sparse_infill_acceleration", "internal_solid_infill_acceleration", "tree_support_auto_brim", "tree_support_brim_width", "gcode_comments", "gcode_label_objects", - "initial_layer_travel_speed", "exclude_object", "slow_down_layers", "infill_anchor", "infill_anchor_max","initial_layer_min_bead_width", + "initial_layer_travel_speed", "initial_layer_travel_acceleration", "initial_layer_travel_jerk", "exclude_object", "slow_down_layers", "infill_anchor", "infill_anchor_max","initial_layer_min_bead_width", "make_overhang_printable", "make_overhang_printable_angle", "make_overhang_printable_hole_size" ,"notes", "wipe_tower_cone_angle", "wipe_tower_extra_spacing","wipe_tower_max_purge_speed", "wipe_tower_wall_type", "wipe_tower_extra_rib_length", "wipe_tower_rib_width", "wipe_tower_fillet_wall", diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index a7f0f0a2b5..b9e8842b0b 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -343,6 +343,8 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n || opt_key == "travel_speed_z" || opt_key == "initial_layer_speed" || opt_key == "initial_layer_travel_speed" + || opt_key == "initial_layer_travel_acceleration" + || opt_key == "initial_layer_travel_jerk" || opt_key == "slow_down_layers" || opt_key == "idle_temperature" || opt_key == "wipe_tower_cone_angle" diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 5f5bb5e66f..8d5ccc3de6 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -3032,6 +3032,15 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(300)); + def = this->add("initial_layer_travel_acceleration", coFloatOrPercent); + def->label = L("First layer travel"); + def->tooltip = L("Travel acceleration of first layer."); + def->sidetext = L("mm/s² or %"); + def->min = 0; + def->mode = comAdvanced; + def->ratio_over = "travel_acceleration"; + def->set_default_value(new ConfigOptionFloatOrPercent(100, true)); + def = this->add("accel_to_decel_enable", coBool); def->label = L("Enable accel_to_decel"); def->category = L("Speed"); @@ -3122,6 +3131,15 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(12)); + def = this->add("initial_layer_travel_jerk", coFloatOrPercent); + def->label = L("First layer travel"); + def->tooltip = L("Travel jerk of first layer."); + def->sidetext = L("mm/s or %"); + def->min = 0; + def->mode = comAdvanced; + def->ratio_over = "travel_jerk"; + def->set_default_value(new ConfigOptionFloatOrPercent(100, true)); + def = this->add("initial_layer_line_width", coFloatOrPercent); def->label = L("First layer"); def->category = L("Quality"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index b8ff0d0fd2..ae86445730 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1377,6 +1377,8 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBool, accel_to_decel_enable)) ((ConfigOptionPercent, accel_to_decel_factor)) ((ConfigOptionFloatOrPercent, initial_layer_travel_speed)) + ((ConfigOptionFloatOrPercent, initial_layer_travel_acceleration)) + ((ConfigOptionFloatOrPercent, initial_layer_travel_jerk)) ((ConfigOptionBool, bbl_calib_mark_logo)) ((ConfigOptionBool, disable_m73)) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 6f5b6655bb..c3725fde3a 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2504,6 +2504,7 @@ void TabPrint::build() optgroup->append_single_option_line("sparse_infill_acceleration", "speed_settings_acceleration#sparse-infill"); optgroup->append_single_option_line("internal_solid_infill_acceleration", "speed_settings_acceleration#internal-solid-infill"); optgroup->append_single_option_line("initial_layer_acceleration", "speed_settings_acceleration#initial-layer"); + optgroup->append_single_option_line("initial_layer_travel_acceleration"); optgroup->append_single_option_line("top_surface_acceleration", "speed_settings_acceleration#top-surface"); optgroup->append_single_option_line("travel_acceleration", "speed_settings_acceleration#travel"); optgroup->append_single_option_line("accel_to_decel_enable", "speed_settings_acceleration"); @@ -2517,6 +2518,7 @@ void TabPrint::build() optgroup->append_single_option_line("infill_jerk", "speed_settings_jerk_xy#infill"); optgroup->append_single_option_line("top_surface_jerk", "speed_settings_jerk_xy#top-surface"); optgroup->append_single_option_line("initial_layer_jerk", "speed_settings_jerk_xy#initial-layer"); + optgroup->append_single_option_line("initial_layer_travel_jerk"); optgroup->append_single_option_line("travel_jerk", "speed_settings_jerk_xy#travel"); optgroup = page->new_optgroup(L("Advanced"), L"param_advanced", 15);