GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-16 10:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.10'

Browse Source
This commit is contained in:
Erwan MATHIEU 2025-04-14 08:51:58 +02:00
commit a5e1bee334
35 changed files with 561 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
resources/definitions/ultimaker_s6.def.json Normal file
View File

@ -0,0 +1,53 @@
{
"version": 2,
"name": "UltiMaker S6",
"inherits": "ultimaker_s8",
"metadata":
{
"visible": true,
"author": "UltiMaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker_s5_platform.obj",
"bom_numbers": [
10700
],
"firmware_update_info":
{
"check_urls": [ "https://software.ultimaker.com/releases/firmware/5078167/stable/um-update.swu.version" ],
"id": 5078167,
"update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update"
},
"first_start_actions": [ "DiscoverUM3Action" ],
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains":
{
"0": "ultimaker_s6_extruder_left",
"1": "ultimaker_s6_extruder_right"
},
"nozzle_offsetting_for_disallowed_areas": false,
"platform_offset": [
0,
-30,
-10
],
"platform_texture": "UltimakerS6backplate.png",
"preferred_material": "ultimaker_pla_blue",
"preferred_variant_name": "AA+ 0.4",
"quality_definition": "ultimaker_s8",
"supported_actions": [ "DiscoverUM3Action" ],
"supports_material_export": true,
"supports_network_connection": true,
"supports_usb_connection": false,
"variants_name": "Print Core",
"variants_name_has_translation": true,
"weight": -2
},
"overrides":
{
"adhesion_type": { "value": "'brim'" },
"machine_name": { "default_value": "UltiMaker S6" }
}
}

2
resources/definitions/ultimaker_s7.def.json
View File

@ -47,7 +47,7 @@
"overrides":
{
"default_material_print_temperature": { "maximum_value_warning": "320" },
"machine_name": { "default_value": "Ultimaker S7" },
"machine_name": { "default_value": "UltiMaker S7" },
"material_print_temperature_layer_0": { "maximum_value_warning": "320" }
}
}

4
resources/definitions/ultimaker_s8.def.json
View File

@ -385,7 +385,7 @@
"unit": "m/s\u00b3",
"value": "20000 if machine_gcode_flavor == 'Cheetah' else 100"
},
"machine_name": { "default_value": "Ultimaker S8" },
"machine_name": { "default_value": "UltiMaker S8" },
"machine_nozzle_cool_down_speed": { "default_value": 1.3 },
"machine_nozzle_heat_up_speed": { "default_value": 0.6 },
"machine_start_gcode": { "default_value": "M213 U0.1 ;undercut 0.1mm" },
@ -412,7 +412,7 @@
"retraction_hop": { "value": 1 },
"retraction_hop_after_extruder_switch_height": { "value": 2 },
"retraction_hop_enabled": { "value": true },
"retraction_min_travel": { "value": "5 if support_enable and support_structure=='tree' else line_width * 2" },
"retraction_min_travel": { "value": "5 if support_enable and support_structure=='tree' else line_width * 2.5" },
"retraction_prime_speed": { "value": 15 },
"skin_edge_support_thickness": { "value": 0 },
"skin_material_flow": { "value": 95 },

31
resources/extruders/ultimaker_s6_extruder_left.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata":
{
"machine": "ultimaker_s6",
"position": "0"
},
"overrides":
{
"extruder_nr":
{
"default_value": 0,
"maximum_value": "1"
},
"extruder_prime_pos_x": { "default_value": -3 },
"extruder_prime_pos_y": { "default_value": 6 },
"extruder_prime_pos_z": { "default_value": 2 },
"machine_extruder_end_pos_abs": { "default_value": true },
"machine_extruder_end_pos_x": { "default_value": 330 },
"machine_extruder_end_pos_y": { "default_value": 237 },
"machine_extruder_start_code": { "value": "\"M214 D0 K{material_pressure_advance_factor} R0.04\"" },
"machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "default_value": 330 },
"machine_extruder_start_pos_y": { "default_value": 237 },
"machine_nozzle_head_distance": { "default_value": 2.7 },
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 }
}
}

31
resources/extruders/ultimaker_s6_extruder_right.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Extruder 2",
"inherits": "fdmextruder",
"metadata":
{
"machine": "ultimaker_s6",
"position": "1"
},
"overrides":
{
"extruder_nr":
{
"default_value": 1,
"maximum_value": "1"
},
"extruder_prime_pos_x": { "default_value": 333 },
"extruder_prime_pos_y": { "default_value": 6 },
"extruder_prime_pos_z": { "default_value": 2 },
"machine_extruder_end_pos_abs": { "default_value": true },
"machine_extruder_end_pos_x": { "default_value": 330 },
"machine_extruder_end_pos_y": { "default_value": 219 },
"machine_extruder_start_code": { "value": "\"M214 D0 K{material_pressure_advance_factor} R0.04\"" },
"machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "default_value": 330 },
"machine_extruder_start_pos_y": { "default_value": 219 },
"machine_nozzle_head_distance": { "default_value": 4.2 },
"machine_nozzle_offset_x": { "default_value": 22 },
"machine_nozzle_offset_y": { "default_value": 0 }
}
}

BIN
resources/images/UltimakerS6backplate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

18
resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
definition = ultimaker_s8
name = Accurate
version = 4
[metadata]
intent_category = engineering
material = generic_nylon-cf-slide
quality_type = draft
setting_version = 25
type = intent
variant = CC+ 0.6
[values]
infill_sparse_density = 20
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3

4
resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_nylon_0.2mm_engineering.inst.cfg → resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg
View File

@ -5,11 +5,11 @@ version = 4
[metadata]
intent_category = engineering
material = generic_nylon
material = generic_petcf
quality_type = draft
setting_version = 25
type = intent
variant = AA+ 0.4
variant = CC+ 0.6
[values]
infill_sparse_density = 20

1
resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm.inst.cfg
View File

@ -15,7 +15,6 @@ weight = -2
cool_min_layer_time = 4
cool_min_layer_time_fan_speed_max = 9
cool_min_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature + 5
retraction_prime_speed = 15
support_structure = tree

8
resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm.inst.cfg
View File

@ -13,8 +13,10 @@ weight = -2
[values]
infill_overlap = 20
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'gyroid'
speed_print = 100
speed_wall_0 = =speed_print
infill_pattern = lines
speed_print = 40
speed_wall = =speed_print
speed_wall_0 = =speed_wall
support_interface_enable = True
wall_thickness = =wall_line_width_0 + 2*wall_line_width_x

23
resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_abs_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,23 @@
[general]
definition = ultimaker_s8
name = Fast
version = 4
[metadata]
material = generic_abs
quality_type = draft
setting_version = 25
type = quality
variant = AA+ 0.6
weight = -2
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
cool_min_layer_time = 4
cool_min_layer_time_fan_speed_max = 9
cool_min_temperature = =material_print_temperature - 10
retraction_prime_speed = 15
support_interface_enable = False
support_structure = tree

25
resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_abs_0.3mm.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = ultimaker_s8
name = Extra Fast
version = 4
[metadata]
material = generic_abs
quality_type = verydraft
setting_version = 25
type = quality
variant = AA+ 0.6
weight = -3
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
cool_min_layer_time = 4
cool_min_layer_time_fan_speed_max = 9
cool_min_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature + 10
retraction_prime_speed = 15
support_interface_enable = False
support_structure = tree
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

20
resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_petg_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,20 @@
[general]
definition = ultimaker_s8
name = Fast
version = 4
[metadata]
material = generic_petg
quality_type = draft
setting_version = 25
type = quality
variant = AA+ 0.6
weight = -2
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
cool_min_layer_time = 4
material_print_temperature = =default_material_print_temperature + 5
support_interface_enable = False

21
resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_petg_0.3mm.inst.cfg Normal file
View File

@ -0,0 +1,21 @@
[general]
definition = ultimaker_s8
name = Extra Fast
version = 4
[metadata]
material = generic_petg
quality_type = verydraft
setting_version = 25
type = quality
variant = AA+ 0.6
weight = -3
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
cool_min_layer_time = 4
material_print_temperature = =default_material_print_temperature + 10
support_interface_enable = False
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

20
resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_pla_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,20 @@
[general]
definition = ultimaker_s8
name = Fast
version = 4
[metadata]
material = generic_pla
quality_type = draft
setting_version = 25
type = quality
variant = AA+ 0.6
weight = -2
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
retraction_prime_speed = =retraction_speed
support_interface_enable = False
support_structure = tree

22
resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_pla_0.3mm.inst.cfg Normal file
View File

@ -0,0 +1,22 @@
[general]
definition = ultimaker_s8
name = Extra Fast
version = 4
[metadata]
material = generic_pla
quality_type = verydraft
setting_version = 25
type = quality
variant = AA+ 0.6
weight = -3
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
material_print_temperature = =default_material_print_temperature + 20
retraction_prime_speed = =retraction_speed
support_interface_enable = False
support_structure = tree
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

20
resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_tough-pla_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,20 @@
[general]
definition = ultimaker_s8
name = Fast
version = 4
[metadata]
material = generic_tough_pla
quality_type = draft
setting_version = 25
type = quality
variant = AA+ 0.6
weight = -2
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
retraction_prime_speed = =retraction_speed
support_interface_enable = False
support_structure = tree

22
resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_tough-pla_0.3mm.inst.cfg Normal file
View File

@ -0,0 +1,22 @@
[general]
definition = ultimaker_s8
name = Extra Fast
version = 4
[metadata]
material = generic_tough_pla
quality_type = verydraft
setting_version = 25
type = quality
variant = AA+ 0.6
weight = -3
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
material_print_temperature = =default_material_print_temperature + 20
retraction_prime_speed = =retraction_speed
support_interface_enable = False
support_structure = tree
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

10
resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg
View File

@ -13,17 +13,23 @@ weight = -1
[values]
acceleration_prime_tower = 1500
acceleration_support = 1500
brim_replaces_support = False
build_volume_temperature = =70 if extruders_enabled_count > 1 else 35
cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
initial_layer_line_width_factor = 150
jerk_prime_tower = 4000
jerk_support = 4000
minimum_support_area = 4
retraction_amount = 6.5
retraction_count_max = 5
skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
speed_prime_tower = 25
speed_prime_tower = 50
speed_support = 50
support_angle = 45
speed_support_bottom = =2*speed_support_interface/5
speed_support_interface = 50
support_bottom_density = 70
support_infill_sparse_thickness = =2 * layer_height
support_interface_enable = True
support_z_distance = 0

10
resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg
View File

@ -13,18 +13,24 @@ weight = 0
[values]
acceleration_prime_tower = 1500
acceleration_support = 1500
brim_replaces_support = False
build_volume_temperature = =70 if extruders_enabled_count > 1 else 35
cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
initial_layer_line_width_factor = 150
jerk_prime_tower = 4000
jerk_support = 4000
material_print_temperature = =default_material_print_temperature - 5
minimum_support_area = 4
retraction_amount = 6.5
retraction_count_max = 5
skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
speed_prime_tower = 25
speed_prime_tower = 50
speed_support = 50
support_angle = 45
speed_support_bottom = =2*speed_support_interface/5
speed_support_interface = 50
support_bottom_density = 70
support_infill_sparse_thickness = =2 * layer_height
support_interface_enable = True
support_z_distance = 0

10
resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg
View File

@ -13,18 +13,24 @@ weight = -2
[values]
acceleration_prime_tower = 1500
acceleration_support = 1500
brim_replaces_support = False
build_volume_temperature = =70 if extruders_enabled_count > 1 else 35
cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
initial_layer_line_width_factor = 150
jerk_prime_tower = 4000
jerk_support = 4000
material_print_temperature = =default_material_print_temperature + 5
minimum_support_area = 4
retraction_amount = 6.5
retraction_count_max = 5
skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
speed_prime_tower = 25
speed_prime_tower = 50
speed_support = 50
support_angle = 45
speed_support_bottom = =2*speed_support_interface/5
speed_support_interface = 50
support_bottom_density = 70
support_interface_enable = True
support_z_distance = 0

10
resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg
View File

@ -13,18 +13,24 @@ weight = -3
[values]
acceleration_prime_tower = 1500
acceleration_support = 1500
brim_replaces_support = False
build_volume_temperature = =70 if extruders_enabled_count > 1 else 35
cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
initial_layer_line_width_factor = 150
jerk_prime_tower = 4000
jerk_support = 4000
material_print_temperature = =default_material_print_temperature - 5
minimum_support_area = 4
retraction_amount = 6.5
retraction_count_max = 5
skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width))
speed_prime_tower = 25
speed_prime_tower = 50
speed_support = 50
support_angle = 45
speed_support_bottom = =2*speed_support_interface/5
speed_support_interface = 50
support_bottom_density = 70
support_infill_sparse_thickness = 0.3
support_interface_enable = True
support_z_distance = 0

4
resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg
View File

@ -14,6 +14,8 @@ weight = -2
[values]
cool_min_layer_time = 6
cool_min_layer_time_fan_speed_max = 12
retraction_amount = 8
inset_direction = inside_out
material_flow = 95
retraction_prime_speed = 15
speed_wall_x = =speed_wall_0

17
resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s8
name = Fast
version = 4
[metadata]
material = generic_nylon-cf-slide
quality_type = draft
setting_version = 25
type = quality
variant = CC+ 0.6
weight = -2
[values]
cool_min_layer_time_fan_speed_max = 11
retraction_prime_speed = 15

17
resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.3mm.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s8
name = Extra Fast
version = 4
[metadata]
material = generic_nylon-cf-slide
quality_type = verydraft
setting_version = 25
type = quality
variant = CC+ 0.6
weight = -3
[values]
cool_min_layer_time_fan_speed_max = 11
retraction_prime_speed = 15

18
resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
definition = ultimaker_s8
name = Fast
version = 4
[metadata]
material = generic_petcf
quality_type = draft
setting_version = 25
type = quality
variant = CC+ 0.6
weight = -2
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
support_interface_enable = False

20
resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.3mm.inst.cfg Normal file
View File

@ -0,0 +1,20 @@
[general]
definition = ultimaker_s8
name = Extra Fast
version = 4
[metadata]
material = generic_petcf
quality_type = verydraft
setting_version = 25
type = quality
variant = CC+ 0.6
weight = -3
[values]
bridge_skin_material_flow = 200
bridge_wall_material_flow = 200
material_print_temperature = =default_material_print_temperature + 10
support_interface_enable = False
wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

17
resources/variants/ultimaker_s6_aa_plus04.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s6
name = AA+ 0.4
version = 4
[metadata]
hardware_type = nozzle
setting_version = 25
type = variant
[values]
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = AA+ 0.4
machine_nozzle_size = 0.4
machine_nozzle_tip_outer_diameter = 1.2
retraction_prime_speed = =retraction_speed

17
resources/variants/ultimaker_s6_aa_plus06.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s6
name = AA+ 0.6
version = 4
[metadata]
hardware_type = nozzle
setting_version = 25
type = variant
[values]
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = AA+ 0.6
machine_nozzle_size = 0.6
machine_nozzle_tip_outer_diameter = 1.2
retraction_prime_speed = =retraction_speed

19
resources/variants/ultimaker_s6_bb04.inst.cfg Normal file
View File

@ -0,0 +1,19 @@
[general]
definition = ultimaker_s6
name = BB 0.4
version = 4
[metadata]
hardware_type = nozzle
setting_version = 25
type = variant
[values]
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0
retraction_amount = 4.5
support_bottom_height = =layer_height * 2
support_interface_enable = True
switch_extruder_retraction_amount = 12

17
resources/variants/ultimaker_s6_cc_plus04.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s6
name = CC+ 0.4
version = 4
[metadata]
hardware_type = nozzle
setting_version = 25
type = variant
[values]
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC+ 0.4
machine_nozzle_size = 0.4
machine_nozzle_tip_outer_diameter = 1.2
retraction_prime_speed = =retraction_speed

17
resources/variants/ultimaker_s6_cc_plus06.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s6
name = CC+ 0.6
version = 4
[metadata]
hardware_type = nozzle
setting_version = 25
type = variant
[values]
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC+ 0.6
machine_nozzle_size = 0.6
machine_nozzle_tip_outer_diameter = 1.2
retraction_prime_speed = =retraction_speed

17
resources/variants/ultimaker_s6_dd04.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s6
name = DD 0.4
version = 4
[metadata]
hardware_type = nozzle
setting_version = 25
type = variant
[values]
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = DD 0.4
machine_nozzle_size = 0.4
machine_nozzle_tip_outer_diameter = 1.2
retraction_prime_speed = =retraction_speed

17
resources/variants/ultimaker_s8_aa_plus06.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s8
name = AA+ 0.6
version = 4
[metadata]
hardware_type = nozzle
setting_version = 25
type = variant
[values]
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = AA+ 0.6
machine_nozzle_size = 0.6
machine_nozzle_tip_outer_diameter = 1.2
retraction_prime_speed = =retraction_speed

17
resources/variants/ultimaker_s8_cc_plus06.inst.cfg Normal file
View File

@ -0,0 +1,17 @@
[general]
definition = ultimaker_s8
name = CC+ 0.6
version = 4
[metadata]
hardware_type = nozzle
setting_version = 25
type = variant
[values]
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC+ 0.6
machine_nozzle_size = 0.6
machine_nozzle_tip_outer_diameter = 1.2
retraction_prime_speed = =retraction_speed