Merge branch 'master' of https://github.com/Magicfirm/Cura into Magicfirm-master

resources/definitions/mbot3d_grid2plus.def.json

@@ -0,0 +1,57 @@
+{
+    "name": "MBot3D Grid 2+",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Magicfirm",
+        "manufacturer": "Magicfirm",
+        "file_formats": "application/x3g",
+        "machine_x3g_variant": "r1",
+        "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 },
+        "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": { "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 }
+    }
+}

resources/definitions/mbot3d_grid2plus_dual.def.json

@@ -0,0 +1,58 @@
+{
+    "name": "MBot3D Grid 2+ Dual",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Magicfirm",
+        "manufacturer": "Magicfirm",
+        "file_formats": "application/x3g",
+        "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": { "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 }
+    }
+}

resources/definitions/mbot3d_grid4.def.json

@@ -0,0 +1,57 @@
+{
+    "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": 190
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "material_flow": {
+            "default_value": 100
+        },
+        "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": {
+            "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"
+        }
+    }
+}

resources/definitions/mbot3d_grid4_dual.def.json

@@ -0,0 +1,60 @@
+{
+    "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": 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_flow": {
+            "default_value": 100
+        },
+        "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": {
+           "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"
+        }
+    }
+}

resources/extruders/mbot3d_grid2_extruder_0.def.json

@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mbot3d_grid2plus",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/mbot3d_grid2_extruder_left.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mbot3d_grid2plus_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 }
+    }
+}

resources/extruders/mbot3d_grid2_extruder_right.def.json

@@ -0,0 +1,27 @@
+{
+    "version": 2,
+    "name": "Extruder 2",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "mbot3d_grid2plus_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 }
+    }
+}

resources/extruders/mbot3d_grid4_extruder_0.def.json

@@ -0,0 +1,17 @@
+{
+    "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 }
+    }
+}

resources/extruders/mbot3d_grid4_extruder_left.def.json

@@ -0,0 +1,27 @@
+{
+    "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 }
+    }
+}

resources/extruders/mbot3d_grid4_extruder_right.def.json

@@ -0,0 +1,27 @@
+{
+    "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 }
+    }
+}