From a98983882393a3d1783685e5c3725943a3308336 Mon Sep 17 00:00:00 2001 From: jeffkyjin Date: Tue, 4 Feb 2020 14:39:51 +0800 Subject: [PATCH 1/4] Add MBot3D Grid Printers --- .../definitions/mbot3d_grid2plus.def.json | 60 ++++ .../mbot3d_grid2plus_dual.def.json | 60 ++++ resources/definitions/mbot3d_grid4.def.json | 318 ++++++++++++++++++ .../definitions/mbot3d_grid4_dual.def.json | 237 +++++++++++++ .../mbot3d_grid2_extruder_0.def.json | 16 + .../mbot3d_grid2_extruder_left.def.json | 28 ++ .../mbot3d_grid2_extruder_right.def.json | 28 ++ .../mbot3d_grid4_extruder_0.def.json | 18 + .../mbot3d_grid4_extruder_left.def.json | 28 ++ .../mbot3d_grid4_extruder_right.def.json | 28 ++ 10 files changed, 821 insertions(+) create mode 100644 resources/definitions/mbot3d_grid2plus.def.json create mode 100644 resources/definitions/mbot3d_grid2plus_dual.def.json create mode 100644 resources/definitions/mbot3d_grid4.def.json create mode 100644 resources/definitions/mbot3d_grid4_dual.def.json create mode 100644 resources/extruders/mbot3d_grid2_extruder_0.def.json create mode 100644 resources/extruders/mbot3d_grid2_extruder_left.def.json create mode 100644 resources/extruders/mbot3d_grid2_extruder_right.def.json create mode 100644 resources/extruders/mbot3d_grid4_extruder_0.def.json create mode 100644 resources/extruders/mbot3d_grid4_extruder_left.def.json create mode 100644 resources/extruders/mbot3d_grid4_extruder_right.def.json diff --git a/resources/definitions/mbot3d_grid2plus.def.json b/resources/definitions/mbot3d_grid2plus.def.json new file mode 100644 index 0000000000..60d349dc76 --- /dev/null +++ b/resources/definitions/mbot3d_grid2plus.def.json @@ -0,0 +1,60 @@ +{ + "name": "MBot3D Grid 2+", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Magicfirm", + "manufacturer": "Magicfirm", + "file_formats": "application/x3g", + "machine_x3g_variant": "r1", + "has_machine_quality": true, + "preferred_quality_type": "normal", + "machine_extruder_trains": + { + "0": "mbot3d_grid2_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "MBot3D Grid 2+" }, + "machine_start_gcode": { + "default_value": "M136\nG162 X Y F2000\nG161 Z F900\nG92 X0 Y0 Z-5 A0 B0\nG1 Z0.0 F900\nG161 Z F100\nM132 X Y Z A B\nG1 X125 Y115 Z10 F450\nG1 X0 Y115 Z10 F2000.0\nM133 T0\nG1 X20 Y115 Z0.5 F800\nG1 X0 Y115 Z0.5 F600 A12\nG92 A0\n" + }, + "machine_end_gcode": { + "default_value": "M18 A B(Turn off A and B steppers)\nG1 Z190 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM104 S0 T0\nM72 P1 ( Play Ta-Da song )\nM73 P100 (end build progress )\nM137 (build end)\n" + }, + "machine_width": { "default_value": 235 }, + "machine_depth": { "default_value": 210 }, + "machine_height": { "default_value": 190 }, + "material_print_temperature": { "default_value": 220 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "Makerbot" }, + "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] }, + "gantry_height": { "default_value": 10 }, + "machine_steps_per_mm_x": { "default_value": 88.888889 }, + "machine_steps_per_mm_y": { "default_value": 88.888889 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, + "retraction_amount": { "default_value": 0.7 }, + "retraction_speed": { "default_value": 15 }, + "speed_print": { "default_value": 50 }, + "speed_wall": { "value": 25 }, + "speed_wall_x": { "value": 35 }, + "speed_travel": { "value": 80 }, + "speed_layer_0": { "value": 15 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "default_value": 0.8 }, + "support_interface_density": { "default_value": 80 }, + "support_interface_pattern": { "default_value": "grid" }, + "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "retract_at_layer_change": { "default_value": true }, + "travel_retract_before_outer_wall": { "default_value": true }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "travel_avoid_other_parts": { "default_value": false }, + "raft_airgap": { "default_value": 0.15 }, + "raft_margin": { "default_value": 6 } + } +} diff --git a/resources/definitions/mbot3d_grid2plus_dual.def.json b/resources/definitions/mbot3d_grid2plus_dual.def.json new file mode 100644 index 0000000000..5487a73e57 --- /dev/null +++ b/resources/definitions/mbot3d_grid2plus_dual.def.json @@ -0,0 +1,60 @@ +{ + "name": "MBot3D Grid 2+ Dual", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Magicfirm", + "manufacturer": "Magicfirm", + "file_formats": "application/x3g", + "has_machine_quality": true, + "preferred_quality_type": "normal", + "machine_x3g_variant": "z", + "machine_extruder_trains": + { + "0": "mbot3d_grid2_extruder_left", + "1": "mbot3d_grid2_extruder_right" + } + }, + + "overrides": { + "machine_name": { "default_value": "MBot3D Grid 2+ Dual" }, + "machine_start_gcode": { + "default_value": "M136\nG162 X Y F2000\nG161 Z F900\nG92 X0 Y0 Z-5 A0 B0\nG1 Z0.0 F900\nG161 Z F100\nM132 X Y Z A B\nG1 X125 Y115 Z10 F450\nG1 X0 Y115 Z10 F2000.0\nM133 T0\nG1 X20 Y115 Z0.5 F800\nG1 X0 Y115 Z0.5 F600 A12\nG92 A0\n" + }, + "machine_end_gcode": { + "default_value": "M18 A B(Turn off A and B steppers)\nG1 Z190 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM104 S0 T0\nM72 P1 ( Play Ta-Da song )\nM73 P100 (end build progress )\nM137 (build end)\n" + }, + "machine_width": { "default_value": 235 }, + "machine_depth": { "default_value": 210 }, + "machine_height": { "default_value": 190 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_center_is_zero": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "Makerbot" }, + "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] }, + "gantry_height": { "default_value": 10 }, + "machine_steps_per_mm_x": { "default_value": 88.888889 }, + "machine_steps_per_mm_y": { "default_value": 88.888889 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, + "retraction_amount": { "default_value": 0.7 }, + "retraction_speed": { "default_value": 15 }, + "speed_print": { "default_value": 50 }, + "speed_wall": { "value": 25 }, + "speed_wall_x": { "value": 35 }, + "speed_travel": { "value": 80 }, + "speed_layer_0": { "value": 15 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "default_value": 0.8 }, + "support_interface_density": { "default_value": 80 }, + "support_interface_pattern": { "default_value": "grid" }, + "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "retract_at_layer_change": { "default_value": true }, + "travel_retract_before_outer_wall": { "default_value": true }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "travel_avoid_other_parts": { "default_value": false }, + "raft_airgap": { "default_value": 0.15 }, + "raft_margin": { "default_value": 6 } + } +} diff --git a/resources/definitions/mbot3d_grid4.def.json b/resources/definitions/mbot3d_grid4.def.json new file mode 100644 index 0000000000..0275615e15 --- /dev/null +++ b/resources/definitions/mbot3d_grid4.def.json @@ -0,0 +1,318 @@ +{ + "version": 2, + "name": "MBot3D Grid 4", + "inherits": "fdmprinter", + "metadata": { + "author": "Magicfirm", + "manufacturer": "Magicfirm", + "category": "Other", + "visible": true, + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "has_materials": true, + "machine_extruder_trains": + { + "0": "mbot3d_grid4_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "MBot3D Grid 4" + }, + "machine_width": { + "default_value": 235 + }, + "machine_depth": { + "default_value": 210 + }, + "machine_height": { + "default_value": 200 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_extruder_count": { + "default_value": 1 + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_flow": { + "default_value": 100 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_print_temperature": { + "default_value": 200 + }, + "material_print_temperature_layer_0": { + "default_value": 210 + }, + "material_print_temp_wait":{ + "default_value": true + }, + "material_bed_temperature": { + "default_value": 50 + }, + "material_bed_temperature_layer_0": { + "default_value": 50 + }, + "material_bed_temp_wait":{ + "default_value": false + }, + "layer_height": { + "default_value": 0.2 + }, + "layer_height_0": { + "default_value": 0.3 + }, + "initial_layer_line_width_factor":{ + "default_value": 150 + }, + "adhesion_type":{ + "default_value": "skirt" + }, + "brim_line_count":{ + "default_value": 3 + }, + "wall_line_count":{ + "default_value": 2 + }, + "infill_pattern": { + "default_value": "lines" + }, + "infill_line_distance": { + "default_value": 2.66 + }, + "infill_before_walls": { + "default_value": false + }, + "top_layers":{ + "default_value": 5 + }, + "roofing_layer_count":{ + "default_value": 0 + }, + "bottom_layers":{ + "default_value": 4 + }, + "raft_margin": { + "default_value": 5.0 + }, + "raft_airgap":{ + "default_value": 0.2 + }, + "raft_base_line_spacing": { + "default_value": 3.0 + }, + "raft_base_line_width": { + "default_value": 2.0 + }, + "raft_base_thickness": { + "default_value": 0.3 + }, + "raft_interface_line_spacing": { + "default_value": 3.0 + }, + "raft_interface_thickness": { + "default_value": 0.27 + }, + "raft_surface_layers": { + "default_value": 2 + }, + "raft_surface_line_spacing": { + "default_value": 0.4 + }, + "raft_surface_thickness": { + "default_value": 0.2 + }, + "cool_fan_enabled": { + "default_value": true + }, + "cool_fan_speed_min": { + "default_value": 40 + }, + "cool_fan_speed_max": { + "default_value": 80 + }, + "cool_min_layer_time_fan_speed_max": { + "default_value": 20 + }, + "cool_fan_full_layer": { + "default_value": 5 + }, + "cool_min_layer_time": { + "default_value": 5 + }, + "cool_min_speed": { + "default_value": 5 + }, + "machine_max_feedrate_x": { + "default_value": 300 + }, + "machine_max_feedrate_y": { + "default_value": 300 + }, + "machine_max_feedrate_z": { + "default_value": 40 + }, + "machine_max_feedrate_e": { + "default_value": 60 + }, + "speed_infill":{ + "default_value": 80 + }, + "speed_print_layer_0": { + "default_value": 15 + }, + "speed_travel_layer_0": { + "default_value": 60 + }, + "skirt_brim_speed": { + "default_value": 20 + }, + "speed_travel": { + "default_value": 120 + }, + "speed_support_infill": { + "default_value": 60 + }, + "speed_support_roof": { + "default_value": 45 + }, + "speed_support_bottom": { + "default_value": 45 + }, + "speed_topbottom": { + "default_value":60 + }, + "speed_wall_0": { + "default_value": 20 + }, + "speed_wall_x": { + "default_value": 50 + }, + "raft_base_speed":{ + "default_value": 15 + }, + "raft_interface_speed":{ + "default_value": 60 + }, + "raft_surface_speed":{ + "default_value": 45 + }, + "jerk_enabled": { + "default_value": true + }, + "jerk_infill":{ + "default_value": 25 + }, + "jerk_print_layer_0": { + "default_value": 5 + }, + "jerk_travel_layer_0": { + "default_value": 5 + }, + "jerk_wall_x": { + "default_value": 10 + }, + "jerk_wall_0": { + "default_value": 5 + }, + "jerk_topbottom": { + "default_value": 10 + }, + "jerk_support_infill": { + "default_value": 15 + }, + "jerk_support_roof": { + "default_value": 5 + }, + "jerk_support_bottom": { + "default_value": 5 + }, + "retraction_enable": { + "default_value": true + }, + "retraction_retract_speed": { + "default_value": 60 + }, + "retraction_prime_speed": { + "default_value": 60 + }, + "retraction_amount": { + "default_value": 2 + }, + "retraction_extra_prime_amount": { + "default_value": 0 + }, + "retraction_hop_enabled": { + "default_value": true + }, + "retraction_hop": { + "default_value": 0.5 + }, + "retraction_min_travel": { + "default_value": 2 + }, + "support_enable": { + "default_value": false + }, + "support_angle": { + "default_value": 60 + }, + "support_pattern": { + "default_value": "zigzag" + }, + "support_line_distance":{ + "default_value": 2.66 + }, + "support_roof_enable": { + "default_value": true + }, + "support_bottom_enable": { + "default_value": true + }, + "support_roof_height": { + "default_value": 0.6 + }, + "support_bottom_height": { + "default_value": 0.6 + }, + "support_top_distance": { + "default_value": 0.2 + }, + "support_bottom_distance": { + "default_value": 0.2 + }, + "z_seam_type": { + "default_value": "shortest" + }, + "z_seam_corner":{ + "default_value": "z_seam_corner_inner" + }, + "wall_0_wipe_dist":{ + "default_value": 0 + }, + "xy_offset": { + "default_value": 0.05 + }, + "machine_start_gcode": { + "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y ;home X Y axes\nM84 ; disable motors" + } + } +} \ No newline at end of file diff --git a/resources/definitions/mbot3d_grid4_dual.def.json b/resources/definitions/mbot3d_grid4_dual.def.json new file mode 100644 index 0000000000..52afdd6347 --- /dev/null +++ b/resources/definitions/mbot3d_grid4_dual.def.json @@ -0,0 +1,237 @@ +{ + "version": 2, + "name": "MBot3D Grid 4 Dual", + "inherits": "fdmprinter", + "metadata": { + "author": "Magicfirm", + "manufacturer": "Magicfirm", + "category": "Other", + "visible": true, + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "has_materials": true, + "machine_extruder_trains": { + "0": "mbot3d_grid4_extruder_left", + "1": "mbot3d_grid4_extruder_right" + } + }, + "overrides": { + "machine_name": { + "default_value": "MBot3D Grid 4 Dual" + }, + "machine_width": { + "default_value": 210 + }, + "machine_depth": { + "default_value": 210 + }, + "machine_height": { + "default_value": 200 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_flow": { + "default_value": 95 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_max_feedrate_x": { + "default_value": 300 + }, + "machine_max_feedrate_y": { + "default_value": 300 + }, + "machine_max_feedrate_z": { + "default_value": 40 + }, + "machine_max_feedrate_e": { + "default_value": 60 + }, + "layer_height": { + "default_value": 0.2 + }, + "layer_height_0": { + "default_value": 0.25 + }, + "brim_line_count":{ + "default_value": 3 + }, + "adhesion_type":{ + "default_value": "skirt" + }, + "wall_line_count":{ + "default_value": 3 + }, + "cool_fan_enabled": { + "default_value": true + }, + "cool_fan_speed_min": { + "default_value": 50 + }, + "cool_fan_speed_max": { + "default_value": 80 + }, + "cool_fan_full_layer": { + "default_value": 5 + }, + "cool_min_speed": { + "default_value": 5 + }, + "infill_line_distance": { + "default_value": 2 + }, + "infill_pattern": { + "default_value": "lines" + }, + "top_layers":{ + "default_value": 4 + }, + "bottom_layers":{ + "default_value": 3 + }, + "material_print_temperature": { + "default_value": 200 + }, + "material_print_temperature_layer_0": { + "default_value": 210 + }, + "material_print_temp_wait":{ + "default_value": true + }, + "material_bed_temperature": { + "default_value": 45 + }, + "material_bed_temperature_layer_0": { + "default_value": 45 + }, + "material_bed_temp_wait":{ + "default_value": false + }, + "retraction_enable": { + "default_value": true + }, + "retraction_retract_speed": { + "default_value": 45 + }, + "retraction_prime_speed": { + "default_value": 45 + }, + "retraction_amount": { + "default_value": 5 + }, + "retraction_hop_enabled": { + "default_value": true + }, + "retraction_hop": { + "default_value": 0.4 + }, + "speed_infill":{ + "default_value": 60 + }, + "speed_print_layer_0": { + "default_value": 10 + }, + "skirt_brim_speed": { + "default_value": 15 + }, + "speed_travel": { + "default_value": 100 + }, + "speed_support_infill": { + "default_value": 60 + }, + "speed_support_roof": { + "default_value": 25 + }, + "speed_support_bottom": { + "default_value": 45 + }, + "support_line_distance": { + "default_value": 2.66 + }, + "speed_topbottom": { + "default_value":25 + }, + "speed_wall_0": { + "default_value": 15 + }, + "speed_wall_x": { + "default_value": 30 + }, + "support_enable": { + "default_value": true + }, + "support_infill_extruder_nr":{ + "default_value": 1 + }, + "support_extruder_nr_layer_0":{ + "default_value": 1 + }, + "support_roof_extruder_nr":{ + "default_value": 1 + }, + "support_bottom_extruder_nr":{ + "default_value": 1 + }, + "support_angle": { + "default_value": 60 + }, + "support_pattern": { + "default_value": "zigzag" + }, + "support_roof_enable": { + "default_value": true + }, + "support_bottom_enable": { + "default_value": true + }, + "support_roof_height": { + "default_value": 0.6 + }, + "support_bottom_height": { + "default_value": 0.6 + }, + "support_top_distance": { + "default_value": 0.1 + }, + "support_bottom_distance": { + "default_value": 0.1 + }, + "z_seam_type": { + "default_value": "back" + }, + "wall_0_wipe_dist":{ + "default_value": 0 + }, + "z_seam_x":{ + "default_value": 0 + }, + "z_seam_y":{ + "default_value": 210 + }, + "xy_offset": { + "default_value": 0.05 + }, + "machine_start_gcode": { + "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y ;home X Y axes\nM84 ; disable motors" + } + } +} \ No newline at end of file diff --git a/resources/extruders/mbot3d_grid2_extruder_0.def.json b/resources/extruders/mbot3d_grid2_extruder_0.def.json new file mode 100644 index 0000000000..53cf86109b --- /dev/null +++ b/resources/extruders/mbot3d_grid2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "mbot3d_grid2_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "mbot3d_grid2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/mbot3d_grid2_extruder_left.def.json b/resources/extruders/mbot3d_grid2_extruder_left.def.json new file mode 100644 index 0000000000..faa4065673 --- /dev/null +++ b/resources/extruders/mbot3d_grid2_extruder_left.def.json @@ -0,0 +1,28 @@ +{ + "id": "mbot3d_grid2_extruder_left", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "mbot3d_grid2_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 200 }, + "machine_extruder_start_pos_y": { "default_value": 200 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 200 }, + "machine_extruder_end_pos_y": { "default_value": 200 } + } +} diff --git a/resources/extruders/mbot3d_grid2_extruder_right.def.json b/resources/extruders/mbot3d_grid2_extruder_right.def.json new file mode 100644 index 0000000000..9f0a66e8af --- /dev/null +++ b/resources/extruders/mbot3d_grid2_extruder_right.def.json @@ -0,0 +1,28 @@ +{ + "id": "mbot3d_grid2_extruder_right", + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "mbot3d_grid2_dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 200 }, + "machine_extruder_start_pos_y": { "default_value": 200 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 200 }, + "machine_extruder_end_pos_y": { "default_value": 200 } + } +} diff --git a/resources/extruders/mbot3d_grid4_extruder_0.def.json b/resources/extruders/mbot3d_grid4_extruder_0.def.json new file mode 100644 index 0000000000..c7897e1d32 --- /dev/null +++ b/resources/extruders/mbot3d_grid4_extruder_0.def.json @@ -0,0 +1,18 @@ +{ + "id": "mbot3d_grid4_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "mbot3d_grid4", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/mbot3d_grid4_extruder_left.def.json b/resources/extruders/mbot3d_grid4_extruder_left.def.json new file mode 100644 index 0000000000..191e1a0f2c --- /dev/null +++ b/resources/extruders/mbot3d_grid4_extruder_left.def.json @@ -0,0 +1,28 @@ +{ + "id": "mbot3d_grid4_extruder_left", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "mbot3d_grid4_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 200 }, + "machine_extruder_start_pos_y": { "default_value": 200 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 200 }, + "machine_extruder_end_pos_y": { "default_value": 200 } + } +} diff --git a/resources/extruders/mbot3d_grid4_extruder_right.def.json b/resources/extruders/mbot3d_grid4_extruder_right.def.json new file mode 100644 index 0000000000..23d00131db --- /dev/null +++ b/resources/extruders/mbot3d_grid4_extruder_right.def.json @@ -0,0 +1,28 @@ +{ + "id": "mbot3d_grid4_extruder_right", + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "mbot3d_grid4_dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 200 }, + "machine_extruder_start_pos_y": { "default_value": 200 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 200 }, + "machine_extruder_end_pos_y": { "default_value": 200 } + } +} From b3681eacf21dc2aeb4223eea5930d9717ce11ea4 Mon Sep 17 00:00:00 2001 From: jeffkyjin Date: Wed, 5 Feb 2020 17:33:54 +0800 Subject: [PATCH 2/4] modify grid 4 def --- resources/definitions/mbot3d_grid4.def.json | 265 +----------------- .../definitions/mbot3d_grid4_dual.def.json | 199 +------------ 2 files changed, 13 insertions(+), 451 deletions(-) diff --git a/resources/definitions/mbot3d_grid4.def.json b/resources/definitions/mbot3d_grid4.def.json index 0275615e15..a895415dda 100644 --- a/resources/definitions/mbot3d_grid4.def.json +++ b/resources/definitions/mbot3d_grid4.def.json @@ -30,7 +30,7 @@ "default_value": 210 }, "machine_height": { - "default_value": 200 + "default_value": 190 }, "machine_heated_bed": { "default_value": true @@ -41,273 +41,12 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_extruder_count": { - "default_value": 1 - }, - "material_diameter": { - "default_value": 1.75 - }, "material_flow": { "default_value": 100 }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_print_temperature": { - "default_value": 200 - }, - "material_print_temperature_layer_0": { - "default_value": 210 - }, - "material_print_temp_wait":{ - "default_value": true - }, - "material_bed_temperature": { - "default_value": 50 - }, - "material_bed_temperature_layer_0": { - "default_value": 50 - }, - "material_bed_temp_wait":{ - "default_value": false - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.3 - }, - "initial_layer_line_width_factor":{ - "default_value": 150 - }, - "adhesion_type":{ + "adhesion_type": { "default_value": "skirt" - }, - "brim_line_count":{ - "default_value": 3 - }, - "wall_line_count":{ - "default_value": 2 - }, - "infill_pattern": { - "default_value": "lines" - }, - "infill_line_distance": { - "default_value": 2.66 - }, - "infill_before_walls": { - "default_value": false - }, - "top_layers":{ - "default_value": 5 - }, - "roofing_layer_count":{ - "default_value": 0 }, - "bottom_layers":{ - "default_value": 4 - }, - "raft_margin": { - "default_value": 5.0 - }, - "raft_airgap":{ - "default_value": 0.2 - }, - "raft_base_line_spacing": { - "default_value": 3.0 - }, - "raft_base_line_width": { - "default_value": 2.0 - }, - "raft_base_thickness": { - "default_value": 0.3 - }, - "raft_interface_line_spacing": { - "default_value": 3.0 - }, - "raft_interface_thickness": { - "default_value": 0.27 - }, - "raft_surface_layers": { - "default_value": 2 - }, - "raft_surface_line_spacing": { - "default_value": 0.4 - }, - "raft_surface_thickness": { - "default_value": 0.2 - }, - "cool_fan_enabled": { - "default_value": true - }, - "cool_fan_speed_min": { - "default_value": 40 - }, - "cool_fan_speed_max": { - "default_value": 80 - }, - "cool_min_layer_time_fan_speed_max": { - "default_value": 20 - }, - "cool_fan_full_layer": { - "default_value": 5 - }, - "cool_min_layer_time": { - "default_value": 5 - }, - "cool_min_speed": { - "default_value": 5 - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 40 - }, - "machine_max_feedrate_e": { - "default_value": 60 - }, - "speed_infill":{ - "default_value": 80 - }, - "speed_print_layer_0": { - "default_value": 15 - }, - "speed_travel_layer_0": { - "default_value": 60 - }, - "skirt_brim_speed": { - "default_value": 20 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_support_infill": { - "default_value": 60 - }, - "speed_support_roof": { - "default_value": 45 - }, - "speed_support_bottom": { - "default_value": 45 - }, - "speed_topbottom": { - "default_value":60 - }, - "speed_wall_0": { - "default_value": 20 - }, - "speed_wall_x": { - "default_value": 50 - }, - "raft_base_speed":{ - "default_value": 15 - }, - "raft_interface_speed":{ - "default_value": 60 - }, - "raft_surface_speed":{ - "default_value": 45 - }, - "jerk_enabled": { - "default_value": true - }, - "jerk_infill":{ - "default_value": 25 - }, - "jerk_print_layer_0": { - "default_value": 5 - }, - "jerk_travel_layer_0": { - "default_value": 5 - }, - "jerk_wall_x": { - "default_value": 10 - }, - "jerk_wall_0": { - "default_value": 5 - }, - "jerk_topbottom": { - "default_value": 10 - }, - "jerk_support_infill": { - "default_value": 15 - }, - "jerk_support_roof": { - "default_value": 5 - }, - "jerk_support_bottom": { - "default_value": 5 - }, - "retraction_enable": { - "default_value": true - }, - "retraction_retract_speed": { - "default_value": 60 - }, - "retraction_prime_speed": { - "default_value": 60 - }, - "retraction_amount": { - "default_value": 2 - }, - "retraction_extra_prime_amount": { - "default_value": 0 - }, - "retraction_hop_enabled": { - "default_value": true - }, - "retraction_hop": { - "default_value": 0.5 - }, - "retraction_min_travel": { - "default_value": 2 - }, - "support_enable": { - "default_value": false - }, - "support_angle": { - "default_value": 60 - }, - "support_pattern": { - "default_value": "zigzag" - }, - "support_line_distance":{ - "default_value": 2.66 - }, - "support_roof_enable": { - "default_value": true - }, - "support_bottom_enable": { - "default_value": true - }, - "support_roof_height": { - "default_value": 0.6 - }, - "support_bottom_height": { - "default_value": 0.6 - }, - "support_top_distance": { - "default_value": 0.2 - }, - "support_bottom_distance": { - "default_value": 0.2 - }, - "z_seam_type": { - "default_value": "shortest" - }, - "z_seam_corner":{ - "default_value": "z_seam_corner_inner" - }, - "wall_0_wipe_dist":{ - "default_value": 0 - }, - "xy_offset": { - "default_value": 0.05 - }, "machine_start_gcode": { "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n" }, diff --git a/resources/definitions/mbot3d_grid4_dual.def.json b/resources/definitions/mbot3d_grid4_dual.def.json index 52afdd6347..d32590ff3e 100644 --- a/resources/definitions/mbot3d_grid4_dual.def.json +++ b/resources/definitions/mbot3d_grid4_dual.def.json @@ -30,208 +30,31 @@ "default_value": 210 }, "machine_height": { - "default_value": 200 + "default_value": 190 }, "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { + "default_value": false + }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_extruder_count": { "default_value": 2 }, - "material_diameter": { - "default_value": 1.75 - }, "material_flow": { - "default_value": 95 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 40 - }, - "machine_max_feedrate_e": { - "default_value": 60 - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.25 - }, - "brim_line_count":{ - "default_value": 3 - }, - "adhesion_type":{ - "default_value": "skirt" - }, - "wall_line_count":{ - "default_value": 3 - }, - "cool_fan_enabled": { - "default_value": true - }, - "cool_fan_speed_min": { - "default_value": 50 - }, - "cool_fan_speed_max": { - "default_value": 80 - }, - "cool_fan_full_layer": { - "default_value": 5 - }, - "cool_min_speed": { - "default_value": 5 - }, - "infill_line_distance": { - "default_value": 2 - }, - "infill_pattern": { - "default_value": "lines" - }, - "top_layers":{ - "default_value": 4 - }, - "bottom_layers":{ - "default_value": 3 - }, - "material_print_temperature": { - "default_value": 200 - }, - "material_print_temperature_layer_0": { - "default_value": 210 - }, - "material_print_temp_wait":{ - "default_value": true - }, - "material_bed_temperature": { - "default_value": 45 - }, - "material_bed_temperature_layer_0": { - "default_value": 45 - }, - "material_bed_temp_wait":{ - "default_value": false - }, - "retraction_enable": { - "default_value": true - }, - "retraction_retract_speed": { - "default_value": 45 - }, - "retraction_prime_speed": { - "default_value": 45 - }, - "retraction_amount": { - "default_value": 5 - }, - "retraction_hop_enabled": { - "default_value": true - }, - "retraction_hop": { - "default_value": 0.4 - }, - "speed_infill":{ - "default_value": 60 - }, - "speed_print_layer_0": { - "default_value": 10 - }, - "skirt_brim_speed": { - "default_value": 15 - }, - "speed_travel": { "default_value": 100 }, - "speed_support_infill": { - "default_value": 60 - }, - "speed_support_roof": { - "default_value": 25 - }, - "speed_support_bottom": { - "default_value": 45 - }, - "support_line_distance": { - "default_value": 2.66 - }, - "speed_topbottom": { - "default_value":25 - }, - "speed_wall_0": { - "default_value": 15 - }, - "speed_wall_x": { - "default_value": 30 - }, - "support_enable": { - "default_value": true - }, - "support_infill_extruder_nr":{ - "default_value": 1 - }, - "support_extruder_nr_layer_0":{ - "default_value": 1 - }, - "support_roof_extruder_nr":{ - "default_value": 1 - }, - "support_bottom_extruder_nr":{ - "default_value": 1 - }, - "support_angle": { - "default_value": 60 - }, - "support_pattern": { - "default_value": "zigzag" - }, - "support_roof_enable": { - "default_value": true - }, - "support_bottom_enable": { - "default_value": true - }, - "support_roof_height": { - "default_value": 0.6 - }, - "support_bottom_height": { - "default_value": 0.6 - }, - "support_top_distance": { - "default_value": 0.1 - }, - "support_bottom_distance": { - "default_value": 0.1 - }, - "z_seam_type": { - "default_value": "back" - }, - "wall_0_wipe_dist":{ - "default_value": 0 - }, - "z_seam_x":{ - "default_value": 0 - }, - "z_seam_y":{ - "default_value": 210 - }, - "xy_offset": { - "default_value": 0.05 - }, - "machine_start_gcode": { + "adhesion_type": { + "default_value": "skirt" + }, + "machine_start_gcode": { "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n" - }, - "machine_end_gcode": { + }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y ;home X Y axes\nM84 ; disable motors" - } + } } } \ No newline at end of file From 1e88708b1dd08eee049732d2095a0dc6ea6d7485 Mon Sep 17 00:00:00 2001 From: jeffkyjin Date: Wed, 5 Feb 2020 18:04:32 +0800 Subject: [PATCH 3/4] fix mbot3d grid printer profile --- resources/definitions/mbot3d_grid2plus.def.json | 3 +-- resources/definitions/mbot3d_grid2plus_dual.def.json | 2 +- resources/extruders/mbot3d_grid2_extruder_0.def.json | 3 +-- resources/extruders/mbot3d_grid2_extruder_left.def.json | 3 +-- resources/extruders/mbot3d_grid2_extruder_right.def.json | 3 +-- resources/extruders/mbot3d_grid4_extruder_0.def.json | 1 - resources/extruders/mbot3d_grid4_extruder_left.def.json | 1 - resources/extruders/mbot3d_grid4_extruder_right.def.json | 1 - 8 files changed, 5 insertions(+), 12 deletions(-) diff --git a/resources/definitions/mbot3d_grid2plus.def.json b/resources/definitions/mbot3d_grid2plus.def.json index 60d349dc76..e3ceb9d789 100644 --- a/resources/definitions/mbot3d_grid2plus.def.json +++ b/resources/definitions/mbot3d_grid2plus.def.json @@ -27,12 +27,11 @@ "machine_width": { "default_value": 235 }, "machine_depth": { "default_value": 210 }, "machine_height": { "default_value": 190 }, - "material_print_temperature": { "default_value": 220 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": true }, "machine_gcode_flavor": { "default_value": "Makerbot" }, "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] }, - "gantry_height": { "default_value": 10 }, + "gantry_height": { "value": 10 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, diff --git a/resources/definitions/mbot3d_grid2plus_dual.def.json b/resources/definitions/mbot3d_grid2plus_dual.def.json index 5487a73e57..24c6d827c6 100644 --- a/resources/definitions/mbot3d_grid2plus_dual.def.json +++ b/resources/definitions/mbot3d_grid2plus_dual.def.json @@ -32,7 +32,7 @@ "machine_center_is_zero": { "default_value": true }, "machine_gcode_flavor": { "default_value": "Makerbot" }, "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] }, - "gantry_height": { "default_value": 10 }, + "gantry_height": { "value": 10 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, diff --git a/resources/extruders/mbot3d_grid2_extruder_0.def.json b/resources/extruders/mbot3d_grid2_extruder_0.def.json index 53cf86109b..7bfd5ffa9e 100644 --- a/resources/extruders/mbot3d_grid2_extruder_0.def.json +++ b/resources/extruders/mbot3d_grid2_extruder_0.def.json @@ -1,10 +1,9 @@ { - "id": "mbot3d_grid2_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "mbot3d_grid2", + "machine": "mbot3d_grid2plus", "position": "0" }, diff --git a/resources/extruders/mbot3d_grid2_extruder_left.def.json b/resources/extruders/mbot3d_grid2_extruder_left.def.json index faa4065673..e8368cd1bb 100644 --- a/resources/extruders/mbot3d_grid2_extruder_left.def.json +++ b/resources/extruders/mbot3d_grid2_extruder_left.def.json @@ -1,10 +1,9 @@ { - "id": "mbot3d_grid2_extruder_left", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "mbot3d_grid2_dual", + "machine": "mbot3d_grid2plus_dual", "position": "0" }, diff --git a/resources/extruders/mbot3d_grid2_extruder_right.def.json b/resources/extruders/mbot3d_grid2_extruder_right.def.json index 9f0a66e8af..fed6cc7333 100644 --- a/resources/extruders/mbot3d_grid2_extruder_right.def.json +++ b/resources/extruders/mbot3d_grid2_extruder_right.def.json @@ -1,10 +1,9 @@ { - "id": "mbot3d_grid2_extruder_right", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", "metadata": { - "machine": "mbot3d_grid2_dual", + "machine": "mbot3d_grid2plus_dual", "position": "1" }, diff --git a/resources/extruders/mbot3d_grid4_extruder_0.def.json b/resources/extruders/mbot3d_grid4_extruder_0.def.json index c7897e1d32..a75145fb74 100644 --- a/resources/extruders/mbot3d_grid4_extruder_0.def.json +++ b/resources/extruders/mbot3d_grid4_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "mbot3d_grid4_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/mbot3d_grid4_extruder_left.def.json b/resources/extruders/mbot3d_grid4_extruder_left.def.json index 191e1a0f2c..fb568c6eb6 100644 --- a/resources/extruders/mbot3d_grid4_extruder_left.def.json +++ b/resources/extruders/mbot3d_grid4_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "mbot3d_grid4_extruder_left", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/mbot3d_grid4_extruder_right.def.json b/resources/extruders/mbot3d_grid4_extruder_right.def.json index 23d00131db..7b36ff22e4 100644 --- a/resources/extruders/mbot3d_grid4_extruder_right.def.json +++ b/resources/extruders/mbot3d_grid4_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "mbot3d_grid4_extruder_right", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", From aea8dc4856c52eaa8870cf08b6dafc15028497c5 Mon Sep 17 00:00:00 2001 From: jeffkyjin Date: Tue, 17 Mar 2020 23:27:00 +0800 Subject: [PATCH 4/4] remove has_machine_quality for grid 2+ --- resources/definitions/mbot3d_grid2plus.def.json | 4 +--- resources/definitions/mbot3d_grid2plus_dual.def.json | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/definitions/mbot3d_grid2plus.def.json b/resources/definitions/mbot3d_grid2plus.def.json index e3ceb9d789..7a8677a0c2 100644 --- a/resources/definitions/mbot3d_grid2plus.def.json +++ b/resources/definitions/mbot3d_grid2plus.def.json @@ -7,9 +7,7 @@ "author": "Magicfirm", "manufacturer": "Magicfirm", "file_formats": "application/x3g", - "machine_x3g_variant": "r1", - "has_machine_quality": true, - "preferred_quality_type": "normal", + "machine_x3g_variant": "r1", "machine_extruder_trains": { "0": "mbot3d_grid2_extruder_0" diff --git a/resources/definitions/mbot3d_grid2plus_dual.def.json b/resources/definitions/mbot3d_grid2plus_dual.def.json index 24c6d827c6..648699cf1b 100644 --- a/resources/definitions/mbot3d_grid2plus_dual.def.json +++ b/resources/definitions/mbot3d_grid2plus_dual.def.json @@ -7,8 +7,6 @@ "author": "Magicfirm", "manufacturer": "Magicfirm", "file_formats": "application/x3g", - "has_machine_quality": true, - "preferred_quality_type": "normal", "machine_x3g_variant": "z", "machine_extruder_trains": {