3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' into PP-15-enable-skin-edge-support

Browse source
This commit is contained in:
Rijk van Manen 2022-06-02 17:01:29 +02:00 • committed by GitHub
commit a970e455d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
119 changed files with 257 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/definitions/SV02.def.json
View file

@ -44,7 +44,6 @@
"machine_max_jerk_xy": { "value": 8 },
"machine_max_jerk_z": { "value": 0.4 },
"machine_max_jerk_e": { "value": 5 },
"machine_heated_bed": { "default_value": true },
"material_diameter": { "default_value": 1.75 },
"infill_overlap": { "default_value": 15 },
"acceleration_print": { "value": 500 },

120
resources/definitions/ultimaker.def.json
View file

@ -50,9 +50,6 @@
"wall_thickness": {
"value": "wall_line_width_0 + wall_line_width_x"
},
"infill_before_walls": {
"value": "False"
},
"infill_material_flow": {
"value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow"
},
@ -60,13 +57,16 @@
"value": "'no_outer_surfaces'"
},
"roofing_layer_count": {
"value": "0"
"value": "1"
},
"roofing_material_flow": {
"value": "material_flow"
},
"skin_material_flow": {
"value": "0.97 * material_flow"
"value": "0.95 * material_flow"
},
"support_interface_material_flow": {
"value": "skin_material_flow"
},
"skin_monotonic" : {
"value": true
@ -89,14 +89,118 @@
"meshfix_maximum_deviation": {
"value": "machine_nozzle_size / 10"
},
"jerk_travel": {
"value": "jerk_print"
},
"acceleration_travel": {
"value": "acceleration_wall"
},
"skin_edge_support_thickness": {
"value": "4 * layer_height if infill_sparse_density < 30 else 0"
},
"bridge_settings_enabled": {
"value": false
},
"bridge_wall_min_length": {
"value": 0
},
"bridge_skin_support_threshold": {
"value": 50
},
"bridge_sparse_infill_max_density": {
"value": 0
},
"bridge_wall_coast": {
"value": 0
},
"bridge_wall_speed": {
"value": "speed_wall"
},
"bridge_wall_material_flow": {
"value": "wall_material_flow"
},
"bridge_skin_speed": {
"value": "speed_topbottom"
},
"bridge_skin_material_flow": {
"value": "skin_material_flow"
},
"bridge_skin_density": {
"value": "80"
},
"bridge_fan_speed": {
"value": "cool_fan_speed_max"
},
"bridge_enable_more_layers": {
"value": false
},
"bridge_skin_speed_2": {
"value": "speed_topbottom"
},
"bridge_skin_material_flow_2": {
"value": "skin_material_flow"
},
"bridge_skin_density_2": {
"value": 100
},
"bridge_fan_speed_2": {
"value": "cool_fan_speed_min"
},
"bridge_skin_speed_3": {
"value": "speed_topbottom"
},
"bridge_skin_material_flow_3": {
"value": "skin_material_flow"
},
"bridge_skin_density_3": {
"value": 100
},
"bridge_fan_speed_3": {
"value": "cool_fan_speed_min"
},
"jerk_print": {
"value": "20",
"minimum_value_warning": 20
},
"jerk_infill": {
"minimum_value_warning": 20
},
"jerk_wall": {
"minimum_value_warning": 20
},
"jerk_wall_0": {
"minimum_value_warning": 20
},
"jerk_roofing": {
"minimum_value_warning": 20
},
"jerk_topbottom": {
"minimum_value_warning": 20
},
"jerk_support": {
"minimum_value_warning": 20
},
"jerk_support_infill": {
"minimum_value_warning": 20
},
"jerk_support_interface": {
"minimum_value_warning": 20
},
"jerk_prime_tower": {
"minimum_value_warning": 20
},
"jerk_layer_0": {
"minimum_value_warning": 20
},
"jerk_print_layer_0": {
"minimum_value_warning": 20
},
"jerk_travel": {
"value": "jerk_print",
"minimum_value_warning": 20
},
"jerk_travel_layer_0": {
"minimum_value_warning": 20
},
"jerk_skirt_brim": {
"minimum_value_warning": 20
}
}
}

14
resources/definitions/ultimaker3.def.json
View file

@ -101,20 +101,6 @@
"infill_wipe_dist": { "value": "0" },
"initial_layer_line_width_factor": { "value": "120" },
"jerk_enabled": { "value": "True" },
"jerk_print": { "value": "20", "minimum_value_warning": 20 },
"jerk_infill": {"minimum_value_warning": 20 },
"jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
"jerk_roofing": {"minimum_value_warning": 20 },
"jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_support_infill": {"minimum_value_warning": 20 },
"jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
"jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
"jerk_print_layer_0": {"minimum_value_warning": 20 },
"jerk_travel_layer_0": {"minimum_value_warning": 20 },
"jerk_skirt_brim": {"minimum_value_warning": 20 },
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
"layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },

15
resources/definitions/ultimaker_s3.def.json
View file

@ -93,20 +93,6 @@
"infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
"infill_wipe_dist": { "value": "0" },
"jerk_enabled": { "value": "True" },
"jerk_print": { "value": "20", "minimum_value_warning": 20 },
"jerk_infill": {"minimum_value_warning": 20 },
"jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
"jerk_roofing": {"minimum_value_warning": 20 },
"jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_support_infill": {"minimum_value_warning": 20 },
"jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
"jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
"jerk_print_layer_0": {"minimum_value_warning": 20 },
"jerk_travel_layer_0": {"minimum_value_warning": 20 },
"jerk_skirt_brim": {"minimum_value_warning": 20 },
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
"layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
@ -155,7 +141,6 @@
"switch_extruder_prime_speed": { "value": "15" },
"switch_extruder_retraction_amount": { "value": "8" },
"top_bottom_thickness": { "value": "1" },
"travel_avoid_supports": { "value": "True" },
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
"wall_0_inset": { "value": "0" },
"initial_layer_line_width_factor": { "value": "120" },

15
resources/definitions/ultimaker_s5.def.json
View file

@ -95,20 +95,6 @@
"infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
"infill_wipe_dist": { "value": "0" },
"jerk_enabled": { "value": "True" },
"jerk_print": { "value": "20", "minimum_value_warning": 20 },
"jerk_infill": {"minimum_value_warning": 20 },
"jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
"jerk_roofing": {"minimum_value_warning": 20 },
"jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_support_infill": {"minimum_value_warning": 20 },
"jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
"jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
"jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
"jerk_print_layer_0": {"minimum_value_warning": 20 },
"jerk_travel_layer_0": {"minimum_value_warning": 20 },
"jerk_skirt_brim": {"minimum_value_warning": 20 },
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
"layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
@ -157,7 +143,6 @@
"switch_extruder_prime_speed": { "value": "15" },
"switch_extruder_retraction_amount": { "value": "8" },
"top_bottom_thickness": { "value": "1" },
"travel_avoid_supports": { "value": "True" },
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
"wall_0_inset": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },

1
resources/definitions/uni_base.def.json
View file

@ -138,7 +138,6 @@
"machine_height": {"default_value": 250},
"machine_extruder_count": {"value": 2},
"machine_buildplate_type": {"value": "glass"},
"machine_heated_bed": {"default_value": true},
"machine_center_is_zero": {"default_value": false},
"machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
"machine_head_with_fans_polygon": {"default_value": [

1
resources/definitions/zav_base.def.json
View file

@ -147,7 +147,6 @@
"machine_height": {"default_value": 270},
"machine_extruder_count": {"value": 1},
"machine_buildplate_type": {"value": "glass"},
"machine_heated_bed": {"default_value": true},
"machine_center_is_zero": {"default_value": false},
"machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
"machine_head_with_fans_polygon": {"default_value": [