From 2eb06848b59692e82cd362d68765805519341633 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 29 Feb 2016 11:54:37 +0100 Subject: [PATCH 1/4] Match UM2 with Olsson Block profiles to Paul's UM2+ PLA profiles Contributes to CURA-91 --- .../ultimaker2_olsson/0.25_normal.curaprofile | 61 ++++++++----------- .../ultimaker2_olsson/0.4_fast.curaprofile | 61 ++++++++----------- .../ultimaker2_olsson/0.4_high.curaprofile | 61 ++++++++----------- .../ultimaker2_olsson/0.4_normal.curaprofile | 56 ++++++++--------- .../ultimaker2_olsson/0.4_ulti.curaprofile | 34 +++++++++++ .../ultimaker2_olsson/0.6_normal.curaprofile | 60 ++++++++---------- .../ultimaker2_olsson/0.8_normal.curaprofile | 60 ++++++++---------- 7 files changed, 191 insertions(+), 202 deletions(-) create mode 100644 resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index cf05274c8a..86db0cbd22 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -5,39 +5,30 @@ machine_type = ultimaker2_olsson machine_variant = 0.25 mm [settings] -retraction_combing = All -top_thickness = 0.72 -speed_layer_0 = 20 -speed_print = 20 -speed_wall_0 = 20 -raft_interface_line_spacing = 3.0 -shell_thickness = 0.88 -infill_overlap = 15 -retraction_hop = 0.0 -skin_no_small_gaps_heuristic = False -retraction_speed = 40.0 -raft_surface_line_width = 0.4 -raft_base_line_width = 1.0 -raft_margin = 5.0 -adhesion_type = brim -skirt_minimal_length = 150.0 -layer_height = 0.06 -brim_line_count = 36 -infill_before_walls = False -raft_surface_thickness = 0.27 -raft_airgap = 0.0 -skirt_gap = 3.0 -raft_interface_line_width = 0.4 -speed_topbottom = 20 -support_pattern = lines -layer_height_0 = 0.15 -infill_sparse_density = 22 -top_bottom_thickness = 0.72 -speed_infill = 30 -magic_mesh_surface_mode = False -bottom_thickness = 0.72 -speed_wall_x = 25 machine_nozzle_size = 0.22 -raft_surface_line_spacing = 3.0 -support_enable = False - +layer_height = 0.06 +layer_height_0 = 0.15 +shell_thickness = 0.88 +top_bottom_thickness = 0.72 +travel_compensate_overlapping_walls_enabled = True +skin_no_small_gaps_heuristic = False +top_bottom_pattern = lines +infill_sparse_density = 22 +infill_overlap = 0.022 +infill_wipe_dist = 0.1 +retraction_amount = 6 +retraction_min_travel = 0.5 +retraction_count_max = 30 +retraction_extrusion_window = 6 +speed_infill = 30 +speed_wall_0 = 20 +speed_wall_x = 25 +speed_topbottom = 20 +speed_layer_0 = 25 +skirt_speed = 25 +speed_slowdown_layers = 2 +travel_avoid_distance = 1 +cool_fan_full_layer = 2 +cool_min_layer_time_fan_speed_max = 15 +adhesion_type = brim +brim_width = 7 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index 8ba9158c3b..6511f2ada8 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -5,38 +5,31 @@ machine_type = ultimaker2_olsson machine_variant = 0.4 mm [settings] -retraction_combing = All -top_thickness = 0.75 -speed_print = 40 -speed_wall_0 = 40 -raft_surface_line_spacing = 3.0 -shell_thickness = 0.7 -infill_sparse_density = 18 -retraction_hop = 0.0 -skin_no_small_gaps_heuristic = False -retraction_speed = 40.0 -raft_surface_line_width = 0.4 -raft_base_line_width = 1.0 -raft_margin = 5.0 -adhesion_type = brim -skirt_minimal_length = 150.0 -layer_height = 0.15 -brim_line_count = 22 -infill_before_walls = False -raft_surface_thickness = 0.27 -raft_airgap = 0.0 -infill_overlap = 15 -raft_interface_line_width = 0.4 -speed_topbottom = 30 -support_pattern = lines -layer_height_0 = 0.26 -raft_interface_line_spacing = 3.0 -speed_travel = 150 -skirt_gap = 3.0 -magic_mesh_surface_mode = False -bottom_thickness = 0.75 -speed_wall_x = 50 machine_nozzle_size = 0.35 -top_bottom_thickness = 0.75 -support_enable = False - +layer_height = 0.15 +layer_height_0 = 0.26 +shell_thickness = 0.7 +top_bottom_thickness = 0.6 +travel_compensate_overlapping_walls_enabled = True +skin_no_small_gaps_heuristic = False +top_bottom_pattern = lines +infill_sparse_density = 18 +infill_overlap = 0.035 +infill_wipe_dist = 0.2 +retraction_amount = 5.5 +retraction_min_travel = 0.5 +retraction_count_max = 30 +retraction_extrusion_window = 6 +speed_infill = 60 +speed_wall_0 = 40 +speed_wall_x = 50 +speed_topbottom = 30 +speed_travel = 150 +speed_layer_0 = 25 +skirt_speed = 25 +speed_slowdown_layers = 2 +travel_avoid_distance = 1 +cool_fan_full_layer = 2 +cool_min_layer_time_fan_speed_max = 15 +adhesion_type = brim +brim_width = 8 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index 16655a5876..33be857fb7 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -5,39 +5,30 @@ machine_type = ultimaker2_olsson machine_variant = 0.4 mm [settings] -retraction_combing = All -top_thickness = 0.72 -speed_layer_0 = 20 -speed_print = 30 -speed_wall_0 = 30 -raft_interface_line_spacing = 3.0 -shell_thickness = 1.05 -infill_overlap = 15 -retraction_hop = 0.0 -skin_no_small_gaps_heuristic = False -retraction_speed = 40.0 -raft_surface_line_width = 0.4 -raft_base_line_width = 1.0 -raft_margin = 5.0 -adhesion_type = brim -skirt_minimal_length = 150.0 -layer_height = 0.06 -brim_line_count = 22 -infill_before_walls = False -raft_surface_thickness = 0.27 -raft_airgap = 0.0 -skirt_gap = 3.0 -raft_interface_line_width = 0.4 -speed_topbottom = 20 -support_pattern = lines -layer_height_0 = 0.26 -infill_sparse_density = 22 -top_bottom_thickness = 0.72 -speed_infill = 50 -magic_mesh_surface_mode = False -bottom_thickness = 0.72 -speed_wall_x = 40 machine_nozzle_size = 0.35 -raft_surface_line_spacing = 3.0 -support_enable = False - +layer_height = 0.06 +layer_height_0 = 0.26 +shell_thickness = 1.05 +top_bottom_thickness = 0.84 +travel_compensate_overlapping_walls_enabled = True +skin_no_small_gaps_heuristic = False +top_bottom_pattern = lines +infill_sparse_density = 22 +infill_overlap = 0.035 +infill_wipe_dist = 0.2 +retraction_amount = 5.5 +retraction_min_travel = 0.5 +retraction_count_max = 30 +retraction_extrusion_window = 6 +speed_infill = 50 +speed_wall_0 = 30 +speed_wall_x = 40 +speed_topbottom = 20 +speed_layer_0 = 25 +skirt_speed = 25 +speed_slowdown_layers = 2 +travel_avoid_distance = 1 +cool_fan_full_layer = 2 +cool_min_layer_time_fan_speed_max = 15 +adhesion_type = brim +brim_width = 8 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index a6240911b6..90fcf9e49c 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -5,34 +5,30 @@ machine_type = ultimaker2_olsson machine_variant = 0.4 mm [settings] -retraction_combing = All -shell_thickness = 1.05 -speed_print = 30 -speed_wall_0 = 30 -raft_interface_line_spacing = 3.0 -speed_layer_0 = 20 -layer_height_0 = 0.26 -retraction_hop = 0.0 -skirt_gap = 3.0 -retraction_speed = 40.0 -raft_surface_line_width = 0.4 -raft_base_line_width = 1.0 -raft_margin = 5.0 -adhesion_type = brim -skirt_minimal_length = 150.0 -brim_line_count = 22 -infill_before_walls = False -raft_surface_thickness = 0.27 -raft_airgap = 0.0 -infill_overlap = 15 -raft_interface_line_width = 0.4 -speed_topbottom = 20 -support_pattern = lines -speed_infill = 50 -skin_no_small_gaps_heuristic = False -magic_mesh_surface_mode = False -speed_wall_x = 40 machine_nozzle_size = 0.35 -raft_surface_line_spacing = 3.0 -support_enable = False - +layer_height = 0.1 +layer_height_0 = 0.26 +shell_thickness = 1.05 +top_bottom_thickness = 0.8 +travel_compensate_overlapping_walls_enabled = True +skin_no_small_gaps_heuristic = False +top_bottom_pattern = lines +infill_sparse_density = 20 +infill_overlap = 0.035 +infill_wipe_dist = 0.2 +retraction_amount = 5.5 +retraction_min_travel = 0.5 +retraction_count_max = 30 +retraction_extrusion_window = 6 +speed_infill = 50 +speed_wall_0 = 30 +speed_wall_x = 40 +speed_topbottom = 20 +speed_layer_0 = 25 +skirt_speed = 25 +speed_slowdown_layers = 2 +travel_avoid_distance = 1 +cool_fan_full_layer = 2 +cool_min_layer_time_fan_speed_max = 15 +adhesion_type = brim +brim_width = 8 diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile new file mode 100644 index 0000000000..0181bc0bdf --- /dev/null +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -0,0 +1,34 @@ +[general] +version = 1 +name = Ulti Quality +machine_type = ultimaker2_olsson +machine_variant = 0.4 mm + +[settings] +machine_nozzle_size = 0.35 +layer_height = 0.04 +layer_height_0 = 0.26 +shell_thickness = 1.4 +top_bottom_thickness = 1.12 +travel_compensate_overlapping_walls_enabled = True +skin_no_small_gaps_heuristic = False +top_bottom_pattern = lines +infill_sparse_density = 25 +infill_overlap = 0.035 +infill_wipe_dist = 0.2 +retraction_amount = 5.5 +retraction_min_travel = 0.5 +retraction_count_max = 30 +retraction_extrusion_window = 6 +speed_infill = 50 +speed_wall_0 = 30 +speed_wall_x = 40 +speed_topbottom = 20 +speed_layer_0 = 25 +skirt_speed = 25 +speed_slowdown_layers = 2 +travel_avoid_distance = 1 +cool_fan_full_layer = 2 +cool_min_layer_time_fan_speed_max = 15 +adhesion_type = brim +brim_width = 8 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index 6ced9ee38e..e52ae2c9b8 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -5,38 +5,30 @@ machine_type = ultimaker2_olsson machine_variant = 0.6 mm [settings] -retraction_combing = All -top_thickness = 1.2 -speed_layer_0 = 20 -speed_print = 25 -speed_wall_0 = 25 -raft_interface_line_spacing = 3.0 -shell_thickness = 1.59 -infill_overlap = 15 -retraction_hop = 0.0 -skin_no_small_gaps_heuristic = False -retraction_speed = 40.0 -raft_surface_line_width = 0.4 -raft_base_line_width = 1.0 -raft_margin = 5.0 -adhesion_type = brim -skirt_minimal_length = 150.0 -layer_height = 0.15 -brim_line_count = 15 -infill_before_walls = False -raft_surface_thickness = 0.27 -raft_airgap = 0.0 -skirt_gap = 3.0 -raft_interface_line_width = 0.4 -speed_topbottom = 20 -support_pattern = lines -layer_height_0 = 0.39 -top_bottom_thickness = 1.2 -speed_infill = 55 -magic_mesh_surface_mode = False -bottom_thickness = 1.2 -speed_wall_x = 40 machine_nozzle_size = 0.53 -raft_surface_line_spacing = 3.0 -support_enable = False - +layer_height = 0.15 +layer_height_0 = 0.4 +shell_thickness = 1.59 +top_bottom_thickness = 1.2 +travel_compensate_overlapping_walls_enabled = True +skin_no_small_gaps_heuristic = False +top_bottom_pattern = lines +infill_sparse_density = 20 +infill_overlap = 0.053 +infill_wipe_dist = 0.3 +retraction_amount = 6 +retraction_min_travel = 0.5 +retraction_count_max = 30 +retraction_extrusion_window = 6 +speed_infill = 55 +speed_wall_0 = 25 +speed_wall_x = 40 +speed_topbottom = 20 +speed_layer_0 = 25 +skirt_speed = 25 +speed_slowdown_layers = 2 +travel_avoid_distance = 1.2 +cool_fan_full_layer = 2 +cool_min_layer_time_fan_speed_max = 20 +adhesion_type = brim +brim_width = 7 diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index c9d5e0e2a5..bfc3ae8e34 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -5,38 +5,30 @@ machine_type = ultimaker2_olsson machine_variant = 0.8 mm [settings] -retraction_combing = All -top_thickness = 1.2 -speed_layer_0 = 20 -speed_print = 20 -speed_wall_0 = 25 -raft_interface_line_spacing = 3.0 -shell_thickness = 2.1 -infill_overlap = 15 -retraction_hop = 0.0 -skin_no_small_gaps_heuristic = False -retraction_speed = 40.0 -raft_surface_line_width = 0.4 -raft_base_line_width = 1.0 -raft_margin = 5.0 -adhesion_type = brim -skirt_minimal_length = 150.0 -layer_height = 0.2 -brim_line_count = 11 -infill_before_walls = False -raft_surface_thickness = 0.27 -raft_airgap = 0.0 -skirt_gap = 3.0 -raft_interface_line_width = 0.4 -speed_topbottom = 20 -support_pattern = lines -layer_height_0 = 0.5 -top_bottom_thickness = 1.2 -speed_infill = 40 -magic_mesh_surface_mode = False -bottom_thickness = 1.2 -speed_wall_x = 30 machine_nozzle_size = 0.7 -raft_surface_line_spacing = 3.0 -support_enable = False - +layer_height = 0.2 +layer_height_0 = 0.5 +shell_thickness = 2.1 +top_bottom_thickness = 1.6 +travel_compensate_overlapping_walls_enabled = True +skin_no_small_gaps_heuristic = False +top_bottom_pattern = lines +infill_sparse_density = 20 +infill_overlap = 0.07 +infill_wipe_dist = 0.4 +retraction_amount = 6 +retraction_min_travel = 0.5 +retraction_count_max = 30 +retraction_extrusion_window = 6 +speed_infill = 40 +speed_wall_0 = 20 +speed_wall_x = 30 +speed_topbottom = 20 +speed_layer_0 = 25 +skirt_speed = 25 +speed_slowdown_layers = 2 +travel_avoid_distance = 1.6 +cool_fan_full_layer = 2 +cool_min_layer_time_fan_speed_max = 25 +adhesion_type = brim +brim_width = 7 From 339ee12f90c54d8f396323762553066754b9c991 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 29 Feb 2016 13:57:40 +0100 Subject: [PATCH 2/4] Not being able to find firmware no longer blocks GUI Cura-440 --- plugins/USBPrinting/USBPrinterManager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/USBPrinting/USBPrinterManager.py b/plugins/USBPrinting/USBPrinterManager.py index 57499b9a47..3a2beab0c8 100644 --- a/plugins/USBPrinting/USBPrinterManager.py +++ b/plugins/USBPrinting/USBPrinterManager.py @@ -106,6 +106,7 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension): try: self._printer_connections[printer_connection].updateFirmware(Resources.getPath(CuraApplication.ResourceTypes.Firmware, self._getDefaultFirmwareName())) except FileNotFoundError: + self._printer_connections[printer_connection].setProgress(100, 100) Logger.log("w", "No firmware found for printer %s", printer_connection) continue From 636d6af2de16d20dbfde616526e0f6fef967692f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 29 Feb 2016 14:18:00 +0100 Subject: [PATCH 3/4] Removed reference to removed profile selection --- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 77bc97256f..85d631b82f 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -89,7 +89,6 @@ Item { Button { id: customise_settings_button; - anchors.right: profileSelection.right; height: UM.Theme.getSize("setting").height; visible: parseInt(UM.Preferences.getValue("cura/active_mode")) == 1 From 00dcf339c84116cedc43d3cf83634d426916d719 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 29 Feb 2016 15:11:13 +0100 Subject: [PATCH 4/4] Visibility of processing message is now correct when switching between views. CURA-971 --- plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py index 455091c4bb..25530c52c2 100644 --- a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py +++ b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py @@ -151,6 +151,7 @@ class ProcessSlicedObjectListJob(Job): if Application.getInstance().getController().getActiveView().getPluginId() == "LayerView": if not self._progress: self._progress = Message(catalog.i18nc("@info:status", "Processing Layers"), 0, False, 0) + if self._progress.getProgress() != 100: self._progress.show() else: if self._progress: