Wipe tower: removed skinnydip_extra_move

src/libslic3r/GCode/WipeTower.cpp

@@ -645,7 +645,6 @@ void WipeTower::set_extruder(size_t idx, const PrintConfig& config)
         m_filpar[idx].cooling_final_speed     = float(config.filament_cooling_final_speed.get_at(idx));
         m_filpar[idx].filament_skinnydip_loading_speed     = float(config.filament_skinnydip_loading_speed.get_at(idx));
         m_filpar[idx].filament_skinnydip_distance          = float(config.filament_skinnydip_distance.get_at(idx));
-        m_filpar[idx].filament_skinnydip_extra_move        = float(config.filament_skinnydip_extra_move.get_at(idx));
     }
 
     m_filpar[idx].filament_area = float((M_PI/4.f) * pow(config.filament_diameter.get_at(idx), 2)); // all extruders are assumed to have the same filament diameter at this point
@@ -1045,9 +1044,6 @@ void WipeTower::toolchange_Unload(
 
                 // Retract while the print head is stationary, so if there is a blob, it is not dragged along.
                 writer.retract(skinnydip_dist_e, m_filpar[m_current_tool].unloading_speed * 60.f);
-
-                if (m_filpar[m_current_tool].filament_skinnydip_extra_move != 0.f)
-                    skinnydip_dist_e += m_filpar[m_current_tool].filament_skinnydip_extra_move;
             }
 
             if (i == number_of_cooling_moves - 1 && change_temp_later) {

src/libslic3r/GCode/WipeTower.hpp

@@ -239,7 +239,6 @@ public:
 
 		float               filament_skinnydip_loading_speed = 0.f;
 		float               filament_skinnydip_distance = 0.f;
-		float               filament_skinnydip_extra_move = 0.f;
 
         int                 cooling_moves = 0;
         float               cooling_initial_speed = 0.f;

src/libslic3r/Preset.cpp

@@ -478,7 +478,7 @@ static std::vector<std::string> s_Preset_print_options {
 static std::vector<std::string> s_Preset_filament_options {
     "filament_colour", "filament_diameter", "filament_type", "filament_soluble", "filament_notes", "filament_max_volumetric_speed",
     "extrusion_multiplier", "filament_density", "filament_cost", "filament_spool_weight", "filament_loading_speed", "filament_loading_speed_start", "filament_load_time",
-    "filament_unloading_speed", "filament_unloading_speed_start", "filament_unload_time", "filament_toolchange_delay", "filament_skinnydip_extra_move", "filament_cooling_moves", "filament_skinnydip_loading_speed", "filament_skinnydip_distance",
+    "filament_unloading_speed", "filament_unloading_speed_start", "filament_unload_time", "filament_toolchange_delay", "filament_cooling_moves", "filament_skinnydip_loading_speed", "filament_skinnydip_distance",
     "filament_cooling_initial_speed", "filament_cooling_final_speed", "filament_ramming_parameters", "filament_minimal_purge_on_wipe_tower",
     "filament_multitool_ramming", "filament_multitool_ramming_volume", "filament_multitool_ramming_flow", 
     "temperature", "idle_temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", "fan_always_on", "cooling", "min_fan_speed",

src/libslic3r/Print.cpp

@@ -218,7 +218,6 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
             || opt_key == "filament_unloading_speed"
             || opt_key == "filament_unloading_speed_start"
             || opt_key == "filament_toolchange_delay"
-            || opt_key == "filament_skinnydip_extra_move"
             || opt_key == "filament_cooling_moves"
             || opt_key == "filament_skinnydip_loading_speed"
             || opt_key == "filament_skinnydip_distance"

src/libslic3r/PrintConfig.cpp

@@ -1107,13 +1107,6 @@ void PrintConfigDef::init_fff_params()
     def->mode = comExpert;
     def->set_default_value(new ConfigOptionFloats { 0. });
 
-    def = this->add("filament_skinnydip_extra_move", coFloats);
-    def->label = L("ELIAS Skinnydip extension per dip");
-    def->tooltip = L("...");
-    def->sidetext = L("mm");
-    def->mode = comExpert;
-    def->set_default_value(new ConfigOptionFloats { 0. });
-
     def = this->add("filament_cooling_moves", coInts);
     def->label = L("Number of cooling moves");
     def->tooltip = L("Filament is cooled by being moved back and forth in the "

src/libslic3r/PrintConfig.hpp

@@ -733,7 +733,6 @@ PRINT_CONFIG_CLASS_DEFINE(
     ((ConfigOptionFloats,              filament_multitool_ramming_flow))
     ((ConfigOptionFloats,              filament_skinnydip_loading_speed))
     ((ConfigOptionFloats,              filament_skinnydip_distance))
-    ((ConfigOptionFloats,              filament_skinnydip_extra_move))
     ((ConfigOptionBool,                gcode_comments))
     ((ConfigOptionEnum<GCodeFlavor>,   gcode_flavor))
     ((ConfigOptionEnum<LabelObjectsStyle>,  gcode_label_objects))

src/slic3r/GUI/Tab.cpp

@@ -2273,7 +2273,6 @@ void TabFilament::build()
         optgroup->append_single_option_line("filament_cooling_final_speed");
         optgroup->append_single_option_line("filament_skinnydip_loading_speed");
         optgroup->append_single_option_line("filament_skinnydip_distance");
-        optgroup->append_single_option_line("filament_skinnydip_extra_move");
 
         create_line_with_widget(optgroup.get(), "filament_ramming_parameters", "", [this](wxWindow* parent) {
             auto ramming_dialog_btn = new wxButton(parent, wxID_ANY, _(L("Ramming settings"))+dots, wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);