3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-27 12:51:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into feature_firmware_updater

Browse source
This commit is contained in:
fieldOfView 2018-09-28 11:32:28 +02:00
commit 7c23a4e187
337 changed files with 88130 additions and 18157 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/definitions/bq_hephestos_2.def.json
View file

@ -17,8 +17,8 @@
"overrides": {
"machine_name": { "default_value": "BQ Hephestos 2" },
"machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature} ; Heat up extruder while leveling\nM800 ; Custom GCODE to fire start print procedure\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" },
"machine_end_gcode": { "default_value": "; -- END GCODE --\nM801 ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" },
"machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature}\nG28 ; Zero-ing position\nG29 ; Auto bed-leveling\nG0 X4 Y297 Z15 F4000 ; Fast move to BQ's start position\nG90 ; Set to Absolute Positioning\nG92 E0 ; Reset extruder 0\nG1 F1800 ; Set default feedrate\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" },
"machine_end_gcode": { "default_value": "; -- END GCODE --\nM801 ; Marlin G-CODE to fire end print procedure\n; -- end of END GCODE --" },
"machine_width": { "default_value": 210 },
"machine_depth": { "default_value": 297 },
"machine_height": { "default_value": 220 },

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

@ -11,7 +11,6 @@
"has_machine_quality": true,
"has_materials": true,
"has_machine_materials": true,
"has_variant_materials": true,
"has_variants": true,
"variants_name": "Tool",

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

@ -37,7 +37,7 @@
"top_bottom_thickness": {
"default_value": 0.6
},
"top_bottom_pattern": {
"top_bottom_pattern_0": {
"default_value": "concentric"
},
"infill_pattern": {

89
resources/definitions/creality_ender3.def.json Executable file
View file

@ -0,0 +1,89 @@
{
"name": "Creality Ender-3",
"version": 2,
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Sacha Telgenhof",
"manufacturer": "Creality3D",
"file_formats": "text/x-gcode",
"platform": "creality_ender3_platform.stl",
"preferred_quality_type": "draft",
"machine_extruder_trains": {
"0": "creality_ender3_extruder_0"
}
},
"overrides": {
"machine_name": {
"default_value": "Creality Ender-3"
},
"machine_width": {
"default_value": 220
},
"machine_height": {
"default_value": 250
},
"machine_depth": {
"default_value": 220
},
"machine_heated_bed": {
"default_value": true
},
"gantry_height": {
"default_value": 30
},
"machine_head_polygon": {
"default_value": [
[-30, 34],
[-30, -32],
[30, -32],
[30, 34]
]
},
"acceleration_enabled": {
"default_value": true
},
"acceleration_print": {
"default_value": 500
},
"acceleration_travel": {
"default_value": 500
},
"jerk_enabled": {
"default_value": true
},
"jerk_travel": {
"default_value": 20
},
"layer_height_0": {
"default_value": 0.2
},
"adhesion_type": {
"default_value": "skirt"
},
"top_bottom_thickness": {
"default_value": 0.6
},
"retraction_amount": {
"default_value": 5
},
"retraction_speed": {
"default_value": 40
},
"cool_min_layer_time": {
"default_value": 10
},
"skirt_line_count": {
"default_value": 4
},
"skirt_gap": {
"default_value": 5
},
"machine_start_gcode": {
"default_value": "; Ender 3 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nG1 Z5.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z5.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed"
},
"machine_end_gcode": {
"default_value": "; Ender 3 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z10 ; Move Z Axis up 10 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM104 S0 ; Turn off Extruder temperature\nM140 S0 ; Turn off Heat Bed\nM106 S0 ; Turn off Cooling Fan\nM107 ; Turn off Fan\nM84 ; Disable stepper motors"
}
}
}

7
resources/definitions/dagoma_neva_magis.def.json → resources/definitions/dagoma_magis.def.json
View file

@ -1,5 +1,5 @@
{
"name": "Dagoma NEVA Magis",
"name": "Dagoma Magis",
"version": 2,
"inherits": "fdmprinter",
"metadata": {
@ -13,7 +13,7 @@
"has_materials": true,
"machine_extruder_trains":
{
"0": "dagoma_neva_magis_extruder_0"
"0": "dagoma_magis_extruder_0"
}
},
"overrides": {
@ -43,9 +43,6 @@
"machine_shape": {
"default_value": "elliptic"
},
"machine_gcode_flavor": {
"default_value": "RepRap"
},
"machine_start_gcode": {
"default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
},

3
resources/definitions/dagoma_neva.def.json
View file

@ -43,9 +43,6 @@
"machine_shape": {
"default_value": "elliptic"
},
"machine_gcode_flavor": {
"default_value": "RepRap"
},
"machine_start_gcode": {
"default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n"
},

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

@ -77,6 +77,20 @@
"type": "str",
"enabled": false
},
"material_diameter":
{
"label": "Diameter",
"description": "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament.",
"unit": "mm",
"type": "float",
"default_value": 2.85,
"minimum_value": "0.0001",
"minimum_value_warning": "0.4",
"maximum_value_warning": "3.5",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"material_bed_temp_wait":
{
"label": "Wait for Build Plate Heatup",
@ -216,6 +230,7 @@
"label": "Number of Extruders that are enabled",
"description": "Number of extruder trains that are enabled; automatically set in software",
"value": "machine_extruder_count",
"default_value": 1,
"minimum_value": "1",
"maximum_value": "16",
"type": "int",
@ -1297,8 +1312,8 @@
"default_value": 0,
"type": "float",
"enabled": "travel_compensate_overlapping_walls_0_enabled or travel_compensate_overlapping_walls_x_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_mesh": true,
"settable_per_extruder": false
},
"wall_min_flow_retract":
{
@ -1307,8 +1322,8 @@
"type": "bool",
"default_value": false,
"enabled": "(travel_compensate_overlapping_walls_0_enabled or travel_compensate_overlapping_walls_x_enabled) and wall_min_flow > 0",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_mesh": true,
"settable_per_extruder": false
},
"fill_perimeter_gaps":
{
@ -1438,7 +1453,7 @@
"label": "Ignore Small Z Gaps",
"description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting.",
"type": "bool",
"default_value": true,
"default_value": false,
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -1716,7 +1731,7 @@
"infill_wall_line_count":
{
"label": "Extra Infill Wall Count",
"description": "Add extra wals around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right.",
"description": "Add extra walls around the infill area. Such walls can make top/bottom skin lines sag down less which means you need less top/bottom skin layers for the same quality at the cost of some extra material.\nThis feature can combine with the Connect Infill Polygons to connect all the infill into a single extrusion path without the need for travels or retractions if configured right.",
"default_value": 0,
"type": "int",
"minimum_value": "0",
@ -1819,9 +1834,9 @@
"unit": "mm",
"type": "float",
"default_value": 0.1,
"minimum_value": "resolveOrValue('layer_height')",
"minimum_value": "resolveOrValue('layer_height') if infill_line_distance > 0 else -999999",
"maximum_value_warning": "0.75 * machine_nozzle_size",
"maximum_value": "resolveOrValue('layer_height') * (1.45 if spaghetti_infill_enabled else 8)",
"maximum_value": "resolveOrValue('layer_height') * (1.45 if spaghetti_infill_enabled else 8) if infill_line_distance > 0 else 999999",
"value": "resolveOrValue('layer_height')",
"enabled": "infill_sparse_density > 0 and not spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr",
@ -3802,7 +3817,8 @@
"value": "1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0",
"enabled": "support_enable",
"limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": true
"settable_per_mesh": false,
"settable_per_extruder": true
},
"zig_zaggify_support":
{
@ -3875,6 +3891,19 @@
}
}
},
"support_infill_angle":
{
"label": "Support Infill Line Direction",
"description": "Orientation of the infill pattern for supports. The support infill pattern is rotated in the horizontal plane.",
"unit": "°",
"type": "float",
"minimum_value": "-180",
"maximum_value": "180",
"default_value": 0,
"enabled": "support_enable and support_pattern != 'concentric' and support_infill_rate > 0",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"support_z_distance":
{
"label": "Support Z Distance",
@ -6483,6 +6512,30 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"wall_overhang_angle":
{
"label": "Overhanging Wall Angle",
"description": "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging.",
"unit": "°",
"type": "float",
"minimum_value": "0",
"minimum_value_warning": "2",
"maximum_value": "90",
"default_value": 90,
"settable_per_mesh": true
},
"wall_overhang_speed_factor":
{
"label": "Overhanging Wall Speed",
"description": "Overhanging walls will be printed at this percentage of their normal print speed.",
"unit": "%",
"type": "float",
"default_value": 100,
"minimum_value": "10",
"minimum_value_warning": "25",
"maximum_value": "100",
"settable_per_mesh": true
},
"bridge_settings_enabled":
{
"label": "Enable Bridge Settings",
@ -6502,8 +6555,8 @@
"minimum_value": "0",
"default_value": 5,
"enabled": "bridge_settings_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_mesh": true,
"settable_per_extruder": false
},
"bridge_skin_support_threshold":
{
@ -6517,18 +6570,6 @@
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
"bridge_wall_max_overhang":
{
"label": "Bridge Wall Max Overhang",
"description": "The maximum allowed width of the region of air below a wall line before the wall is printed using bridge settings. Expressed as a percentage of the wall line width. When the air gap is wider than this, the wall line is printed using the bridge settings. Otherwise, the wall line is printed using the normal settings. The lower the value, the more likely it is that overhung wall lines will be printed using bridge settings.",
"unit": "%",
"default_value": 100,
"type": "float",
"minimum_value": "0",
"maximum_value": "100",
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
"bridge_wall_coast":
{
"label": "Bridge Wall Coasting",
@ -6539,7 +6580,7 @@
"minimum_value": "0",
"maximum_value": "500",
"enabled": "bridge_settings_enabled",
"settable_per_mesh": false
"settable_per_mesh": true
},
"bridge_wall_speed":
{

148
resources/definitions/peopoly_moai.def.json
View file

@ -4,13 +4,14 @@
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "fieldOfView",
"author": "Peopoly",
"manufacturer": "Peopoly",
"file_formats": "text/x-gcode",
"has_machine_quality": true,
"has_materials": false,
"machine_extruder_trains":
{
"platform": "moai.obj",
"platform_texture": "moai.jpg",
"machine_extruder_trains": {
"0": "peopoly_moai_extruder_0"
}
},
@ -46,7 +47,6 @@
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84"
},
"line_width": {
"minimum_value_warning": "machine_nozzle_size"
},
@ -75,7 +75,14 @@
"value": "0.1"
},
"top_bottom_thickness": {
"minimum_value_warning": "0.1"
"minimum_value_warning": "0.1",
"value": "0.1"
},
"top_thickness": {
"minimum_value_warning": "resolveOrValue('layer_height')"
},
"bottom_thickness": {
"minimum_value_warning": "resolveOrValue('layer_height')"
},
"infill_sparse_thickness": {
"maximum_value_warning": "0.5"
@ -102,24 +109,23 @@
"value": "speed_print"
},
"speed_travel": {
"value": "300"
"value": 150
},
"speed_travel_layer_0": {
"value": "300"
"value": 150
},
"speed_layer_0": {
"value": "5"
"value": 5
},
"speed_slowdown_layers": {
"value": "2"
"value": 3
},
"infill_overlap": {
"value": "15"
"value": 15
},
"adhesion_type": {
"value": "\"none\""
"value": "'none'"
},
"acceleration_enabled": {
"value": "False"
},
@ -139,6 +145,10 @@
"enabled": false,
"value": "False"
},
"cool_fan_speed_min": {
"enabled": false,
"value": 0
},
"retraction_enable": {
"enabled": false,
"value": "False"
@ -148,7 +158,8 @@
"value": "'off'"
},
"retract_at_layer_change": {
"enabled": false
"enabled": false,
"value": false
},
"cool_min_layer_time_fan_speed_max": {
"enabled": false
@ -158,6 +169,117 @@
},
"cool_fan_full_layer": {
"enabled": false
},
"minimum_polygon_circumference": {
"value": "0.1"
},
"meshfix_maximum_resolution": {
"value": "0.005"
},
"skin_outline_count": {
"value": 0
},
"travel_compensate_overlapping_walls_enabled": {
"value": "False"
},
"travel_compensate_overlapping_walls_0_enabled": {
"value": "False"
},
"travel_compensate_overlapping_walls_x_enabled": {
"value": "False"
},
"wall_0_wipe_dist": {
"value": "machine_nozzle_size / 3"
},
"wall_thickness": {
"value": 0.5
},
"infill_sparse_density": {
"value": 70
},
"infill_pattern": {
"value": "'lines'"
},
"infill_angles": {
"value": "[0,90]"
},
"cool_min_layer_time": {
"enabled": false,
"value": 0
},
"cool_min_speed": {
"enabled": false,
"value": 0
},
"cool_lift_head": {
"enabled": false,
"value": "False"
},
"material_flow": {
"enabled": false
},
"material_flow_layer_0": {
"enabled": false
},
"speed_equalize_flow_enabled": {
"enabled": false,
"value": "False"
},
"draft_shield_enabled": {
"enabled": false,
"value": "False"
},
"z_seam_corner": {
"value": "'z_seam_corner_none'"
},
"z_seam_type": {
"value": "'shortest'"
},
"skin_no_small_gaps_heuristic": {
"value": "False"
},
"ironing_enabled": {
"enabled": false,
"value": "False"
},
"skin_overlap": {
"value": 5
},
"infill_wipe_dist": {
"value": 0
},
"expand_skins_expand_distance": {
"value": "( wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x ) / 2"
},
"max_feedrate_z_override": {
"value": 0,
"enabled": false
},
"flow_rate_max_extrusion_offset": {
"enabled": false
},
"flow_rate_extrusion_offset_factor": {
"enabled": false
},
"adaptive_layer_height_enabled": {
"value": "False",
"enabled": false
},
"bridge_settings_enabled": {
"value": "False",
"enabled": false
},
"acceleration_enabled": {
"value": "False",
"enabled": false
},
"relative_extrusion": {
"value": "False",
"enabled": false
},
"coasting_enable": {
"value": "False",
"enabled": false
}
}
}

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

@ -13,7 +13,6 @@
"has_machine_quality": true,
"has_materials": true,
"has_machine_materials": true,
"has_variant_materials": true,
"has_variants": true,
"preferred_variant_name": "AA 0.4",
"preferred_quality_type": "normal",
@ -90,7 +89,7 @@
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'triangles'" },
"infill_wipe_dist": { "value": "0" },
"initial_layer_line_width_factor": { "value": "120" },
"initial_layer_line_width_factor": { "value": "120" },
"jerk_enabled": { "value": "True" },
"jerk_layer_0": { "value": "jerk_topbottom" },
"jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },

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

@ -13,7 +13,6 @@
"platform_offset": [0, 0, 0],
"has_machine_quality": true,
"has_machine_materials": true,
"has_variant_materials": true,
"has_materials": true,
"has_variants": true,
"preferred_variant_name": "AA 0.4",

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

@ -15,7 +15,6 @@
"has_machine_quality": true,
"has_materials": true,
"has_machine_materials": true,
"has_variant_materials": true,
"has_variant_buildplates": true,
"has_variants": true,
"preferred_variant_name": "AA 0.4",