diff --git a/resources/definitions/mingda_1000pro.def.json b/resources/definitions/mingda_1000pro.def.json index fefa0834a1..d702d8ce33 100644 --- a/resources/definitions/mingda_1000pro.def.json +++ b/resources/definitions/mingda_1000pro.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_1000pro_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "quality_definition": "mingda_base" }, "overrides": diff --git a/resources/definitions/mingda_1000proplus.def.json b/resources/definitions/mingda_1000proplus.def.json index 6d2c120c1d..d3b1378ed9 100644 --- a/resources/definitions/mingda_1000proplus.def.json +++ b/resources/definitions/mingda_1000proplus.def.json @@ -1,7 +1,7 @@ { "version": 3, "name": "Mingda 1000Pro+", - "inherits": "mingda_base", + "inherits": "mingda_base_dual", "metadata": { "visible": true, diff --git a/resources/definitions/mingda_400d.def.json b/resources/definitions/mingda_400d.def.json index 9ca01f02ea..583a06ba28 100644 --- a/resources/definitions/mingda_400d.def.json +++ b/resources/definitions/mingda_400d.def.json @@ -1,7 +1,7 @@ { "version": 3, "name": "Mingda 400D", - "inherits": "mingda_base", + "inherits": "mingda_base_dual", "metadata": { "visible": true, diff --git a/resources/definitions/mingda_4h.def.json b/resources/definitions/mingda_4h.def.json index 9105bda580..b1a61e439a 100644 --- a/resources/definitions/mingda_4h.def.json +++ b/resources/definitions/mingda_4h.def.json @@ -5,7 +5,6 @@ "metadata": { "visible": true, - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "quality_definition": "mingda_base" }, "overrides": diff --git a/resources/definitions/mingda_600pro.def.json b/resources/definitions/mingda_600pro.def.json index 5f1b967eb6..8a358df604 100644 --- a/resources/definitions/mingda_600pro.def.json +++ b/resources/definitions/mingda_600pro.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_600pro_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "quality_definition": "mingda_base" }, "overrides": diff --git a/resources/definitions/mingda_600proplus.def.json b/resources/definitions/mingda_600proplus.def.json index e1c9dfbb28..f9cfe0d94b 100644 --- a/resources/definitions/mingda_600proplus.def.json +++ b/resources/definitions/mingda_600proplus.def.json @@ -1,7 +1,7 @@ { "version": 3, "name": "Mingda 600Pro+", - "inherits": "mingda_base", + "inherits": "mingda_base_dual", "metadata": { "visible": true, diff --git a/resources/definitions/mingda_6h.def.json b/resources/definitions/mingda_6h.def.json index 902cbc8a07..a3e09806e4 100644 --- a/resources/definitions/mingda_6h.def.json +++ b/resources/definitions/mingda_6h.def.json @@ -5,7 +5,6 @@ "metadata": { "visible": true, - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "quality_definition": "mingda_base" }, "overrides": diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index f19cbf812f..3384675c98 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -18,11 +18,7 @@ "has_machine_quality": true, "has_materials": true, "has_variants": true, - "machine_extruder_trains": - { - "0": "mingda_base_extruder_0", - "1": "mingda_base_extruder_1" - }, + "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "preferred_material": "generic_pla", "preferred_quality_type": "standard", "preferred_variant_name": "0.4mm Nozzle", diff --git a/resources/definitions/mingda_base_dual.json b/resources/definitions/mingda_base_dual.json new file mode 100644 index 0000000000..ab92f898a6 --- /dev/null +++ b/resources/definitions/mingda_base_dual.json @@ -0,0 +1,143 @@ +{ + "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_extruder_0", + "1": "mingda_base_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'" } + } +} \ No newline at end of file diff --git a/resources/definitions/mingda_d2.def.json b/resources/definitions/mingda_d2.def.json index c24011342e..3163d583db 100644 --- a/resources/definitions/mingda_d2.def.json +++ b/resources/definitions/mingda_d2.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_d2_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ -205, -77, diff --git a/resources/definitions/mingda_d3pro.def.json b/resources/definitions/mingda_d3pro.def.json index 96d14e3056..9dbd725240 100644 --- a/resources/definitions/mingda_d3pro.def.json +++ b/resources/definitions/mingda_d3pro.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_rock3_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ -179, -108, diff --git a/resources/definitions/mingda_d4pro.def.json b/resources/definitions/mingda_d4pro.def.json index f7631c621d..15cd50e15e 100644 --- a/resources/definitions/mingda_d4pro.def.json +++ b/resources/definitions/mingda_d4pro.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_d4pro_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ -177, -140, diff --git a/resources/definitions/mingda_magician_max.def.json b/resources/definitions/mingda_magician_max.def.json index 9fa6c95771..01046829ad 100644 --- a/resources/definitions/mingda_magician_max.def.json +++ b/resources/definitions/mingda_magician_max.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_magician_max_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ 0, 0, diff --git a/resources/definitions/mingda_magician_maxplus.def.json b/resources/definitions/mingda_magician_maxplus.def.json index 1a2eaa08b3..27a9c139b4 100644 --- a/resources/definitions/mingda_magician_maxplus.def.json +++ b/resources/definitions/mingda_magician_maxplus.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_magician_max_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ 0, 0, diff --git a/resources/definitions/mingda_magician_pro.def.json b/resources/definitions/mingda_magician_pro.def.json index 904f4ed554..cde70fd272 100644 --- a/resources/definitions/mingda_magician_pro.def.json +++ b/resources/definitions/mingda_magician_pro.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_magician_pro_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ 0, 0, diff --git a/resources/definitions/mingda_magician_proplus.def.json b/resources/definitions/mingda_magician_proplus.def.json index 2b5d02342d..e1a5af8744 100644 --- a/resources/definitions/mingda_magician_proplus.def.json +++ b/resources/definitions/mingda_magician_proplus.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_magician_pro_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ 0, 0, diff --git a/resources/definitions/mingda_magician_x.def.json b/resources/definitions/mingda_magician_x.def.json index ace721479f..4ce6678410 100644 --- a/resources/definitions/mingda_magician_x.def.json +++ b/resources/definitions/mingda_magician_x.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_magician_x_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ 0, 0, diff --git a/resources/definitions/mingda_magician_xplus.def.json b/resources/definitions/mingda_magician_xplus.def.json index cd0974f13e..d839c2b23a 100644 --- a/resources/definitions/mingda_magician_xplus.def.json +++ b/resources/definitions/mingda_magician_xplus.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_magician_x2_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "quality_definition": "mingda_base" }, "overrides": diff --git a/resources/definitions/mingda_rock3.def.json b/resources/definitions/mingda_rock3.def.json index 1e4fd9cdd7..7b749da9ae 100644 --- a/resources/definitions/mingda_rock3.def.json +++ b/resources/definitions/mingda_rock3.def.json @@ -6,7 +6,6 @@ { "visible": true, "platform": "mingda_rock3_base.stl", - "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, "platform_offset": [ -179, -108,