From 48b5632fdc8c7d54b5c592bad73a2c12ffd8dfa9 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Sat, 22 Oct 2016 01:09:58 +0200 Subject: [PATCH 01/14] all machines from legacy Cura --- resources/definitions/bfb.def.json | 40 ++++++++++++ resources/definitions/deltabot.def.json | 35 +++++++++++ resources/definitions/kupido.def.json | 38 ++++++++++++ .../definitions/makerbotreplicator.def.json | 31 ++++++++++ resources/definitions/ord.def.json | 41 +++++++++++++ .../definitions/prusa_mendel_i3.def.json | 30 +++++++++ .../definitions/punchtec_connect_xl.def.json | 36 +++++++++++ resources/definitions/rigid3d.def.json | 53 ++++++++++++++++ resources/definitions/rigid3d_3rdgen.def.json | 50 +++++++++++++++ resources/definitions/rigid3d_hobby.def.json | 47 ++++++++++++++ resources/definitions/rigid3d_zero.def.json | 54 ++++++++++++++++ resources/definitions/robo_3d_r1.def.json | 61 +++++++++++++++++++ resources/definitions/zone3d_printer.def.json | 30 +++++++++ resources/extruders/ord_extruder_0.def.json | 19 ++++++ resources/extruders/ord_extruder_1.def.json | 19 ++++++ resources/extruders/ord_extruder_2.def.json | 19 ++++++ resources/extruders/ord_extruder_3.def.json | 19 ++++++ resources/extruders/ord_extruder_4.def.json | 19 ++++++ ...punchtec_connect_xl_extruder_left.def.json | 19 ++++++ ...unchtec_connect_xl_extruder_right.def.json | 19 ++++++ 20 files changed, 679 insertions(+) create mode 100644 resources/definitions/bfb.def.json create mode 100644 resources/definitions/deltabot.def.json create mode 100644 resources/definitions/kupido.def.json create mode 100644 resources/definitions/makerbotreplicator.def.json create mode 100644 resources/definitions/ord.def.json create mode 100644 resources/definitions/prusa_mendel_i3.def.json create mode 100644 resources/definitions/punchtec_connect_xl.def.json create mode 100644 resources/definitions/rigid3d.def.json create mode 100644 resources/definitions/rigid3d_3rdgen.def.json create mode 100644 resources/definitions/rigid3d_hobby.def.json create mode 100644 resources/definitions/rigid3d_zero.def.json create mode 100644 resources/definitions/robo_3d_r1.def.json create mode 100644 resources/definitions/zone3d_printer.def.json create mode 100644 resources/extruders/ord_extruder_0.def.json create mode 100644 resources/extruders/ord_extruder_1.def.json create mode 100644 resources/extruders/ord_extruder_2.def.json create mode 100644 resources/extruders/ord_extruder_3.def.json create mode 100644 resources/extruders/ord_extruder_4.def.json create mode 100644 resources/extruders/punchtec_connect_xl_extruder_left.def.json create mode 100644 resources/extruders/punchtec_connect_xl_extruder_right.def.json diff --git a/resources/definitions/bfb.def.json b/resources/definitions/bfb.def.json new file mode 100644 index 0000000000..8f883dc8d7 --- /dev/null +++ b/resources/definitions/bfb.def.json @@ -0,0 +1,40 @@ +{ + "id": "bfb", + "name": "BFB", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "speed_topbottom": { "default_value": 40 }, + "speed_print": { "default_value": 40 }, + "machine_extruder_count": { "default_value": 1 }, + "prime_tower_size": { "default_value": 7.745966692414834 }, + "machine_name": { "default_value": "BFB_Test" }, + "machine_heated_bed": { "default_value": false }, + "machine_nozzle_size": { "default_value": 0.5 }, + "speed_layer_0": { "default_value": 25 }, + "machine_width": { "default_value": 275 }, + "machine_gcode_flavor": { "default_value": "BFB" }, + "machine_depth": { "default_value": 265 }, + "speed_infill": { "default_value": 30 }, + "material_diameter": { "default_value": 1.7 }, + "machine_center_is_zero": { "default_value": true }, + "machine_height": { "default_value": 240 }, + "layer_height": { "default_value": 0.25 }, + "material_print_temperature": { "default_value": 200 }, + "retraction_amount": { "default_value": 0.05 }, + "speed_wall_0": { "default_value": 25 }, + "speed_travel": { "default_value": 50 }, + "infill_sparse_density": { "default_value": 10 }, + "layer_height_0": { "default_value": 0.5 }, + "speed_wall_x": { "default_value": 20 } + } +} diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json new file mode 100644 index 0000000000..f625995019 --- /dev/null +++ b/resources/definitions/deltabot.def.json @@ -0,0 +1,35 @@ +{ + "id": "deltabot", + "name": "DeltaBot", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "speed_travel": { "default_value": 150 }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "infill_sparse_density": { "default_value": 10 }, + "speed_wall_x": { "default_value": 30 }, + "speed_wall_0": { "default_value": 30 }, + "speed_topbottom": { "default_value": 30 }, + "layer_height": { "default_value": 0.2 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "speed_print": { "default_value": 30 }, + "speed_infill": { "default_value": 30 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": true }, + "machine_height": { "default_value": 150 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 150 }, + "machine_width": { "default_value": 150 }, + "machine_name": { "default_value": "DeltaBot style" } + } +} diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json new file mode 100644 index 0000000000..ce0a65741f --- /dev/null +++ b/resources/definitions/kupido.def.json @@ -0,0 +1,38 @@ +{ + "id": "kupido", + "name": "Kupido", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "machine_name": { "default_value": "Kupido" }, + "machine_start_gcode": { + "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}\n ;Print time: {print_time}\n ;Filament used: {filament_amount}m {filament_weight}g\n ;Filament cost: {filament_cost}\n ;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n ;M109 S{print_temperature} ;Uncomment to add your own temperature line\n G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X Y to endstops\n G28 Z0 ;move Z to endstops\n G1 Z20.0 F{40} ;move the platform down 20mm\n G1 Y0 X170 F{travel_speed}\n G92 E0 ;zero the extruded length\n G1 F200 E10 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G4 P7000\n G1 F{travel_speed}\n ;Put printing message on LCD screen\n M117 Printing...\n" + }, + "machine_end_gcode": { + "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n ;{profile_string}\n" + }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "retraction_speed": { "default_value": 60 }, + "material_bed_temperature": { "default_value": 60 }, + "speed_wall_x": { "default_value": 40 }, + "skirt_line_count": { "default_value": 2 }, + "retraction_min_travel": { "default_value": 2 }, + "speed_wall_0": { "default_value": 30 }, + "material_print_temperature": { "default_value": 220 }, + "brim_line_count": { "default_value": 15 }, + "retraction_amount": { "default_value": 3.6 }, + "speed_topbottom": { "default_value": 20 }, + "layer_height": { "default_value": 0.2 }, + "speed_print": { "default_value": 30 }, + "speed_infill": { "default_value": 30 } + } +} diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json new file mode 100644 index 0000000000..115fd4bd21 --- /dev/null +++ b/resources/definitions/makerbotreplicator.def.json @@ -0,0 +1,31 @@ +{ + "id": "makerbotreplicator", + "name": "MakerBotReplicator", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "prime_tower_size": { "default_value": 10.0 }, + "infill_sparse_density": { "default_value": 10 }, + "speed_travel": { "default_value": 150 }, + "material_diameter": { "default_value": 1.75 }, + "layer_height": { "default_value": 0.15 }, + "material_print_temperature": { "default_value": 220 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 150 }, + "machine_gcode_flavor": { "default_value": "MakerBot" }, + "machine_depth": { "default_value": 145 }, + "machine_width": { "default_value": 225 }, + "machine_name": { "default_value": "MakerBot Replicator" } + } +} diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json new file mode 100644 index 0000000000..ffa6d2be74 --- /dev/null +++ b/resources/definitions/ord.def.json @@ -0,0 +1,41 @@ +{ + "id": "ord", + "name": "Ord", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "ord_extruder_0", + "1": "ord_extruder_1", + "2": "ord_extruder_2", + "3": "ord_extruder_3", + "4": "ord_extruder_4" + }, + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "material_bed_temperature": { "default_value": 60 }, + "prime_tower_size": { "default_value": 7.0710678118654755 }, + "infill_sparse_density": { "default_value": 15 }, + "speed_travel": { "default_value": 150 }, + "material_diameter": { "default_value": 1.75 }, + "layer_height": { "default_value": 0.3 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_print_temperature": { "default_value": 240 }, + "machine_extruder_count": { "default_value": 5 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 200 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 250 }, + "machine_width": { "default_value": 215 }, + "machine_name": { "default_value": "Ord" } + } +} diff --git a/resources/definitions/prusa_mendel_i3.def.json b/resources/definitions/prusa_mendel_i3.def.json new file mode 100644 index 0000000000..a17678d65c --- /dev/null +++ b/resources/definitions/prusa_mendel_i3.def.json @@ -0,0 +1,30 @@ +{ + "id": "prusa_mendel_i3", + "name": "Prusa Mendel i3", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "prime_tower_size": { "default_value": 8.660254037844387 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_print_temperature": { "default_value": 240 }, + "layer_height": { "default_value": 0.2 }, + "speed_travel": { "default_value": 150 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 200 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 185 }, + "machine_width": { "default_value": 198 }, + "machine_name": { "default_value": "Prusa Mendel i3" } + } +} diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json new file mode 100644 index 0000000000..81b71b9cb0 --- /dev/null +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -0,0 +1,36 @@ +{ + "id": "punchtec_connect_xl", + "name": "punchtec Connect XL", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "machine_head_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] }, + "speed_travel": { "default_value": 150 }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "speed_wall_x": { "default_value": 40 }, + "speed_wall_0": { "default_value": 40 }, + "material_diameter": { "default_value": 1.75 }, + "speed_topbottom": { "default_value": 40 }, + "layer_height": { "default_value": 0.2 }, + "material_print_temperature": { "default_value": 195 }, + "speed_print": { "default_value": 40 }, + "speed_infill": { "default_value": 40 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 200 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 304 }, + "machine_width": { "default_value": 304 }, + "machine_name": { "default_value": "Connect XL" } + } +} diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json new file mode 100644 index 0000000000..e067c6147e --- /dev/null +++ b/resources/definitions/rigid3d.def.json @@ -0,0 +1,53 @@ +{ + "id": "rigid3d", + "name": "Rigid3D", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "machine_start_gcode": { + "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" + }, + "machine_end_gcode": { + "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" + }, + "machine_head_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] }, + "skirt_gap": { "default_value": 5.0 }, + "cool_min_layer_time": { "default_value": 10 }, + "prime_tower_size": { "default_value": 7.745966692414834 }, + "speed_wall_x": { "default_value": 40 }, + "speed_travel": { "default_value": 100 }, + "bottom_thickness": { "default_value": 0.75 }, + "material_diameter": { "default_value": 1.75 }, + "layer_height_0": { "default_value": 0.25 }, + "support_angle": { "default_value": 45 }, + "material_bed_temperature": { "default_value": 100 }, + "top_thickness": { "default_value": 0.75 }, + "material_print_temperature": { "default_value": 235 }, + "retraction_speed": { "default_value": 60.0 }, + "wall_thickness": { "default_value": 0.8 }, + "retraction_min_travel": { "default_value": 2 }, + "speed_wall_0": { "default_value": 30 }, + "retraction_amount": { "default_value": 1 }, + "speed_topbottom": { "default_value": 30 }, + "layer_height": { "default_value": 0.25 }, + "speed_print": { "default_value": 40 }, + "speed_infill": { "default_value": 40 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 210 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 250 }, + "machine_width": { "default_value": 250 }, + "machine_name": { "default_value": "Rigid3D" } + } +} diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json new file mode 100644 index 0000000000..4df0466df5 --- /dev/null +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -0,0 +1,50 @@ +{ + "id": "rigid3d_3rdgen", + "name": "rigid3d_3rdGen", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "machine_start_gcode": { + "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" + }, + "machine_end_gcode": { + "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" + }, + "machine_head_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] }, + "cool_min_layer_time": { "default_value": 10 }, + "prime_tower_size": { "default_value": 7.745966692414834 }, + "skirt_gap": { "default_value": 5.0 }, + "speed_travel": { "default_value": 120 }, + "bottom_thickness": { "default_value": 0.75 }, + "material_diameter": { "default_value": 1.75 }, + "layer_height_0": { "default_value": 0.25 }, + "support_angle": { "default_value": 45 }, + "material_bed_temperature": { "default_value": 100 }, + "retraction_min_travel": { "default_value": 2 }, + "speed_wall_0": { "default_value": 30 }, + "retraction_speed": { "default_value": 60.0 }, + "wall_thickness": { "default_value": 0.8 }, + "material_print_temperature": { "default_value": 235 }, + "retraction_amount": { "default_value": 1 }, + "speed_topbottom": { "default_value": 25 }, + "layer_height": { "default_value": 0.25 }, + "top_thickness": { "default_value": 0.75 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 240 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 290 }, + "machine_width": { "default_value": 275 }, + "machine_name": { "default_value": "Rigid3D 3rd Geneartion" } + } +} diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json new file mode 100644 index 0000000000..fe46a3c7d6 --- /dev/null +++ b/resources/definitions/rigid3d_hobby.def.json @@ -0,0 +1,47 @@ +{ + "id": "rigid3d_hobby", + "name": "RIGID3D HOBBY", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "machine_head_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "speed_travel": { "default_value": 40 }, + "skirt_gap": { "default_value": 5.0 }, + "cool_min_layer_time": { "default_value": 15 }, + "support_pattern": { "default_value": "grid" }, + "material_diameter": { "default_value": 1.75 }, + "layer_height_0": { "default_value": 0.25 }, + "speed_wall_x": { "default_value": 30 }, + "skirt_line_count": { "default_value": 2 }, + "support_angle": { "default_value": 45 }, + "speed_topbottom": { "default_value": 20 }, + "material_print_temperature": { "default_value": 205 }, + "retraction_speed": { "default_value": 80 }, + "wall_thickness": { "default_value": 0.8 }, + "retraction_min_travel": { "default_value": 2 }, + "speed_wall_0": { "default_value": 20 }, + "retraction_amount": { "default_value": 2 }, + "speed_layer_0": { "default_value": 15 }, + "layer_height": { "default_value": 0.2 }, + "speed_print": { "default_value": 30 }, + "speed_infill": { "default_value": 30 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": false }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 150 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 150 }, + "machine_width": { "default_value": 150 }, + "machine_name": { "default_value": "Rigid3D Hobby" } + } +} diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json new file mode 100644 index 0000000000..a3e254c1a3 --- /dev/null +++ b/resources/definitions/rigid3d_zero.def.json @@ -0,0 +1,54 @@ +{ + "id": "rigid3d_zero", + "name": "Rigid3d_Zero", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "machine_start_gcode": { + "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" + }, + "machine_end_gcode": { + "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" + }, + "machine_head_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] }, + "support_pattern": { "default_value": "grid" }, + "cool_min_layer_time": { "default_value": 10 }, + "speed_travel": { "default_value": 80 }, + "support_angle": { "default_value": 45 }, + "retraction_min_travel": { "default_value": 2 }, + "speed_wall_0": { "default_value": 20 }, + "speed_layer_0": { "default_value": 15 }, + "speed_infill": { "default_value": 30 }, + "speed_topbottom": { "default_value": 30 }, + "prime_tower_size": { "default_value": 7.745966692414834 }, + "skirt_line_count": { "default_value": 2 }, + "speed_wall_x": { "default_value": 30 }, + "material_diameter": { "default_value": 1.75 }, + "bottom_thickness": { "default_value": 0.75 }, + "layer_height_0": { "default_value": 0.25 }, + "top_thickness": { "default_value": 0.75 }, + "wall_thickness": { "default_value": 0.8 }, + "material_print_temperature": { "default_value": 195 }, + "retraction_amount": { "default_value": 1.5 }, + "skirt_gap": { "default_value": 5.0 }, + "layer_height": { "default_value": 0.25 }, + "speed_print": { "default_value": 30 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": false }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 190 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 250 }, + "machine_width": { "default_value": 250 }, + "machine_name": { "default_value": "Rigid3D Zero" } + } +} diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json new file mode 100644 index 0000000000..fa84b74e0d --- /dev/null +++ b/resources/definitions/robo_3d_r1.def.json @@ -0,0 +1,61 @@ +{ + "id": "robo_3d_r1", + "name": "ROBO 3D R1", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "machine_start_gcode": { + "default_value": " G92 E0 ;\n M565 Z-1 ;\n G1 Z5 F5000 ;\n G29 ;\n" + }, + "machine_end_gcode": { + "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n ;{profile_string}\n" + }, + "cool_min_layer_time": { "default_value": 7 }, + "speed_topbottom": { "default_value": 40 }, + "retraction_speed": { "default_value": 50 }, + "layer_0_z_overlap": { "default_value": 0.2 }, + "cool_min_speed": { "default_value": 19 }, + "material_bed_temperature": { "default_value": 60 }, + "support_angle": { "default_value": 50 }, + "speed_layer_0": { "default_value": 30 }, + "line_width": { "default_value": 0.39999999999999997 }, + "speed_infill": { "default_value": 60 }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "support_enable": { "default_value": true }, + "cool_fan_full_at_height": { "default_value": 0.1 }, + "material_diameter": { "default_value": 1.75 }, + "bottom_thickness": { "default_value": 1.2 }, + "raft_airgap": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.15 }, + "top_thickness": { "default_value": 1.2 }, + "speed_wall_0": { "default_value": 40 }, + "retraction_min_travel": { "default_value": 5 }, + "material_flow": { "default_value": 100 }, + "infill_sparse_density": { "default_value": 10 }, + "wall_thickness": { "default_value": 1.2 }, + "material_print_temperature": { "default_value": 190 }, + "retraction_amount": { "default_value": 3 }, + "layer_height": { "default_value": 0.2 }, + "speed_print": { "default_value": 40 }, + "machine_extruder_count": { "default_value": 1 }, + "retraction_combing": { "default_value": "off" }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 210 }, + "adhesion_type": { "default_value": "raft" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 245 }, + "machine_width": { "default_value": 225 }, + "support_z_distance": { "default_value": 0.22 }, + "machine_name": { "default_value": "ROBO 3D R1" } + } +} diff --git a/resources/definitions/zone3d_printer.def.json b/resources/definitions/zone3d_printer.def.json new file mode 100644 index 0000000000..1663ffdf2b --- /dev/null +++ b/resources/definitions/zone3d_printer.def.json @@ -0,0 +1,30 @@ +{ + "id": "zone3d_printer", + "name": "Zone3d Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "material_diameter": { "default_value": 1.75 }, + "prime_tower_size": { "default_value": 10.350983390135314 }, + "material_print_temperature": { "default_value": 260 }, + "layer_height": { "default_value": 0.14 }, + "speed_travel": { "default_value": 150 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 210 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 220 }, + "machine_width": { "default_value": 240 }, + "machine_name": { "default_value": "Zone3D Printer" } + } +} diff --git a/resources/extruders/ord_extruder_0.def.json b/resources/extruders/ord_extruder_0.def.json new file mode 100644 index 0000000000..c3f8d75cc0 --- /dev/null +++ b/resources/extruders/ord_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "id": "ord_extruder_0", + "version": 2, + "name": "0", + "inherits": "fdmextruder", + "metadata": { + "machine": "ord", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "4" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 } + } +} diff --git a/resources/extruders/ord_extruder_1.def.json b/resources/extruders/ord_extruder_1.def.json new file mode 100644 index 0000000000..9b7990605d --- /dev/null +++ b/resources/extruders/ord_extruder_1.def.json @@ -0,0 +1,19 @@ +{ + "id": "ord_extruder_1", + "version": 2, + "name": "1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ord", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "4" + }, + "machine_nozzle_offset_x": { "default_value": 62.95 }, + "machine_nozzle_offset_y": { "default_value": 2.05 } + } +} diff --git a/resources/extruders/ord_extruder_2.def.json b/resources/extruders/ord_extruder_2.def.json new file mode 100644 index 0000000000..4e8a9f6c15 --- /dev/null +++ b/resources/extruders/ord_extruder_2.def.json @@ -0,0 +1,19 @@ +{ + "id": "ord_extruder_2", + "version": 2, + "name": "2", + "inherits": "fdmextruder", + "metadata": { + "machine": "ord", + "position": "2" + }, + + "overrides": { + "extruder_nr": { + "default_value": 2, + "maximum_value": "4" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 27.7 } + } +} diff --git a/resources/extruders/ord_extruder_3.def.json b/resources/extruders/ord_extruder_3.def.json new file mode 100644 index 0000000000..e8da77a6ec --- /dev/null +++ b/resources/extruders/ord_extruder_3.def.json @@ -0,0 +1,19 @@ +{ + "id": "ord_extruder_3", + "version": 2, + "name": "3", + "inherits": "fdmextruder", + "metadata": { + "machine": "ord", + "position": "3" + }, + + "overrides": { + "extruder_nr": { + "default_value": 3, + "maximum_value": "4" + }, + "machine_nozzle_offset_x": { "default_value": 63.18 }, + "machine_nozzle_offset_y": { "default_value": 28.65 } + } +} diff --git a/resources/extruders/ord_extruder_4.def.json b/resources/extruders/ord_extruder_4.def.json new file mode 100644 index 0000000000..aa6c8052bf --- /dev/null +++ b/resources/extruders/ord_extruder_4.def.json @@ -0,0 +1,19 @@ +{ + "id": "ord_extruder_4", + "version": 2, + "name": "4", + "inherits": "fdmextruder", + "metadata": { + "machine": "ord", + "position": "4" + }, + + "overrides": { + "extruder_nr": { + "default_value": 4, + "maximum_value": "4" + }, + "machine_nozzle_offset_x": { "default_value": 31.6 }, + "machine_nozzle_offset_y": { "default_value": 28.2 } + } +} diff --git a/resources/extruders/punchtec_connect_xl_extruder_left.def.json b/resources/extruders/punchtec_connect_xl_extruder_left.def.json new file mode 100644 index 0000000000..4bc6bc8b84 --- /dev/null +++ b/resources/extruders/punchtec_connect_xl_extruder_left.def.json @@ -0,0 +1,19 @@ +{ + "id": "punchtec_connect_xl_extruder_0", + "version": 2, + "name": "0", + "inherits": "fdmextruder", + "metadata": { + "machine": "ord", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 } + } +} diff --git a/resources/extruders/punchtec_connect_xl_extruder_right.def.json b/resources/extruders/punchtec_connect_xl_extruder_right.def.json new file mode 100644 index 0000000000..f5df25c27c --- /dev/null +++ b/resources/extruders/punchtec_connect_xl_extruder_right.def.json @@ -0,0 +1,19 @@ +{ + "id": "punchtec_connect_xl_extruder_1", + "version": 2, + "name": "1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ord", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 } + } +} From e1409c4f83f0ddd6d785cde801d3e25d806fa127 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Sat, 22 Oct 2016 12:15:29 +0200 Subject: [PATCH 02/14] julia machine definition --- resources/definitions/julia.def.json | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 resources/definitions/julia.def.json diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json new file mode 100644 index 0000000000..fecf1bd5c1 --- /dev/null +++ b/resources/definitions/julia.def.json @@ -0,0 +1,52 @@ +{ + "id": "julia", + "name": "julia", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Unknown", + "category": "Other", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0] + }, + + "overrides": { + "machine_start_gcode": { + "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}\n ;Print time: {print_time}\n ;Filament used: {filament_amount}m {filament_weight}g\n ;Filament cost: {filament_cost}\n G21 ;metric values\n M107\n G28\n G29\n G90 ;absolute positioning\n G92 E0; reset extruder distance\n G1 Z5 F300 ;move nozzle up 5mm for safe homing\n G1 X0 Y0 Z0 F5000; move nozzle to home\n M300 S600P200\n M300 S800 P200\n M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n M109 S{print_temperature} ;Uncomment to add your own temperature line\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G1 Z15.0 F{travel_speed} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{travel_speed}\n ;Put printing message on LCD screen\n M117 Printing...\n" + }, + "machine_end_gcode": { + "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n ;{profile_string}\n" + }, + "material_bed_temperature": { "default_value": 100 }, + "layer_height": { "default_value": 0.2 }, + "support_angle": { "default_value": 30 }, + "infill_overlap": { "default_value": 30 }, + "layer_height_0": { "default_value": 0.2 }, + "speed_print": { "default_value": 80 }, + "speed_wall_0": { "default_value": 30 }, + "speed_travel": { "default_value": 150 }, + "brim_line_count": { "default_value": 15 }, + "skin_overlap": { "default_value": 30 }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "material_diameter": { "default_value": 1.75 }, + "bottom_thickness": { "default_value": 0.8 }, + "retraction_amount": { "default_value": 3 }, + "speed_topbottom": { "default_value": 80 }, + "material_print_temperature": { "default_value": 230 }, + "support_pattern": { "default_value": "grid" }, + "speed_infill": { "default_value": 80 }, + "infill_sparse_density": { "default_value": 10 }, + "top_thickness": { "default_value": 0.8 }, + "machine_extruder_count": { "default_value": 1 }, + "retraction_combing": { "default_value": "off" }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": false }, + "machine_height": { "default_value": 260 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 250 }, + "machine_width": { "default_value": 210 }, + "machine_name": { "default_value": "Julia V2" } + } +} From eaf3c1f1dd6366c8befaef4b0685344dfb7f6f55 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 22 Oct 2016 15:36:22 +0200 Subject: [PATCH 03/14] Correct machine reference --- resources/extruders/punchtec_connect_xl_extruder_left.def.json | 2 +- resources/extruders/punchtec_connect_xl_extruder_right.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/punchtec_connect_xl_extruder_left.def.json b/resources/extruders/punchtec_connect_xl_extruder_left.def.json index 4bc6bc8b84..b618999fc2 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_left.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_left.def.json @@ -4,7 +4,7 @@ "name": "0", "inherits": "fdmextruder", "metadata": { - "machine": "ord", + "machine": "punchtec_connect_xl", "position": "0" }, diff --git a/resources/extruders/punchtec_connect_xl_extruder_right.def.json b/resources/extruders/punchtec_connect_xl_extruder_right.def.json index f5df25c27c..1173bb5584 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_right.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_right.def.json @@ -4,7 +4,7 @@ "name": "1", "inherits": "fdmextruder", "metadata": { - "machine": "ord", + "machine": "punchtec_connect_xl", "position": "1" }, From 0597610388fe6faee4ced19e9ed1a8638f905ee7 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 22 Oct 2016 15:37:28 +0200 Subject: [PATCH 04/14] Add known manufacturers, make capitalization consistent --- resources/definitions/bfb.def.json | 2 +- resources/definitions/julia.def.json | 4 ++-- resources/definitions/kupido.def.json | 2 +- resources/definitions/makerbotreplicator.def.json | 2 +- resources/definitions/ord.def.json | 4 ++-- resources/definitions/punchtec_connect_xl.def.json | 2 +- resources/definitions/rigid3d.def.json | 2 +- resources/definitions/rigid3d_3rdgen.def.json | 4 ++-- resources/definitions/rigid3d_hobby.def.json | 4 ++-- resources/definitions/rigid3d_zero.def.json | 4 ++-- resources/definitions/robo_3d_r1.def.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/definitions/bfb.def.json b/resources/definitions/bfb.def.json index 8f883dc8d7..b685b3d94d 100644 --- a/resources/definitions/bfb.def.json +++ b/resources/definitions/bfb.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "BFB", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index fecf1bd5c1..8d908de5e0 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -1,12 +1,12 @@ { "id": "julia", - "name": "julia", + "name": "Julia", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Fracktal", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index ce0a65741f..2555a14e89 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Kupido", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index 115fd4bd21..9c49f301bd 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "MakerBot", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index ffa6d2be74..7b954298f7 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -1,12 +1,12 @@ { "id": "ord", - "name": "Ord", + "name": "ORD", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "ORD Solutions", "category": "Other", "file_formats": "text/x-gcode", "machine_extruder_trains": diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index 81b71b9cb0..e9d63cbb33 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Punchtec", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index e067c6147e..b167646f6e 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Rigid3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index 4df0466df5..e7c73ed54d 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -1,12 +1,12 @@ { "id": "rigid3d_3rdgen", - "name": "rigid3d_3rdGen", + "name": "Rigid3D 3rdGen", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Rigid3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index fe46a3c7d6..09ba77f63c 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -1,12 +1,12 @@ { "id": "rigid3d_hobby", - "name": "RIGID3D HOBBY", + "name": "Rigid3D Hobby", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Rigid3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index a3e254c1a3..e5b24baa4d 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -1,12 +1,12 @@ { "id": "rigid3d_zero", - "name": "Rigid3d_Zero", + "name": "Rigid3D Zero", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Rigid3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index fa84b74e0d..4ba3f2eb73 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -1,12 +1,12 @@ { "id": "robo_3d_r1", - "name": "ROBO 3D R1", + "name": "Robo R1", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Robo 3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] From bba74328f1ee1222c409df0a2bdc182841657098 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 10 Nov 2016 13:42:41 +0100 Subject: [PATCH 05/14] fix: Deltabot manufacturer --- resources/definitions/deltabot.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json index f625995019..5d36857e9e 100644 --- a/resources/definitions/deltabot.def.json +++ b/resources/definitions/deltabot.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Danny Lu", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] From 967e5c57764debf87a3f974a4b76f3d323e5d297 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 10 Nov 2016 13:43:55 +0100 Subject: [PATCH 06/14] fix: makerbot output file format: x3g --- resources/definitions/makerbotreplicator.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index 9c49f301bd..d762db67fc 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -8,7 +8,7 @@ "author": "Ultimaker", "manufacturer": "MakerBot", "category": "Other", - "file_formats": "text/x-gcode", + "file_formats": "application/x3g", "platform_offset": [ 0, 0, 0] }, From b86d8b481538fee1975bc31f3628a889a2f097c4 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 10 Nov 2016 13:45:45 +0100 Subject: [PATCH 07/14] removed default setting --- resources/definitions/rigid3d_zero.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index e5b24baa4d..d5f8c1ef6a 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -43,7 +43,6 @@ "layer_height": { "default_value": 0.25 }, "speed_print": { "default_value": 30 }, "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": false }, "machine_center_is_zero": { "default_value": false }, "machine_height": { "default_value": 190 }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, From 98bbeae055251ebce998313aa8a4f2151ec9f016 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 10 Nov 2016 13:46:31 +0100 Subject: [PATCH 08/14] lil: rounding error --- resources/definitions/robo_3d_r1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index 4ba3f2eb73..320eea613e 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -27,7 +27,7 @@ "material_bed_temperature": { "default_value": 60 }, "support_angle": { "default_value": 50 }, "speed_layer_0": { "default_value": 30 }, - "line_width": { "default_value": 0.39999999999999997 }, + "line_width": { "default_value": 0.4 }, "speed_infill": { "default_value": 60 }, "prime_tower_size": { "default_value": 8.660254037844387 }, "support_enable": { "default_value": true }, From fb92e50262c481d990c88904265aaf4987b31d63 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 11 Nov 2016 16:28:43 +0100 Subject: [PATCH 09/14] JSON fix: fixed all start/end gcode references to settings and non-existent variables --- resources/definitions/innovo_inventor.def.json | 2 +- resources/definitions/julia.def.json | 4 ++-- resources/definitions/kupido.def.json | 4 ++-- resources/definitions/rigidbot.def.json | 4 ++-- resources/definitions/rigidbot_big.def.json | 4 ++-- resources/definitions/robo_3d_r1.def.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 48c3ace5d9..40a2849979 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -54,7 +54,7 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" + "default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM190 S{material_bed_temperature}\nM104 T0 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" }, "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruders\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index 8d908de5e0..a0eda65bb7 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -14,10 +14,10 @@ "overrides": { "machine_start_gcode": { - "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}\n ;Print time: {print_time}\n ;Filament used: {filament_amount}m {filament_weight}g\n ;Filament cost: {filament_cost}\n G21 ;metric values\n M107\n G28\n G29\n G90 ;absolute positioning\n G92 E0; reset extruder distance\n G1 Z5 F300 ;move nozzle up 5mm for safe homing\n G1 X0 Y0 Z0 F5000; move nozzle to home\n M300 S600P200\n M300 S800 P200\n M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n M109 S{print_temperature} ;Uncomment to add your own temperature line\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G1 Z15.0 F{travel_speed} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{travel_speed}\n ;Put printing message on LCD screen\n M117 Printing...\n" + "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n ;metric values\n M107\n G28\n G29\n G90 ;absolute positioning\n G92 E0; reset extruder distance\n G1 Z5 F300 ;move nozzle up 5mm for safe homing\n G1 X0 Y0 Z0 F5000; move nozzle to home\n M300 S600P200\n M300 S800 P200\n M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n M109 S{material_print_temperature} ;Uncomment to add your own temperature line\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel}\n ;Put printing message on LCD screen\n M117 Printing...\n" }, "machine_end_gcode": { - "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n ;{profile_string}\n" + "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" }, "material_bed_temperature": { "default_value": 100 }, "layer_height": { "default_value": 0.2 }, diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 2555a14e89..97be1a0152 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -15,10 +15,10 @@ "overrides": { "machine_name": { "default_value": "Kupido" }, "machine_start_gcode": { - "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}\n ;Print time: {print_time}\n ;Filament used: {filament_amount}m {filament_weight}g\n ;Filament cost: {filament_cost}\n ;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n ;M109 S{print_temperature} ;Uncomment to add your own temperature line\n G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X Y to endstops\n G28 Z0 ;move Z to endstops\n G1 Z20.0 F{40} ;move the platform down 20mm\n G1 Y0 X170 F{travel_speed}\n G92 E0 ;zero the extruded length\n G1 F200 E10 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G4 P7000\n G1 F{travel_speed}\n ;Put printing message on LCD screen\n M117 Printing...\n" + "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n ;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n ;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\n G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X Y to endstops\n G28 Z0 ;move Z to endstops\n G1 Z20.0 F40 ;move the platform down 20mm\n G1 Y0 X170 F{speed_travel}\n G92 E0 ;zero the extruded length\n G1 F200 E10 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G4 P7000\n G1 F{speed_travel}\n ;Put printing message on LCD screen\n M117 Printing...\n" }, "machine_end_gcode": { - "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n ;{profile_string}\n" + "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" }, "prime_tower_size": { "default_value": 8.660254037844387 }, "retraction_speed": { "default_value": 60 }, diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json index 8b268410f9..9dbde35921 100644 --- a/resources/definitions/rigidbot.def.json +++ b/resources/definitions/rigidbot.def.json @@ -39,10 +39,10 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;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\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." + "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\nG21 ;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\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." }, "machine_end_gcode": { - "default_value": ";End GCode\nM104 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+10 E-1 X-20 Y-20 F{travel_speed} ;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 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" + "default_value": ";End GCode\nM104 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+10 E-1 X-20 Y-20 F{speed_travel} ;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 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning" }, "layer_height": { "default_value": 0.2 diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json index f8cf1e1da0..6ac84cbde1 100644 --- a/resources/definitions/rigidbot_big.def.json +++ b/resources/definitions/rigidbot_big.def.json @@ -42,10 +42,10 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;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\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." + "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\nG21 ;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\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." }, "machine_end_gcode": { - "default_value": ";End GCode\nM104 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+10 E-1 X-20 Y-20 F{travel_speed} ;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 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" + "default_value": ";End GCode\nM104 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+10 E-1 X-20 Y-20 F{speed_travel} ;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 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning" }, "layer_height": { "default_value": 0.2 diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index 320eea613e..a566ba9f23 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -17,7 +17,7 @@ "default_value": " G92 E0 ;\n M565 Z-1 ;\n G1 Z5 F5000 ;\n G29 ;\n" }, "machine_end_gcode": { - "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n ;{profile_string}\n" + "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" }, "cool_min_layer_time": { "default_value": 7 }, "speed_topbottom": { "default_value": 40 }, From 6f3b8a7fa1853915262af2954f4516fb5a1bbdd0 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 10:30:59 +0100 Subject: [PATCH 10/14] renamed ORD to RoVa3D --- resources/definitions/ord.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index 7b954298f7..bedd8c3121 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -1,6 +1,6 @@ { "id": "ord", - "name": "ORD", + "name": "RoVa3D", "version": 2, "inherits": "fdmprinter", "metadata": { @@ -36,6 +36,6 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 250 }, "machine_width": { "default_value": 215 }, - "machine_name": { "default_value": "Ord" } + "machine_name": { "default_value": "RoVa3D" } } } From 52ab3766161baab2e613988d2025e68363b19dc9 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 11:34:49 +0100 Subject: [PATCH 11/14] removed duplicate Pruse i3 --- .../definitions/prusa_mendel_i3.def.json | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 resources/definitions/prusa_mendel_i3.def.json diff --git a/resources/definitions/prusa_mendel_i3.def.json b/resources/definitions/prusa_mendel_i3.def.json deleted file mode 100644 index a17678d65c..0000000000 --- a/resources/definitions/prusa_mendel_i3.def.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "id": "prusa_mendel_i3", - "name": "Prusa Mendel i3", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ultimaker", - "manufacturer": "Unknown", - "category": "Other", - "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] - }, - - "overrides": { - "prime_tower_size": { "default_value": 8.660254037844387 }, - "machine_nozzle_size": { "default_value": 0.5 }, - "material_print_temperature": { "default_value": 240 }, - "layer_height": { "default_value": 0.2 }, - "speed_travel": { "default_value": 150 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 200 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_depth": { "default_value": 185 }, - "machine_width": { "default_value": 198 }, - "machine_name": { "default_value": "Prusa Mendel i3" } - } -} From 11f6494baff4197262d7ddbf6a2503c9beeafa5e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 11:35:37 +0100 Subject: [PATCH 12/14] capitalized Punchtech Connect XL --- resources/definitions/punchtec_connect_xl.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index e9d63cbb33..23c288eaaf 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -1,6 +1,6 @@ { "id": "punchtec_connect_xl", - "name": "punchtec Connect XL", + "name": "Punchtec Connect XL", "version": 2, "inherits": "fdmprinter", "metadata": { @@ -31,6 +31,6 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 304 }, "machine_width": { "default_value": 304 }, - "machine_name": { "default_value": "Connect XL" } + "machine_name": { "default_value": "Punchtec Connect XL" } } } From ed1670caef5511c84cbb4b05f4da1736e4799bc4 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 11:37:01 +0100 Subject: [PATCH 13/14] connected extruder trains to punchtec connect xl --- resources/definitions/punchtec_connect_xl.def.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index 23c288eaaf..ce4245a04f 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -9,6 +9,11 @@ "manufacturer": "Punchtec", "category": "Other", "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "punchtec_connect_xl_extruder_0", + "1": "punchtec_connect_xl_extruder_1" + }, "platform_offset": [ 0, 0, 0] }, From 1cc323eddd89c51dd0bfe31de2583b3d74ca4c78 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 11:37:54 +0100 Subject: [PATCH 14/14] changed machine name to Robo 3D R1 --- resources/definitions/robo_3d_r1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index a566ba9f23..b137b2054b 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -1,6 +1,6 @@ { "id": "robo_3d_r1", - "name": "Robo R1", + "name": "Robo 3D R1", "version": 2, "inherits": "fdmprinter", "metadata": {