Browse Source

Corrected formulas based on comments Jaime.

PP-502
Paul Kuiper 8 months ago
parent
commit
41b81730a0

+ 1 - 1
resources/definitions/ultimaker_method.def.json

@@ -97,7 +97,7 @@
     },
     "overrides":
     {
-        "build_volume_temperature": { "maximum_value_warning": "67" },
+        "build_volume_temperature": { "maximum_value": "67" },
         "machine_depth": { "default_value": 236.48 },
         "machine_disallowed_areas":
         {

+ 12 - 13
resources/definitions/ultimaker_method_base.def.json

@@ -354,7 +354,6 @@
         "raft_smoothing": { "value": 9.5 },
         "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" },
         "raft_surface_fan_speed": { "value": 0 },
-        "raft_surface_wall_count": { "value": "raft_wall_count" },
         "raft_wall_count": { "value": 2 },
         "retract_at_layer_change": { "value": true },
         "retraction_amount": { "value": 0.75 },
@@ -365,7 +364,7 @@
         "retraction_hop": { "value": 0.4 },
         "retraction_hop_enabled": { "value": true },
         "retraction_hop_only_when_collides": { "value": false },
-        "retraction_min_travel": { "value": "0.6 if extruder_nr == support_extruder_nr else 5" },
+        "retraction_min_travel": { "value": "0.6 if material_is_support_material else 5" },
         "retraction_prime_speed": { "value": "retraction_speed" },
         "retraction_speed": { "value": 5 },
         "roofing_layer_count": { "value": 2 },
@@ -392,34 +391,34 @@
         "speed_wall_0": { "value": "speed_wall * 30/40" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": 40 },
-        "support_bottom_distance": { "value": "layer_height if extruder_nr == support_extruder_nr else support_z_distance" },
-        "support_bottom_enable": { "value": "extruder_nr != support_extruder_nr" },
+        "support_bottom_distance": { "value": "layer_height if material_is_support_material else support_z_distance" },
+        "support_bottom_enable": { "value": "not(material_is_support_material)" },
         "support_bottom_height": { "value": "2*support_infill_sparse_thickness" },
         "support_bottom_material_flow": { "value": "material_flow" },
-        "support_bottom_wall_count": { "value": "0 if extruder_nr == support_extruder_nr else support_wall_count" },
+        "support_bottom_wall_count": { "value": "0 if material_is_support_material else support_wall_count" },
         "support_brim_enable": { "value": false },
         "support_conical_min_width": { "value": 10 },
         "support_enable": { "value": true },
         "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" },
-        "support_fan_enable": { "value": "extruder_nr == support_extruder_nr" },
+        "support_fan_enable": { "value": "material_is_support_material" },
         "support_infill_rate": { "value": 20.0 },
         "support_infill_sparse_thickness": { "value": "layer_height" },
         "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "4*support_infill_sparse_thickness" },
         "support_interface_material_flow": { "value": "material_flow" },
-        "support_interface_offset": { "value": "1 if extruder_nr == support_extruder_nr else 0.8" },
+        "support_interface_offset": { "value": "1 if material_is_support_material else 0.8" },
         "support_interface_pattern": { "value": "'lines'" },
-        "support_interface_wall_count": { "value": "1 if extruder_nr == support_extruder_nr else 2" },
+        "support_interface_wall_count": { "value": "1 if material_is_support_material else 2" },
         "support_material_flow": { "value": "material_flow" },
-        "support_offset": { "value": "1.8 if extruder_nr == support_extruder_nr else 0.8" },
+        "support_offset": { "value": "1.8 if material_is_support_material else 0.8" },
         "support_pattern": { "value": "'lines'" },
-        "support_roof_height": { "value": "4*layer_height if extruder_nr == support_extruder_nr else 5*layer_height" },
+        "support_roof_height": { "value": "4*layer_height if material_is_support_material else 5*layer_height" },
         "support_roof_material_flow": { "value": "material_flow" },
         "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" },
-        "support_top_distance": { "value": "0.25 if extruder_nr == support_extruder_nr else support_z_distance" },
+        "support_top_distance": { "value": "0.25 if material_is_support_material else support_z_distance" },
         "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" },
-        "support_xy_distance": { "value": "0.3 if extruder_nr == support_extruder_nr else 0.2" },
-        "support_xy_distance_overhang": { "value": "0.3 if extruder_nr == support_extruder_nr else 0.2" },
+        "support_xy_distance": { "value": "0.3 if material_is_support_material else 0.2" },
+        "support_xy_distance_overhang": { "value": "support_xy_distance" },
         "switch_extruder_retraction_amount": { "value": 0.5 },
         "switch_extruder_retraction_speeds": { "value": "retraction_speed" },
         "top_bottom_thickness": { "value": "5*layer_height" },

+ 1 - 1
resources/definitions/ultimaker_methodx.def.json

@@ -71,7 +71,7 @@
     },
     "overrides":
     {
-        "build_volume_temperature": { "maximum_value_warning": "107" },
+        "build_volume_temperature": { "maximum_value": "107" },
         "machine_depth": { "default_value": 236.48 },
         "machine_disallowed_areas":
         {

+ 1 - 1
resources/definitions/ultimaker_methodxl.def.json

@@ -27,7 +27,7 @@
     },
     "overrides":
     {
-        "build_volume_temperature": { "maximum_value_warning": "100" },
+        "build_volume_temperature": { "maximum_value": "100" },
         "machine_depth": { "default_value": 320 },
         "machine_disallowed_areas":
         {

+ 2 - 3
resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg

@@ -27,8 +27,8 @@ material_print_temperature_layer_0 = 225
 min_bead_width = =line_width * 0.75
 min_wall_line_width = =line_width * 0.75
 raft_airgap = 0.18
-raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8
-raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4
+raft_base_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8
+raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4
 raft_base_speed = 15
 raft_base_thickness = 0.6
 raft_interface_infill_overlap = 25
@@ -61,7 +61,6 @@ support_line_width = =line_width * 0.75
 support_material_flow = =material_flow * 0.8
 support_offset = 3
 support_roof_density = =support_interface_density
-support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.3
 support_xy_overrides_z = xy_overrides_z

+ 1 - 2
resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg

@@ -35,8 +35,7 @@ support_bottom_line_width = 0.6
 support_bottom_stair_step_height = 0
 support_infill_rate = 12.0
 support_line_width = =line_width * 0.75
-support_roof_density = =85 if extruder_nr == support_extruder_nr else 97
-support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
+support_roof_density = 85
 support_use_towers = True
 support_z_distance = 0.25
 

+ 2 - 3
resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg

@@ -27,8 +27,8 @@ material_print_temperature_layer_0 = 225
 min_bead_width = =line_width * 0.75
 min_wall_line_width = =line_width * 0.75
 raft_airgap = 0.18
-raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8
-raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4
+raft_base_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8
+raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4
 raft_base_speed = 15
 raft_base_thickness = 0.6
 raft_interface_infill_overlap = 25
@@ -61,7 +61,6 @@ support_line_width = =line_width * 0.75
 support_material_flow = =material_flow * 0.8
 support_offset = 3
 support_roof_density = =support_interface_density
-support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.3
 support_xy_overrides_z = xy_overrides_z

+ 1 - 0
resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg

@@ -57,6 +57,7 @@ support_infill_rate = 12
 support_pattern = grid
 support_roof_density = 95
 support_roof_height = =layer_height*8
+support_roof_line_width = 0.25
 support_xy_distance = 0.2
 switch_extruder_extra_prime_amount = 1
 switch_extruder_retraction_amount = 2.5

+ 1 - 2
resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg

@@ -35,8 +35,7 @@ support_bottom_line_width = 0.6
 support_bottom_stair_step_height = 0
 support_infill_rate = 12.0
 support_line_width = =line_width * 0.75
-support_roof_density = =85 if extruder_nr == support_extruder_nr else 97
-support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
+support_roof_density = 85
 support_use_towers = True
 support_z_distance = 0.25
 

+ 2 - 3
resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg

@@ -27,8 +27,8 @@ material_print_temperature_layer_0 = 225
 min_bead_width = =line_width * 0.75
 min_wall_line_width = =line_width * 0.75
 raft_airgap = 0.18
-raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8
-raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4
+raft_base_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8
+raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4
 raft_base_speed = 15
 raft_base_thickness = 0.6
 raft_interface_infill_overlap = 25
@@ -61,7 +61,6 @@ support_line_width = =line_width * 0.75
 support_material_flow = =material_flow * 0.8
 support_offset = 3
 support_roof_density = =support_interface_density
-support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.3
 support_xy_overrides_z = xy_overrides_z

Some files were not shown because too many files changed in this diff