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

Revert "Separate dual extruder from single in base definition"

Browse Source 
This reverts commit f47ee9e83700fd4c0b0f78444be5cd2c9a9840e8.
This commit is contained in:
HellAholic 2024-07-21 12:47:58 +02:00
parent 2ad2bde58f
commit 0640800268
20 changed files with 46 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/definitions/mingda_1000pro.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_1000pro_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"quality_definition": "mingda_base"
},
"overrides":

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

@ -1,7 +1,7 @@
{
"version": 3,
"name": "Mingda 1000Pro+",
"inherits": "mingda_base_dual",
"inherits": "mingda_base",
"metadata":
{
"visible": true,

128
resources/definitions/mingda_400d.def.json
View File

@ -1,149 +1,27 @@
{
"version": 3,
"name": "Mingda 400D",
"inherits": "fdmprinter",
"inherits": "mingda_base",
"metadata":
{
"visible": true,
"author": "Mingda",
"manufacturer": "Mingda",
"file_formats": "text/x-gcode",
"platform": "mingda_400d_base.stl",
"exclude_materials": [
"dsm_arnitel2045",
"dsm_novamid1070",
"innofill_innoflex60",
"verbatim_bvoh"
],
"first_start_actions": [ "MachineSettingsAction" ],
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains":
{
"0": "mingda_base_400D_extruder_0",
"1": "mingda_base_400D_extruder_1"
},
"preferred_material": "generic_pla",
"preferred_quality_type": "standard",
"preferred_variant_name": "0.4mm Nozzle",
"quality_definition": "mingda_base",
"variants_name": "Nozzle Size"
"quality_definition": "mingda_base"
},
"overrides":
{
"acceleration_enabled": { "value": false },
"acceleration_print": { "value": 500 },
"acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
"acceleration_travel": { "value": 500 },
"acceleration_travel_layer_0": { "value": "acceleration_travel" },
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"adhesion_type": { "value": "'none' if support_enable else 'raft'" },
"brim_replaces_support": { "value": false },
"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
"cool_min_layer_time": { "value": 10 },
"fill_outline_gaps": { "value": false },
"gantry_height": { "value": 25 },
"infill_before_walls": { "value": false },
"infill_overlap": { "value": 30.0 },
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" },
"infill_sparse_density": { "value": "15" },
"infill_wipe_dist": { "value": 0.0 },
"jerk_enabled": { "value": false },
"jerk_print": { "value": 8 },
"jerk_travel": { "value": "jerk_print" },
"jerk_travel_layer_0": { "value": "jerk_travel" },
"line_width": { "value": "machine_nozzle_size * 1" },
"machine_acceleration": { "value": 500 },
"machine_depth": { "default_value": 400 },
"machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G28 X F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan\nM605 S1;" },
"machine_extruder_count": { "default_value": 2 },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 400 },
"machine_max_acceleration_e": { "value": 5000 },
"machine_max_acceleration_x": { "value": 500 },
"machine_max_acceleration_y": { "value": 500 },
"machine_max_acceleration_z": { "value": 100 },
"machine_max_feedrate_e": { "value": 50 },
"machine_max_feedrate_x": { "value": 500 },
"machine_max_feedrate_y": { "value": 500 },
"machine_max_feedrate_z": { "value": 10 },
"machine_max_jerk_e": { "value": 5 },
"machine_max_jerk_xy": { "value": 10 },
"machine_max_jerk_z": { "value": 0.4 },
"machine_name": { "default_value": "Mingda 400D" },
"machine_start_gcode": { "default_value": "G28 ; home all axes\nM605 S0; \nM420 S1;\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F1200 ; move z up little to prevent scratching of surface\nG1 E2 F200;\nG92 E0 \nG1 X54 Y20 Z0.3 F3000\n G1 X4 Y20 Z0.3 F500.0 E5 \n G1 X4 Y70.0 Z0.3 F500.0 E10 \n G1 X4 Y70.0 Z0.4 F3000.0 \n G1 X4 Y20 Z0.4 F500.0 E15 \n G1 X54 Y20 Z0.4 F500.0 E20\n G92 E0\n G1 Z5 E15 F200\n G92 E0\n G1 Z10 F1500 \n G4 S2\n G1 Z15 F1500" },
"machine_width": { "default_value": 400 },
"material_diameter": { "default_value": 1.75 },
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"minimum_interface_area": { "value": 10 },
"minimum_support_area": { "value": "2 if support_structure == 'normal' else 0" },
"optimize_wall_printing_order": { "value": true },
"retraction_amount": { "value": 2 },
"retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" },
"retraction_combing_max_distance": { "value": 30 },
"retraction_count_max": { "value": 100 },
"retraction_enable": { "value": true },
"retraction_extrusion_window": { "value": 3 },
"retraction_hop": { "value": "layer_height*2" },
"retraction_hop_enabled": { "value": true },
"retraction_min_travel": { "value": 1.5 },
"retraction_prime_speed":
{
"maximum_value": 200,
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
},
"retraction_retract_speed":
{
"maximum_value": 200,
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
},
"retraction_speed":
{
"maximum_value": 200,
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
},
"skin_overlap": { "value": 10.0 },
"skirt_brim_speed": { "value": "speed_layer_0" },
"skirt_gap": { "value": 10.0 },
"skirt_line_count": { "value": 4 },
"speed_layer_0": { "value": 20.0 },
"speed_prime_tower": { "value": "speed_topbottom" },
"speed_print": { "value": 60.0 },
"speed_print_layer_0": { "value": "speed_layer_0" },
"speed_roofing": { "value": "speed_topbottom" },
"speed_support": { "value": "speed_wall_0" },
"speed_support_interface": { "value": "speed_topbottom" },
"speed_travel": { "value": "80.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 1.5" },
"speed_travel_layer_0": { "value": "60 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 1.5" },
"speed_wall_x": { "value": "speed_wall" },
"speed_z_hop": { "value": 5 },
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
"support_brim_enable": { "value": true },
"support_brim_width": { "value": 4 },
"support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
"support_interface_density": { "value": 33.333 },
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },
"support_xy_overrides_z": { "value": "'xy_overrides_z'" },
"support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
"top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
"travel_avoid_other_parts": { "value": true },
"travel_avoid_supports": { "value": true },
"travel_retract_before_outer_wall": { "value": true },
"wall_0_material_flow": { "value": "0.95 * material_flow" },
"wall_0_wipe_dist": { "value": 0.0 },
"wall_thickness": { "value": "line_width * 2" },
"z_seam_corner": { "value": "'z_seam_corner_none'" },
"z_seam_type": { "value": "'back'" }
"machine_width": { "default_value": 400 }
}
}

1
resources/definitions/mingda_4h.def.json
View File

@ -5,6 +5,7 @@
"metadata":
{
"visible": true,
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"quality_definition": "mingda_base"
},
"overrides":

1
resources/definitions/mingda_600pro.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_600pro_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"quality_definition": "mingda_base"
},
"overrides":

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

@ -1,7 +1,7 @@
{
"version": 3,
"name": "Mingda 600Pro+",
"inherits": "mingda_base_dual",
"inherits": "mingda_base",
"metadata":
{
"visible": true,

1
resources/definitions/mingda_6h.def.json
View File

@ -5,6 +5,7 @@
"metadata":
{
"visible": true,
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"quality_definition": "mingda_base"
},
"overrides":

6
resources/definitions/mingda_base.def.json
View File

@ -18,7 +18,11 @@
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"machine_extruder_trains":
{
"0": "mingda_base_extruder_0",
"1": "mingda_base_extruder_1"
},
"preferred_material": "generic_pla",
"preferred_quality_type": "standard",
"preferred_variant_name": "0.4mm Nozzle",

143
resources/definitions/mingda_base_dual.json
View File

@ -1,143 +0,0 @@
{
"version": 3,
"name": "Mingda Base Dual Printer",
"inherits": "fdmprinter",
"metadata":
{
"visible": false,
"author": "Mingda",
"manufacturer": "Mingda",
"file_formats": "text/x-gcode",
"exclude_materials": [
"dsm_arnitel2045",
"dsm_novamid1070",
"innofill_innoflex60",
"verbatim_bvoh"
],
"first_start_actions": [ "MachineSettingsAction" ],
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains":
{
"0": "mingda_base_plus_extruder_0",
"1": "mingda_base_plus_extruder_1"
},
"preferred_material": "generic_pla",
"preferred_quality_type": "standard",
"preferred_variant_name": "0.4mm Nozzle",
"quality_definition": "mingda_base",
"variants_name": "Nozzle Size"
},
"overrides":
{
"acceleration_enabled": { "value": false },
"acceleration_print": { "value": 500 },
"acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
"acceleration_travel": { "value": 500 },
"acceleration_travel_layer_0": { "value": "acceleration_travel" },
"adaptive_layer_height_variation": { "value": 0.04 },
"adaptive_layer_height_variation_step": { "value": 0.04 },
"adhesion_type": { "value": "'none' if support_enable else 'raft'" },
"brim_replaces_support": { "value": false },
"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
"cool_min_layer_time": { "value": 10 },
"fill_outline_gaps": { "value": false },
"infill_before_walls": { "value": false },
"infill_overlap": { "value": 30.0 },
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" },
"infill_sparse_density": { "value": "15" },
"infill_wipe_dist": { "value": 0.0 },
"jerk_enabled": { "value": false },
"jerk_print": { "value": 8 },
"jerk_travel": { "value": "jerk_print" },
"jerk_travel_layer_0": { "value": "jerk_travel" },
"line_width": { "value": "machine_nozzle_size * 1" },
"machine_acceleration": { "value": 500 },
"machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" },
"machine_heated_bed": { "default_value": true },
"machine_max_acceleration_e": { "value": 5000 },
"machine_max_acceleration_x": { "value": 500 },
"machine_max_acceleration_y": { "value": 500 },
"machine_max_acceleration_z": { "value": 100 },
"machine_max_feedrate_e": { "value": 50 },
"machine_max_feedrate_x": { "value": 500 },
"machine_max_feedrate_y": { "value": 500 },
"machine_max_feedrate_z": { "value": 10 },
"machine_max_jerk_e": { "value": 5 },
"machine_max_jerk_xy": { "value": 10 },
"machine_max_jerk_z": { "value": 0.4 },
"machine_name": { "default_value": "MINGDA Base Dual Printer" },
"machine_start_gcode": { "default_value": " G28 ; home all axes\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface" },
"material_diameter": { "default_value": 1.75 },
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"meshfix_maximum_resolution": { "value": "0.05" },
"meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
"minimum_interface_area": { "value": 10 },
"minimum_support_area": { "value": "2 if support_structure == 'normal' else 0" },
"optimize_wall_printing_order": { "value": true },
"retraction_amount": { "value": 2 },
"retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" },
"retraction_combing_max_distance": { "value": 30 },
"retraction_count_max": { "value": 100 },
"retraction_enable": { "value": true },
"retraction_extrusion_window": { "value": 3 },
"retraction_hop": { "value": "layer_height*2" },
"retraction_hop_enabled": { "value": true },
"retraction_min_travel": { "value": 1.5 },
"retraction_prime_speed":
{
"maximum_value": 200,
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
},
"retraction_retract_speed":
{
"maximum_value": 200,
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
},
"retraction_speed":
{
"maximum_value": 200,
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
},
"skin_overlap": { "value": 10.0 },
"skirt_brim_speed": { "value": "speed_layer_0" },
"skirt_gap": { "value": 10.0 },
"skirt_line_count": { "value": 4 },
"speed_layer_0": { "value": 20.0 },
"speed_prime_tower": { "value": "speed_topbottom" },
"speed_print": { "value": 60.0 },
"speed_print_layer_0": { "value": "speed_layer_0" },
"speed_roofing": { "value": "speed_topbottom" },
"speed_support": { "value": "speed_wall_0" },
"speed_support_interface": { "value": "speed_topbottom" },
"speed_travel": { "value": "80.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 1.5" },
"speed_travel_layer_0": { "value": "60 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 1.5" },
"speed_wall_x": { "value": "speed_wall" },
"speed_z_hop": { "value": 5 },
"support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
"support_brim_enable": { "value": true },
"support_brim_width": { "value": 4 },
"support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
"support_interface_density": { "value": 33.333 },
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "layer_height * 4" },
"support_interface_pattern": { "value": "'grid'" },
"support_pattern": { "value": "'zigzag'" },
"support_wall_count": { "value": 1 },
"support_xy_distance": { "value": "wall_line_width_0 * 2" },
"support_xy_distance_overhang": { "value": "wall_line_width_0" },
"support_xy_overrides_z": { "value": "'xy_overrides_z'" },
"support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
"top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
"travel_avoid_other_parts": { "value": true },
"travel_avoid_supports": { "value": true },
"travel_retract_before_outer_wall": { "value": true },
"wall_0_material_flow": { "value": "0.95 * material_flow" },
"wall_0_wipe_dist": { "value": 0.0 },
"wall_thickness": { "value": "line_width * 2" },
"z_seam_corner": { "value": "'z_seam_corner_none'" },
"z_seam_type": { "value": "'back'" }
}
}

1
resources/definitions/mingda_d2.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_d2_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
-205,
-77,

1
resources/definitions/mingda_d3pro.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_rock3_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
-179,
-108,

1
resources/definitions/mingda_d4pro.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_d4pro_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
-177,
-140,

1
resources/definitions/mingda_magician_max.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_magician_max_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
0,
0,

1
resources/definitions/mingda_magician_maxplus.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_magician_max_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
0,
0,

1
resources/definitions/mingda_magician_pro.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_magician_pro_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
0,
0,

1
resources/definitions/mingda_magician_proplus.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_magician_pro_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
0,
0,

1
resources/definitions/mingda_magician_x.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_magician_x_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
0,
0,

1
resources/definitions/mingda_magician_xplus.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_magician_x2_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"quality_definition": "mingda_base"
},
"overrides":

1
resources/definitions/mingda_rock3.def.json
View File

@ -6,6 +6,7 @@
{
"visible": true,
"platform": "mingda_rock3_base.stl",
"machine_extruder_trains": { "0": "mingda_base_extruder_0" },
"platform_offset": [
-179,
-108,

22
resources/extruders/mingda_base_extruder_1.def.json Normal file
View File

@ -0,0 +1,22 @@
{
"version": 2,
"name": "Extruder 2",
"inherits": "fdmextruder",
"metadata":
{
"machine": "mingda_base",
"position": "1"
},
"overrides":
{
"extruder_nr":
{
"default_value": 1,
"maximum_value": "3"
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.5 },
"material_diameter": { "default_value": 1.75 }
}
}