Merge branch 'main' of https://github.com/eMotion-Tech/Cura

resources/definitions/elegoo_base.def.json

@@ -114,11 +114,7 @@
         "support_angle": { "value": "45 if speed_print > 99.9 else 50" },
         "support_bottom_offset": { "value": "-0.4" },
         "support_brim_enable": { "value": "support_structure == 'normal' or support_structure == 'tree'" },
-        "support_brim_width":
+        "support_brim_width": { "value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 " },
-        {
-            "default_value": 3,
-            "value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 "
-        },
         "support_infill_angles": { "default_value": "[65]" },
         "support_interface_density": { "default_value": 33.333 },
         "support_interface_pattern": { "default_value": "lines" },

resources/definitions/fdmprinter.def.json

@@ -4853,8 +4853,7 @@
                     "label": "Enable Support Brim",
                     "description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.",
                     "type": "bool",
-                    "default_value": false,
+                    "default_value": true,
-                    "value": "support_structure == 'tree'",
                     "enabled": "support_enable or support_meshes_present",
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": false,
@@ -4866,9 +4865,10 @@
                     "description": "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material.",
                     "type": "float",
                     "unit": "mm",
-                    "default_value": 8.0,
+                    "default_value": 1.2,
                     "minimum_value": "0.0",
                     "maximum_value_warning": "50.0",
+                    "value": "(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3",
                     "enabled": "(support_enable or support_meshes_present) and support_brim_enable",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
@@ -4880,10 +4880,10 @@
                             "label": "Support Brim Line Count",
                             "description": "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material.",
                             "type": "int",
-                            "default_value": 20,
+                            "default_value": 3,
                             "minimum_value": "0",
                             "maximum_value_warning": "50 / skirt_brim_line_width",
-                            "value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
+                            "value": "round(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
                             "enabled": "(support_enable or support_meshes_present) and support_brim_enable",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true,

resources/definitions/mixware_hyper_s.def.json

@@ -118,7 +118,7 @@
         "speed_z_hop": { "default_value": 5 },
         "support_angle": { "default_value": 60 },
         "support_bottom_stair_step_height": { "value": 0.2 },
-        "support_brim_width": { "default_value": 4 },
+        "support_brim_enable": { "value": false },
         "support_enable": { "default_value": true },
         "support_interface_density": { "default_value": 80 },
         "support_interface_enable": { "default_value": true },

resources/definitions/ultimaker.def.json

@@ -69,10 +69,16 @@
         "machine_max_feedrate_e": { "default_value": 45 },
         "material_bed_temperature":
         {
-            "maximum_value_warning": "125",
+            "maximum_value": "140",
+            "maximum_value_warning": "120",
+            "minimum_value": "0"
+        },
+        "material_bed_temperature_layer_0":
+        {
+            "maximum_value": "140",
+            "maximum_value_warning": "120",
             "minimum_value": "0"
         },
-        "material_bed_temperature_layer_0": { "maximum_value_warning": "125" },
         "material_print_temperature": { "minimum_value": "0" },
         "material_standby_temperature":
         {

resources/definitions/ultimaker2.def.json

@@ -100,6 +100,8 @@
         "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": true },
         "machine_width": { "default_value": 223 },
+        "material_bed_temperature": { "maximum_value": "110" },
+        "material_bed_temperature_layer_0": { "maximum_value": "110" },
         "speed_slowdown_layers": { "value": 2 },
         "support_z_distance": { "value": "0.1" }
     }

resources/definitions/ultimaker2_plus_connect.def.json

@@ -99,8 +99,11 @@
         "machine_show_variants": { "default_value": true },
         "machine_start_gcode": { "value": "''" },
         "machine_width": { "default_value": 223 },
-        "material_bed_temperature": { "maximum_value": 110 },
+        "material_initial_print_temperature":
-        "material_bed_temperature_layer_0": { "maximum_value": 110 },
+        {
+            "maximum_value": 260,
+            "value": "material_print_temperature"
+        },
         "material_print_temperature": { "maximum_value": 260 },
         "material_print_temperature_layer_0": { "maximum_value": 260 },
         "meshfix_maximum_deviation": { "value": "(layer_height / 3) if magic_spiralize else (layer_height / 4)" },

resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg

@@ -23,7 +23,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True
 support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height

resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg

@@ -22,7 +22,6 @@ speed_wall = =math.ceil(speed_print * 40 / 80)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_infill_sparse_thickness = =2*layer_height
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True

resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg

@@ -19,7 +19,6 @@ prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_overlap = 10
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_infill_sparse_thickness = =2*layer_height
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True

resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg

@@ -19,6 +19,5 @@ prime_tower_enable = False
 retraction_count_max = 5
 skin_overlap = 20
 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg

@@ -19,7 +19,6 @@ prime_tower_enable = False
 retraction_count_max = 5
 skin_overlap = 15
 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =2*layer_height
 support_interface_enable = True
 

resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg

@@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 prime_tower_enable = False
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =3*layer_height
 support_interface_enable = True
 

resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg

@@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 prime_tower_enable = False
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =2*layer_height
 support_interface_enable = True
 

resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg

@@ -17,6 +17,5 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 material_print_temperature = =default_material_print_temperature + 5
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg

@@ -16,6 +16,5 @@ brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg

@@ -16,6 +16,5 @@ brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg

@@ -22,7 +22,6 @@ speed_wall = =math.ceil(speed_print * 40 / 80)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True

resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg

@@ -19,7 +19,6 @@ prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_overlap = 10
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True

resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg

@@ -23,7 +23,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True
 support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height

resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg

@@ -24,7 +24,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
 support_angle = 45
 support_bottom_distance = 0.3
-support_brim_enable = True
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True
 support_top_distance = 0.3

resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg

@@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 prime_tower_enable = False
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =3 * layer_height
 support_interface_enable = True
 

resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg

@@ -19,7 +19,6 @@ prime_tower_enable = False
 retraction_count_max = 5
 skin_overlap = 15
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_enable = True
 

resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg

@@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 prime_tower_enable = False
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_enable = True
 

resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg

@@ -19,6 +19,5 @@ prime_tower_enable = False
 retraction_count_max = 5
 skin_overlap = 20
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg

@@ -17,7 +17,6 @@ brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_enable = True
 

resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg

@@ -17,6 +17,5 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 material_print_temperature = =default_material_print_temperature + 5
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg

@@ -16,7 +16,6 @@ brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_enable = True
 

resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg

@@ -16,6 +16,5 @@ brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg

@@ -22,7 +22,6 @@ speed_wall = =math.ceil(speed_print * 40 / 80)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True

resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg

@@ -19,7 +19,6 @@ prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_overlap = 10
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True

resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg

@@ -23,7 +23,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True
 support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height

resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg

@@ -24,7 +24,6 @@ speed_wall = =math.ceil(speed_print * 50 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
 support_angle = 45
 support_bottom_distance = 0.3
-support_brim_enable = True
 support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True
 support_top_distance = 0.3

resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg

@@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 prime_tower_enable = False
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =3 * layer_height
 support_interface_enable = True
 

resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg

@@ -19,7 +19,6 @@ prime_tower_enable = False
 retraction_count_max = 5
 skin_overlap = 15
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_enable = True
 

resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg

@@ -17,7 +17,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 prime_tower_enable = False
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = =2 * layer_height
 support_interface_enable = True
 

resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg

@@ -19,6 +19,5 @@ prime_tower_enable = False
 retraction_count_max = 5
 skin_overlap = 20
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg

@@ -18,7 +18,6 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 prime_tower_enable = False
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_enable = True
 

resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg

@@ -17,6 +17,5 @@ cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extru
 material_print_temperature = =default_material_print_temperature + 5
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_interface_enable = True
 

resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg

@@ -16,7 +16,6 @@ brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_enable = True
 

resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg

@@ -16,6 +16,5 @@ brim_replaces_support = False
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
-support_brim_enable = True
 support_interface_enable = True