From dbd25d1d539abd067bad2aaa0556dac860e836df Mon Sep 17 00:00:00 2001 From: THeijmans Date: Tue, 20 Mar 2018 15:59:25 +0100 Subject: [PATCH 1/5] PVA prime tower update Updated PVA prime towers for more reliability --- resources/variants/ultimaker3_bb0.8.inst.cfg | 5 ++++- resources/variants/ultimaker3_bb04.inst.cfg | 5 ++++- resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 5 ++++- resources/variants/ultimaker3_extended_bb04.inst.cfg | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 828e3f35fe..ac29010cb0 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -10,6 +10,7 @@ hardware_type = nozzle [values] acceleration_enabled = True +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) acceleration_print = 4000 acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) @@ -39,7 +40,8 @@ material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False -prime_tower_purge_volume = 1 +prime_tower_purge_volume = 2 +prime_tower_wall_thickness = 2.2 prime_tower_wipe_enabled = True raft_acceleration = =acceleration_layer_0 raft_airgap = 0 @@ -62,6 +64,7 @@ retraction_min_travel = =line_width * 3 retraction_prime_speed = 15 skin_overlap = 5 speed_layer_0 = 20 +speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) speed_support_interface = =math.ceil(speed_support * 20 / 25) diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 91e70f9f98..0854a56a6e 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -9,6 +9,7 @@ type = variant hardware_type = nozzle [values] +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) @@ -21,7 +22,8 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 -prime_tower_purge_volume = 1 +prime_tower_purge_volume = 2 +prime_tower_wall_thickness = 1.5 raft_base_speed = 20 raft_interface_speed = 20 raft_speed = 25 @@ -30,6 +32,7 @@ retraction_count_max = 20 retraction_extrusion_window = =retraction_amount retraction_min_travel = =3 * line_width speed_layer_0 = 20 +speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 541034f119..eaa06f6a66 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -10,6 +10,7 @@ hardware_type = nozzle [values] acceleration_enabled = True +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) acceleration_print = 4000 acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) @@ -39,7 +40,8 @@ material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False -prime_tower_purge_volume = 1 +prime_tower_purge_volume = 2 +prime_tower_wall_thickness = 2.2 prime_tower_wipe_enabled = True raft_acceleration = =acceleration_layer_0 raft_airgap = 0 @@ -61,6 +63,7 @@ retraction_min_travel = =line_width * 3 retraction_prime_speed = 15 skin_overlap = 5 speed_layer_0 = 20 +speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) speed_support_interface = =math.ceil(speed_support * 20 / 25) diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index 5b35351312..18b71b154d 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -9,6 +9,7 @@ type = variant hardware_type = nozzle [values] +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) @@ -21,7 +22,8 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 -prime_tower_purge_volume = 1 +prime_tower_purge_volume = 2 +prime_tower_wall_thickness = 1.5 raft_base_speed = 20 raft_interface_speed = 20 raft_speed = 25 @@ -30,6 +32,7 @@ retraction_count_max = 20 retraction_extrusion_window = =retraction_amount retraction_min_travel = =3 * line_width speed_layer_0 = 20 +speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) From 5deaf731472bbddde2ad6d3654d23e4137fc3cf4 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Tue, 20 Mar 2018 16:01:47 +0100 Subject: [PATCH 2/5] CPE prime tower update Small purge to increase stability of CPE prime towers. --- .../quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg | 1 + resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg | 1 + resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg | 1 + .../quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg | 1 + .../quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg | 1 + .../quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg | 1 + 8 files changed, 8 insertions(+) diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg index 83e77eb117..278d681863 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_cpe variant = AA 0.25 [values] +prime_tower_purge_volume = 1 prime_tower_size = 12 prime_tower_wall_thickness = 0.9 retraction_extrusion_window = 0.5 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg index 9a85ab9b3e..c6fa46f82d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg @@ -16,6 +16,7 @@ material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 +prime_tower_purge_volume = 1 skin_overlap = 20 speed_print = 60 speed_layer_0 = 20 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg index 7099062daf..3c4439c598 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg @@ -17,6 +17,7 @@ material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 +prime_tower_purge_volume = 1 speed_print = 60 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg index 00adfcc2d7..84ee673caa 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg @@ -19,6 +19,7 @@ material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 +prime_tower_purge_volume = 1 speed_print = 50 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg index 590eddf43b..fc1cf4a3dc 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -17,6 +17,7 @@ machine_nozzle_heat_up_speed = 1.5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 +prime_tower_purge_volume = 1 speed_print = 55 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg index fd138ae2f2..b4f4a0f102 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg @@ -17,6 +17,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = 100 prime_tower_enable = True +prime_tower_purge_volume = 1 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg index feba0b3160..d8fdf49451 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -18,6 +18,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 prime_tower_enable = True +prime_tower_purge_volume = 1 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg index 1d9537097e..8cd56b1541 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -18,6 +18,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 17 material_standby_temperature = 100 prime_tower_enable = True +prime_tower_purge_volume = 1 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) From 5bdba905ff18e07ca8ef00c81d656b2b3e81b5b4 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Tue, 20 Mar 2018 16:07:38 +0100 Subject: [PATCH 3/5] Changed warning value prime tower purge Increased the value after tests show 1mm3+ primes don't lead to issues. --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6d4688bb52..f3b14d34e8 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4908,7 +4908,7 @@ "unit": "mm³", "default_value": 0, "minimum_value": "0", - "maximum_value_warning": "1", + "maximum_value_warning": "2.5", "settable_per_mesh": false, "settable_per_extruder": true }, From 2ebf6e8d511a545d8b22ca778734bf796f9f0979 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 17 Apr 2018 13:07:15 +0200 Subject: [PATCH 4/5] CURA-5232 Renaming variable since it was on conflict with a new variable introduced in 4cabcb3632fe7a2c987e70197767a6a4bf88349b --- plugins/ChangeLogPlugin/ChangeLog.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.py b/plugins/ChangeLogPlugin/ChangeLog.py index c31d1337ef..030d854d3f 100644 --- a/plugins/ChangeLogPlugin/ChangeLog.py +++ b/plugins/ChangeLogPlugin/ChangeLog.py @@ -23,9 +23,9 @@ class ChangeLog(Extension, QObject,): self._changelog_context = None version_string = Application.getInstance().getVersion() if version_string is not "master": - self._version = Version(version_string) + self._current_app_version = Version(version_string) else: - self._version = None + self._current_app_version = None self._change_logs = None Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated) @@ -76,7 +76,7 @@ class ChangeLog(Extension, QObject,): self._change_logs[open_version][open_header].append(line) def _onEngineCreated(self): - if not self._version: + if not self._current_app_version: return #We're on dev branch. if Preferences.getInstance().getValue("general/latest_version_changelog_shown") == "master": @@ -91,7 +91,7 @@ class ChangeLog(Extension, QObject,): if not Application.getInstance().getGlobalContainerStack(): return - if self._version > latest_version_shown: + if self._current_app_version > latest_version_shown: self.showChangelog() def showChangelog(self): From 94cad851a49600b885ef6ed1b612cf97f4adc8a7 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 12 Apr 2018 11:00:43 +0200 Subject: [PATCH 5/5] Use the correct filament diameter to calculate line width in the gcode parser. --- plugins/GCodeReader/FlavorParser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index b8af673cd4..8e7756ac3b 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -41,11 +41,11 @@ class FlavorParser: self._is_layers_in_file = False # Does the Gcode have the layers comment? self._extruder_offsets = {} # Offsets for multi extruders. key is index, value is [x-offset, y-offset] self._current_layer_thickness = 0.2 # default + self._filament_diameter = 2.85 # default Preferences.getInstance().addPreference("gcodereader/show_caution", True) def _clearValues(self): - self._filament_diameter = 2.85 self._extruder_number = 0 self._extrusion_length_offset = [0] self._layer_type = LayerPolygon.Inset0Type @@ -289,8 +289,9 @@ class FlavorParser: def processGCodeStream(self, stream): Logger.log("d", "Preparing to load GCode") self._cancelled = False - # We obtain the filament diameter from the selected printer to calculate line widths - self._filament_diameter = Application.getInstance().getGlobalContainerStack().getProperty("material_diameter", "value") + # We obtain the filament diameter from the selected extruder to calculate line widths + global_stack = Application.getInstance().getGlobalContainerStack() + self._filament_diameter = global_stack.extruders[str(self._extruder_number)].getProperty("material_diameter", "value") scene_node = CuraSceneNode() # Override getBoundingBox function of the sceneNode, as this node should return a bounding box, but there is no @@ -312,7 +313,6 @@ class FlavorParser: gcode_list.append(line + "\n") if not self._is_layers_in_file and line[:len(self._layer_keyword)] == self._layer_keyword: self._is_layers_in_file = True - # stream.seek(0) file_step = max(math.floor(file_lines / 100), 1)