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 'master' of github.com:Ultimaker/Cura into CURA-7122_Include_description_in_search_field

Browse source
This commit is contained in:
Jaime van Kessel 2020-06-29 13:55:09 +02:00
commit 134d79608f
No known key found for this signature in database
GPG key ID: 3710727397403C91
38 changed files with 559 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

58
resources/definitions/beamup_l.def.json Normal file
View file

@ -0,0 +1,58 @@
{
"version": 2,
"name": "BeamUp L",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "BeamUp",
"manufacturer": "BeamUp",
"file_formats": "text/x-gcode",
"platform": "beamup_l.3mf",
"platform_offset": [0, -2.5, -2.5],
"has_machine_quality": true,
"has_materials": true,
"machine_extruder_trains":
{
"0": "beamup_l_extruder_0"
}
},
"overrides": {
"machine_name": {
"default_value": "BeamUp L"
},
"machine_width": {
"default_value": 320
},
"machine_depth": {
"default_value": 320
},
"machine_height": {
"default_value": 300
},
"machine_heated_bed": {
"default_value": false
},
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"gantry_height": {
"value": "0"
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_start_gcode": {
"default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X50 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X250 Y0 E15 F662"
},
"machine_end_gcode": {
"default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off"
}
}
}

2
resources/definitions/fdmprinter.def.json
View file

@ -6290,7 +6290,7 @@
"slicing_tolerance":
{
"label": "Slicing Tolerance",
"description": "How to slice layers with diagonal surfaces. The areas of a layer can be generated based on where the middle of the layer intersects the surface (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the height of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Exclusive retains the most details, Inclusive makes for the best fit and Middle takes the least time to process.",
"description": "Vertical tolerance in the sliced layers. The contours of a layer are normally generated by taking cross sections through the middle of each layer's thickness (Middle). Alternatively each layer can have the areas which fall inside of the volume throughout the entire thickness of the layer (Exclusive) or a layer has the areas which fall inside anywhere within the layer (Inclusive). Inclusive retains the most details, Exclusive makes for the best fit and Middle stays closest to the original surface.",
"type": "enum",
"options":
{

32
resources/definitions/hms434.def.json
View file

@ -81,9 +81,6 @@
"layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },
"layer_height_0": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },
"line_width": {"value": "(machine_nozzle_size + 0.2)" },
"wall_line_width_0": {"value": "(machine_nozzle_size)" },
"infill_line_width": {"value": "(line_width)" },
"initial_layer_line_width_factor": {"value": 110 },
"wall_thickness": {"value": "(line_width * 3) if infill_sparse_density < 95 else line_width" },
@ -111,17 +108,24 @@
"infill_pattern": {"value": "'lines'"},
"infill_before_walls": {"value": true},
"material_print_temperature_layer_0": {"value": "material_print_temperature"},
"material_initial_print_temperature": {"value": "material_print_temperature",
"maximum_value_warning": "material_print_temperature + 15"},
"material_final_print_temperature": {"value": "material_print_temperature"},
"material_bed_temperature_layer_0": {"value": "material_bed_temperature"},
"material_flow_layer_0": {"value": "material_flow"},
"retraction_enable": {"value": true },
"retract_at_layer_change": {"value": false },
"retraction_min_travel": {"value": "(round(line_width * 10))"},
"switch_extruder_retraction_speeds": {"value": "(retraction_speed)"},
"switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"},
"default_material_print_temperature": {"maximum_value": "401" },
"material_print_temperature": {"maximum_value": "401" },
"material_print_temperature_layer_0": {"value": "material_print_temperature",
"maximum_value": "401" },
"material_initial_print_temperature": {"value": "material_print_temperature",
"maximum_value_warning": "material_print_temperature + 15",
"maximum_value": "401" },
"material_initial_print_temperature": {"maximum_value": "401" },
"material_final_print_temperature": {"value": "material_print_temperature",
"maximum_value": "401" },
"material_break_preparation_temperature": {"maximum_value": "401" },
"material_bed_temperature_layer_0": {"value": "material_bed_temperature"},
"material_flow_layer_0": {"value": "material_flow"},
"retraction_enable": {"value": true },
"retract_at_layer_change": {"value": false },
"retraction_min_travel": {"value": "(round(line_width * 10))"},
"switch_extruder_retraction_speeds": {"value": "(retraction_speed)"},
"switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"},
"speed_print": {"value": "50"},
"speed_infill": {"value": "speed_print"},

15
resources/extruders/beamup_l_extruder_0.def.json Normal file
View file

@ -0,0 +1,15 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "beamup_l",
"position": "0"
},
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.8 },
"material_diameter": { "default_value": 1.75 }
}
}

2
resources/extruders/hms434_tool_1.def.json
View file

@ -16,7 +16,7 @@
"machine_nozzle_offset_y": { "default_value": 0.0 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": {
"default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n"
"default_value": "\n;changing to tool1\nT0\nM83\nM109 T0 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n"
},
"machine_extruder_end_code": {
"default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool1\n\n"

2
resources/extruders/hms434_tool_2.def.json
View file

@ -16,7 +16,7 @@
"machine_nozzle_offset_y": { "default_value": 0.0 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code": {
"default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n"
"default_value": "\n;changing to tool2\nT1\nM83\nM109 T1 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n"
},
"machine_extruder_end_code": {
"default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool2\n\n"

BIN
resources/meshes/beamup_l.3mf Normal file
View file

Binary file not shown.

4
resources/qml/Preferences/GeneralPage.qml
View file

@ -90,7 +90,7 @@ UM.PreferencesPage
UM.Preferences.resetPreference("view/show_overhang");
showOverhangCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_overhang"))
UM.Preferences.resetPreference("view/show_xray_warning");
showXrayErrorCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_warning"))
showXrayErrorCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_xray_warning"))
UM.Preferences.resetPreference("view/center_on_select");
centerOnSelectCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select"))
UM.Preferences.resetPreference("view/invert_zoom");
@ -336,7 +336,7 @@ UM.PreferencesPage
id: showOverhangCheckbox
checked: boolCheck(UM.Preferences.getValue("view/show_overhang"))
onClicked: UM.Preferences.setValue("view/show_overhang", checked)
onClicked: UM.Preferences.setValue("view/show_overhang", checked)
text: catalog.i18nc("@option:check", "Display overhang");
}

40
resources/quality/beamup_l/beamup_l_coarse.inst.cfg Normal file
View file

@ -0,0 +1,40 @@
[general]
version = 4
name = BeamUp L Coarse
definition = beamup_l
[metadata]
setting_version = 15
type = quality
quality_type = coarse
weight = -3
material = generic_pla
[values]
layer_height = 0.30
adhesion_type = brim
brim_line_count = 8
infill_before_walls = False
initial_layer_line_width_factor = 120.0
material_print_temperature = 215
material_print_temperature_layer_0 = 235
retraction_amount = 2
retraction_speed = 30
speed_infill = 55
speed_layer_0 = 25
speed_print = 55
speed_support_interface = 55
speed_topbottom = 55
speed_wall_0 = 45
speed_wall_x = 55
support_enable = True
support_angle = 60
support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.60
support_interface_pattern = zigzag
support_interface_skip_height = 0.30
support_offset = 0.8
support_z_distance = 0.4
wall_thickness = 1.6
zig_zaggify_infill = True

40
resources/quality/beamup_l/beamup_l_draft.inst.cfg Normal file
View file

@ -0,0 +1,40 @@
[general]
version = 4
name = BeamUp L Draft
definition = beamup_l
[metadata]
setting_version = 15
type = quality
quality_type = draft
weight = -2
material = generic_pla
[values]
layer_height = 0.2
adhesion_type = brim
brim_line_count = 8
infill_before_walls = False
initial_layer_line_width_factor = 120.0
material_print_temperature = 210
material_print_temperature_layer_0 = 235
retraction_amount = 2
retraction_speed = 30
speed_infill = 55
speed_layer_0 = 25
speed_print = 55
speed_support_interface = 55
speed_topbottom = 55
speed_wall_0 = 45
speed_wall_x = 55
support_enable = True
support_angle = 60
support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.60
support_interface_pattern = zigzag
support_interface_skip_height = 0.20
support_offset = 0.8
support_z_distance = 0.3
wall_thickness = 1.6
zig_zaggify_infill = True

40
resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg Normal file
View file

@ -0,0 +1,40 @@
[general]
version = 4
name = BeamUp L Extra Fine
definition = beamup_l
[metadata]
setting_version = 15
type = quality
quality_type = high
weight = 1
material = generic_pla
[values]
layer_height = 0.06
adhesion_type = brim
brim_line_count = 8
infill_before_walls = False
initial_layer_line_width_factor = 120.0
material_print_temperature = 195
material_print_temperature_layer_0 = 235
retraction_amount = 2
retraction_speed = 30
speed_infill = 45
speed_layer_0 = 25
speed_print = 45
speed_support_interface = 45
speed_topbottom = 45
speed_wall_0 = 35
speed_wall_x = 45
support_enable = True
support_angle = 60
support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.06
support_offset = 0.8
support_z_distance = 0.12
wall_thickness = 1.6
zig_zaggify_infill = True

40
resources/quality/beamup_l/beamup_l_fine.inst.cfg Normal file
View file

@ -0,0 +1,40 @@
[general]
version = 4
name = BeamUp L Fine
definition = beamup_l
[metadata]
setting_version = 15
type = quality
quality_type = normal
weight = 0
material = generic_pla
[values]
layer_height = 0.1
adhesion_type = brim
brim_line_count = 8
infill_before_walls = False
initial_layer_line_width_factor = 120.0
material_print_temperature = 200
material_print_temperature_layer_0 = 235
retraction_amount = 2
retraction_speed = 30
speed_infill = 50
speed_layer_0 = 25
speed_print = 50
speed_support_interface = 50
speed_topbottom = 50
speed_wall_0 = 40
speed_wall_x = 50
support_enable = True
support_angle = 60
support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.30
support_interface_pattern = zigzag
support_interface_skip_height = 0.10
support_offset = 0.8
support_z_distance = 0.2
wall_thickness = 1.6
zig_zaggify_infill = True

40
resources/quality/beamup_l/beamup_l_normal.inst.cfg Normal file
View file

@ -0,0 +1,40 @@
[general]
version = 4
name = BeamUp L Normal
definition = beamup_l
[metadata]
setting_version = 15
type = quality
quality_type = fast
weight = -1
material = generic_pla
[values]
layer_height = 0.15
adhesion_type = brim
brim_line_count = 8
infill_before_walls = False
initial_layer_line_width_factor = 120.0
material_print_temperature = 205
material_print_temperature_layer_0 = 235
retraction_amount = 2
retraction_speed = 30
speed_infill = 50
speed_layer_0 = 25
speed_print = 50
speed_support_interface = 50
speed_topbottom = 50
speed_wall_0 = 40
speed_wall_x = 50
support_enable = True
support_angle = 60
support_infill_rate = 20
support_interface_enable = True
support_interface_height = 0.45
support_interface_pattern = zigzag
support_interface_skip_height = 0.15
support_offset = 0.8
support_z_distance = 0.25
wall_thickness = 1.6
zig_zaggify_infill = True

1
resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
View file

@ -32,7 +32,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = True
prime_tower_wipe_enabled = True
retraction_combing = off
retraction_extrusion_window = 1
retraction_hop = 0.2
retraction_hop_enabled = False

1
resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
View file

@ -32,7 +32,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = True
prime_tower_wipe_enabled = True
retraction_combing = off
retraction_extrusion_window = 1
retraction_hop = 0.2
retraction_hop_enabled = False

1
resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
View file

@ -34,7 +34,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = True
prime_tower_wipe_enabled = True
retraction_combing = off
retraction_extrusion_window = 1
retraction_hop = 0.2
retraction_hop_enabled = False

1
resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
View file

@ -33,7 +33,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = True
prime_tower_wipe_enabled = True
retraction_combing = off
retraction_extrusion_window = 1
retraction_hop = 0.2
retraction_hop_enabled = False

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg
View file

@ -23,7 +23,6 @@ material_print_temperature = =default_material_print_temperature - 10
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
prime_tower_enable = True
retraction_combing = off
retraction_hop = 0.1
retraction_hop_enabled = False
skin_overlap = 0

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
View file

@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
prime_tower_enable = True
retraction_combing = off
retraction_hop = 0.1
retraction_hop_enabled = False
skin_overlap = 0

1
resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg
View file

@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature - 7
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
prime_tower_enable = True
retraction_combing = off
retraction_hop = 0.1
retraction_hop_enabled = False
skin_overlap = 0