Merge branch 'main' into PP-475-PLA-method

Ultimaker · Jul 1, 2024 · 2a22a18 · 2a22a18
2 parents 2bf62d8 + c753675
commit 2a22a18
Show file tree

Hide file tree

Showing 77 changed files with 164 additions and 63 deletions.
diff --git a/printer-linter/src/printerlinter/linters/formulas.py b/printer-linter/src/printerlinter/linters/formulas.py
@@ -51,9 +51,17 @@ def __init__(self, file: Path, settings: dict) -> None:
  self._definition = {}
 
  def getCuraSettingList(self) -> list:
+ settings_list = []
+
  with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmprinter.def.json")) as data:
  json_data = json.load(data)
- return self.extractKeys(json_data)
+ settings_list += self.extractKeys(json_data)
+
+ with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmextruder.def.json")) as data:
+ json_data = json.load(data)
+ settings_list += self.extractKeys(json_data)
+
+ return settings_list
 
  def extractKeys(self, json_obj, parent_key=''):
  keys_with_value = []

diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
@@ -89,6 +89,9 @@
  },
  "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" },
  "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" },
+ "prime_tower_base_curve_magnitude": { "value": 2 },
+ "prime_tower_base_height": { "value": 6 },
+ "prime_tower_base_size": { "value": 10 },
  "raft_base_speed": { "value": "raft_speed" },
  "raft_base_thickness": { "value": "min(machine_nozzle_size * 0.75, 0.3)" },
  "raft_interface_fan_speed": { "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2" },
@@ -126,6 +129,7 @@
  "support_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" },
  "support_tower_maximum_supported_diameter": { "value": "support_tower_diameter" },
  "support_tower_roof_angle": { "value": "0 if support_interface_enable else 65" },
+ "support_use_towers": { "value": false },
  "support_wall_count": { "value": "1 if support_structure == 'tree' else 0" },
  "support_xy_distance_overhang": { "value": "0.2" },
  "support_z_distance": { "value": "0" },

diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-build_volume_temperature = 35
 jerk_print = 30
-material_bed_temperature = =default_material_bed_temperature + 5
-material_print_temperature = =default_material_print_temperature + 15
+material_print_temperature = =default_material_print_temperature + 10
 speed_print = 80
 wall_thickness = =line_width * 3
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg
@@ -0,0 +1,30 @@
+[general]
+definition = ultimaker_factor4
+name = Normal
+version = 4
+
+[metadata]
+material = generic_bam
+quality_type = fast
+setting_version = 23
+type = quality
+variant = AA 0.4
+weight = -1
+
+[values]
+_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
+_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+brim_replaces_support = False
+machine_nozzle_heat_up_speed = 1.56
+material_print_temperature = =default_material_print_temperature - 5
+prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
+skin_material_flow = =material_flow * 0.965
+speed_print = 60
+support_angle = 45
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_interface_density = =min(extruderValues('material_surface_energy'))
+support_interface_enable = True
+support_join_distance = 5
+support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
+
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg
@@ -0,0 +1,28 @@
+[general]
+definition = ultimaker_factor4
+name = Normal
+version = 4
+
+[metadata]
+material = generic_pva
+quality_type = fast
+setting_version = 23
+type = quality
+variant = BB 0.4
+weight = -1
+
+[values]
+_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
+_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
+_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+acceleration_support_bottom = 100
+acceleration_support_interface = 1500
+brim_replaces_support = False
+prime_tower_min_volume = 15
+skin_material_flow = =material_flow * 0.93
+speed_print = 50
+support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
+support_interface_offset = 1
+support_offset = 3
+support_z_distance = 0
+
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+initial_layer_line_width_factor = 150
+minimum_support_area = 4
 prime_tower_min_volume = 15
 skin_material_flow = =material_flow * 0.93
 speed_print = 50

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+initial_layer_line_width_factor = 150
+minimum_support_area = 4
 prime_tower_min_volume = 15
 skin_material_flow = =material_flow * 0.93
 speed_print = 50

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+initial_layer_line_width_factor = 150
+minimum_support_area = 4
 prime_tower_min_volume = 15
 skin_material_flow = =material_flow * 0.93
 speed_print = 40

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+initial_layer_line_width_factor = 150
+minimum_support_area = 4
 prime_tower_min_volume = 15
 skin_material_flow = =material_flow * 0.93
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+initial_layer_line_width_factor = 150
+minimum_support_area = 4
 prime_tower_min_volume = 15
 skin_material_flow = =material_flow * 0.93
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+initial_layer_line_width_factor = 150
+minimum_support_area = 4
 prime_tower_min_volume = 15
 skin_material_flow = =material_flow * 0.93
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg
@@ -41,7 +41,6 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 optimize_wall_printing_order = False
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_amount = 6.5
 retraction_prime_speed = =retraction_speed

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg
@@ -15,7 +15,6 @@ weight = 1
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature - 5
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
 speed_print = 50

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg
@@ -14,7 +14,6 @@ weight = -1
 [values]
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
 speed_print = 70

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg
@@ -14,7 +14,6 @@ weight = 0
 [values]
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
 support_bottom_distance = =support_z_distance

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg
@@ -18,7 +18,6 @@ infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 5
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
 speed_topbottom = =math.ceil(speed_print * 40 / 70)

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg
@@ -22,7 +22,6 @@ infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 10
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
 speed_print = 50

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg
@@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
 optimize_wall_printing_order = False
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_amount = 6.5
 retraction_prime_speed = =retraction_speed

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg
@@ -43,7 +43,6 @@ material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_amount = 6.5
 retraction_prime_speed = =retraction_speed

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg
@@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
 optimize_wall_printing_order = False
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_amount = 6.5
 retraction_prime_speed = =retraction_speed

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg
@@ -45,7 +45,6 @@ material_max_flowrate = 12
 material_print_temperature = =default_material_print_temperature + 5
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_amount = 6.5
 retraction_prime_speed = =retraction_speed

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg
@@ -44,7 +44,6 @@ material_max_flowrate = 12
 material_print_temperature = =default_material_print_temperature + 10
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
-prime_tower_enable = False
 raft_airgap = 0.25
 retraction_amount = 6.5
 retraction_prime_speed = =retraction_speed

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg
@@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 10
-prime_tower_enable = True
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg
@@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 10
-prime_tower_enable = True
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg
@@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 15
-prime_tower_enable = True
 speed_infill = =math.ceil(speed_print * 35 / 45)
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg
@@ -47,7 +47,6 @@ material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 10
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
-prime_tower_enable = True
 raft_airgap = 0.25
 retraction_amount = 4
 retraction_prime_speed = 22

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg
@@ -44,7 +44,6 @@ material_flow = 93
 material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 10
 optimize_wall_printing_order = False
-prime_tower_enable = True
 raft_airgap = 0.25
 retraction_amount = 4
 retraction_prime_speed = 22

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg
@@ -44,7 +44,6 @@ material_flow = 93
 material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 15
 optimize_wall_printing_order = False
-prime_tower_enable = True
 raft_airgap = 0.25
 retraction_amount = 4
 retraction_prime_speed = 22

diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg
@@ -12,12 +12,16 @@ variant = BB 0.4
 weight = 1
 
 [values]
+acceleration_prime_tower = 1500
 brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
+initial_layer_line_width_factor = 150
 material_print_temperature = =default_material_print_temperature - 5
-prime_tower_enable = False
+minimum_support_area = 4
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
+speed_prime_tower = 25
+speed_support = 50
 support_infill_sparse_thickness = =3 * layer_height
 support_interface_enable = True
 
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg
@@ -12,11 +12,15 @@ variant = BB 0.4
 weight = -1
 
 [values]
+acceleration_prime_tower = 1500
 brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
-prime_tower_enable = False
+initial_layer_line_width_factor = 150
+minimum_support_area = 4
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
+speed_prime_tower = 25
+speed_support = 50
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_enable = True
 
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg
@@ -12,12 +12,16 @@ variant = BB 0.4
 weight = 0
 
 [values]
+acceleration_prime_tower = 1500
 brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
+initial_layer_line_width_factor = 150
 material_print_temperature = =default_material_print_temperature - 5
-prime_tower_enable = False
+minimum_support_area = 4
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
+speed_prime_tower = 25
+speed_support = 50
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_enable = True
 
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg
@@ -12,11 +12,15 @@ variant = BB 0.4
 weight = -2
 
 [values]
+acceleration_prime_tower = 1500
 brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
+initial_layer_line_width_factor = 150
 material_print_temperature = =default_material_print_temperature + 5
-prime_tower_enable = False
+minimum_support_area = 4
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
+speed_prime_tower = 25
+speed_support = 50
 support_interface_enable = True
 
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg
@@ -13,11 +13,16 @@ variant = BB 0.4
 weight = -3
 
 [values]
+acceleration_prime_tower = 1500
 brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
+initial_layer_line_width_factor = 150
 material_print_temperature = =default_material_print_temperature - 5
+minimum_support_area = 4
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
+speed_prime_tower = 25
+speed_support = 50
 support_infill_sparse_thickness = 0.3
 support_interface_enable = True