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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-12-23 15:58:44 +01:00
commit 8398384af1
No known key found for this signature in database
GPG Key ID: 3710727397403C91
17 changed files with 557 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -790,7 +790,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
container_info = ContainerInfo(None, None, None)
quality_changes_info.extruder_info_dict["0"] = container_info
# If the global stack we're "targeting" has never been active, but was updated from Cura 3.4,
# it might not have it's extruders set properly.
# it might not have its extruders set properly.
if not global_stack.extruders:
ExtruderManager.getInstance().fixSingleExtrusionMachineExtruderDefinition(global_stack)
extruder_stack = global_stack.extruders["0"]

152
resources/definitions/anet3d.def.json Normal file
View File

@ -0,0 +1,152 @@
{
"version": 2,
"name": "anet3d",
"inherits": "fdmprinter",
"metadata": {
"author": "Tiger.He",
"manufacturer": "Anet",
"category": "anet3d",
"visible": false,
"file_formats": "text/x-gcode",
"first_start_actions": ["MachineSettingsAction"],
"preferred_variant_name": "0.4mm Nozzle",
"preferred_quality_type": "standard",
"preferred_material": "generic_pla",
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_max_feedrate_x": { "value": 500 },
"machine_max_feedrate_y": { "value": 500 },
"machine_max_feedrate_z": { "value": 10 },
"machine_max_feedrate_e": { "value": 50 },
"machine_max_acceleration_x": { "value": 500 },
"machine_max_acceleration_y": { "value": 500 },
"machine_max_acceleration_z": { "value": 100 },
"machine_max_acceleration_e": { "value": 5000 },
"machine_acceleration": { "value": 500 },
"machine_max_jerk_xy": { "value": 10 },
"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 },
"acceleration_print": { "value": 1000 },
"acceleration_travel": { "value": 1000 },
"acceleration_travel_layer_0": { "value": "acceleration_travel" },
"acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
"jerk_print": { "value": 30.0 },
"jerk_travel": { "value": "jerk_print" },
"jerk_travel_layer_0": { "value": "jerk_travel" },
"acceleration_enabled": { "value": true },
"jerk_enabled": { "value": false },
"speed_print": { "value": 50.0 } ,
"speed_infill": { "value": "speed_print * 2" },
"speed_wall": { "value": "speed_print / 2" },
"speed_wall_0": { "value": "speed_wall" },
"speed_wall_x": { "value": "speed_wall" },
"speed_topbottom": { "value": "speed_print / 2" },
"speed_roofing": { "value": "speed_topbottom" },
"speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
"speed_layer_0": { "value": "speed_print / 2" },
"speed_print_layer_0": { "value": "speed_layer_0" },
"speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
"speed_prime_tower": { "value": "speed_print" },
"speed_support": { "value": "speed_print" },
"speed_support_interface": { "value": "speed_print" },
"speed_z_hop": { "value": 5 },
"skirt_brim_speed": { "value": "speed_layer_0" },
"line_width": { "value": "machine_nozzle_size" },
"optimize_wall_printing_order": { "value": true },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_flow": { "value": 100 },
"travel_compensate_overlapping_walls_0_enabled": { "value": "False" },
"z_seam_type": { "value": "'back'" },
"z_seam_corner": { "value": "'z_seam_corner_weighted'" },
"infill_sparse_density": { "value": "20" },
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
"infill_before_walls": { "value": true },
"infill_overlap": { "value": 30.0 },
"skin_overlap": { "value": 10.0 },
"infill_wipe_dist": { "value": 1.0 },
"wall_0_wipe_dist": { "value": 0.2 },
"fill_perimeter_gaps": { "value": "'everywhere'" },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": true },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
"maximum_value": 200
},
"retraction_retract_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
"maximum_value": 200
},
"retraction_prime_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
"maximum_value": 200
},
"retraction_hop_enabled": { "value": "False" },
"retraction_hop": { "value": 1 },
"retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
"retraction_combing_max_distance": { "value": 30 },
"travel_avoid_other_parts": { "value": true },
"travel_avoid_supports": { "value": true },
"travel_retract_before_outer_wall": { "value": true },
"retraction_enable": { "value": true },
"retraction_count_max": { "value": 100 },
"retraction_extrusion_window": { "value": 10 },
"retraction_min_travel": { "value": 1.5 },
"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
"cool_fan_enabled": { "value": true },
"cool_min_layer_time": { "value": 10 },
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" },
"wall_thickness": {"value": "line_width * 2" },
"material_print_temperature": {"minimum_value": "0"},
"material_bed_temperature": {"minimum_value": "0"},
"material_standby_temperature": {"minimum_value": "0"},
"extruder_prime_pos_y":{"minimum_value": "0","maximum_value": "machine_depth"},
"extruder_prime_pos_x":{"minimum_value": "0","maximum_value": "machine_width"},
"relative_extrusion":{"value": false,"enabled": false},
"machine_use_extruder_offset_to_offset_coords": {"default_value": true},
"machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
"machine_center_is_zero": {
"default_value": false
},
"gantry_height": {
"value": "0"
}
}
}

31
resources/definitions/anet3d_a2 plus.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet A2 PLUS",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet A2 PLUS" },
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 270
},
"machine_height": {
"default_value": 220
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_a2.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet A2",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet A2" },
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_height": {
"default_value": 220
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_a6.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet A6",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet A6" },
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_height": {
"default_value": 250
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_a8 plus.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet A8 PLUS",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet A8 PLUS" },
"machine_width": {
"default_value": 300
},
"machine_depth": {
"default_value": 300
},
"machine_height": {
"default_value": 350
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_a8.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet A8",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet A8" },
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_height": {
"default_value": 240
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_e10.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet E10",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet E10" },
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 270
},
"machine_height": {
"default_value": 300
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_e12.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet E12",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet E12" },
"machine_width": {
"default_value": 300
},
"machine_depth": {
"default_value": 300
},
"machine_height": {
"default_value": 400
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_e16.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet E16",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet E16" },
"machine_width": {
"default_value": 300
},
"machine_depth": {
"default_value": 300
},
"machine_height": {
"default_value": 400
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_et4 pro.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet ET4 PRO",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet ET4 PRO" },
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_height": {
"default_value": 250
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_et4 x.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet ET4 X",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet ET4 X" },
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_height": {
"default_value": 250
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_et4.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet ET4",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet ET4" },
"machine_width": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_height": {
"default_value": 250
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_et5 x.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet ET5 X",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet ET5 X" },
"machine_width": {
"default_value": 300
},
"machine_depth": {
"default_value": 300
},
"machine_height": {
"default_value": 400
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

31
resources/definitions/anet3d_et5.def.json Normal file
View File

@ -0,0 +1,31 @@
{
"version": 2,
"name": "Anet ET5",
"inherits": "anet3d",
"metadata": {
"visible": true,
"machine_extruder_trains":
{
"0": "anet3d_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet ET5" },
"machine_width": {
"default_value": 300
},
"machine_depth": {
"default_value": 300
},
"machine_height": {
"default_value": 400
},
"machine_start_gcode": {
"default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84"
}
}
}

45
resources/definitions/anet_a6.def.json
View File

@ -1,45 +0,0 @@
{
"version": 2,
"name": "Anet A6",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Mark",
"manufacturer": "Anet",
"file_formats": "text/x-gcode",
"platform": "aneta6_platform.stl",
"platform_offset": [0, -3.4, 0],
"machine_extruder_trains":
{
"0": "anet_a6_extruder_0"
}
},
"overrides": {
"machine_name": { "default_value": "Anet A6" },
"machine_heated_bed": {
"default_value": true
},
"machine_width": {
"default_value": 220
},
"machine_height": {
"default_value": 250
},
"machine_depth": {
"default_value": 220
},
"machine_center_is_zero": {
"default_value": false
},
"gantry_height": {
"value": "55"
},
"machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM84 ;steppers off\nM0 S12 ;wait 12 seconds\nM17 ;turn steppers on\nG1 Z10.0 F300 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E8 ;extrude 8mm of feed stock\nG92 E0 ;zero the extruded length again\nM0 S5 ;wait 5 seconds\nG1 F9000\nM117 Printing..."
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+4 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y210 F9000 ;move out to get part off\nM84 ;steppers off\nG90 ;absolute positioning"
}
}
}

2
resources/extruders/anet_a6_extruder_0.def.json → resources/extruders/anet3d_extruder_0.def.json
View File

@ -3,7 +3,7 @@
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "anet_a6",
"machine": "anet3d",
"position": "0"
},