From 5e231bf8749c0eb54cd3ffc71f5d172d7c8a9c65 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Thu, 10 May 2018 17:44:04 +0200 Subject: [PATCH 1/2] New wipe tower parameters added to INI file with profiles --- resources/profiles/PrusaResearch.ini | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini index d82921fd8..87950bae7 100644 --- a/resources/profiles/PrusaResearch.ini +++ b/resources/profiles/PrusaResearch.ini @@ -121,7 +121,8 @@ top_infill_extrusion_width = 0.45 top_solid_infill_speed = 40 travel_speed = 180 wipe_tower = 1 -wipe_tower_per_color_wipe = 20 +wipe_tower_bridging = 10 +wipe_tower_rotation_angle = 0 wipe_tower_width = 60 wipe_tower_x = 180 wipe_tower_y = 140 @@ -538,6 +539,10 @@ compatible_printers = compatible_printers_condition = end_filament_gcode = "; Filament-specific end gcode" extrusion_multiplier = 1 +filament_loading_speed = 28 +filament_unloading_speed = 90 +filament_toolchange_delay = 0 +filament_ramming_parameters = "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" filament_cost = 0 filament_density = 0 filament_diameter = 1.75 @@ -591,6 +596,7 @@ fan_always_on = 0 fan_below_layer_time = 20 filament_colour = #3A80CA filament_max_volumetric_speed = 11 +filament_ramming_parameters = "120 100 5.70968 6.03226 7 8.25806 9 9.19355 9.3871 9.77419 10.129 10.3226 10.4516 10.5161| 0.05 5.69677 0.45 6.15484 0.95 8.76774 1.45 9.20323 1.95 9.95806 2.45 10.3871 2.95 10.5677 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" filament_type = ABS first_layer_bed_temperature = 100 first_layer_temperature = 255 @@ -763,6 +769,7 @@ fan_always_on = 0 filament_colour = #FFFFD7 filament_max_volumetric_speed = 10 filament_notes = "List of materials tested with standart PVA print settings for MK2:\n\nPrimaSelect PVA+\nICE FILAMENTS PVA 'NAUGHTY NATURAL'\nVerbatim BVOH" +filament_ramming_parameters = "120 100 8.3871 8.6129 8.93548 9.22581 9.48387 9.70968 9.87097 10.0323 10.2258 10.4194 10.6452 10.8065| 0.05 8.34193 0.45 8.73548 0.95 9.34836 1.45 9.78385 1.95 10.0871 2.45 10.5161 2.95 10.8903 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" filament_soluble = 1 filament_type = PVA first_layer_temperature = 195 @@ -933,6 +940,9 @@ retract_restart_extra_toolchange = 0 retract_speed = 80 single_extruder_multi_material = 1 printer_model = MK2SMM +parking_pos_retraction = 92 +cooling_tube_length = 5 +cooling_tube_retraction = 91.5 [printer:*mm-single*] inherits = *multimaterial* From 9af6a89f20785feab4d068977957bee9ee239cad Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Thu, 10 May 2018 18:07:22 +0200 Subject: [PATCH 2/2] Fixed a crash when loading multipart objects --- lib/Slic3r/GUI/Plater.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 0a5d02b94..08c1065df 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -700,7 +700,7 @@ sub load_files { . "Instead of considering them as multiple objects, should I consider\n" . "this file as a single object having multiple parts?\n"), L('Multi-part object detected'), wxICON_WARNING | wxYES | wxNO); - $model->convert_multipart_object if $dialog->ShowModal(scalar(@$nozzle_dmrs)) == wxID_YES; + $model->convert_multipart_object(scalar(@$nozzle_dmrs)) if $dialog->ShowModal() == wxID_YES; } if ($one_by_one) { @@ -717,7 +717,7 @@ sub load_files { . "Instead of considering them as multiple objects, should I consider\n" . "these files to represent a single object having multiple parts?\n"), L('Multi-part object detected'), wxICON_WARNING | wxYES | wxNO); - $new_model->convert_multipart_object if $dialog->ShowModal(scalar(@$nozzle_dmrs)) == wxID_YES; + $new_model->convert_multipart_object(scalar(@$nozzle_dmrs)) if $dialog->ShowModal() == wxID_YES; push @obj_idx, $self->load_model_objects(@{$new_model->objects}); }