diff --git a/resources/definitions/tinyboy.def.json b/resources/definitions/tinyboy.def.json index ac852111aa..968d24ff8f 100644 --- a/resources/definitions/tinyboy.def.json +++ b/resources/definitions/tinyboy.def.json @@ -1,6 +1,6 @@ { - "name": "TinyBoy", "version": 2, + "name": "TinyBoy", "inherits": "fdmprinter", "metadata": { "author": "Fred Chan", @@ -11,10 +11,6 @@ "has_materials": false, "has_machine_quality": true, "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "tinyboy_e10_extruder_0" - } }, "overrides": { @@ -29,68 +25,27 @@ [30, 34] ] }, - "layer_height_0": { - "default_value": 0.2 - }, - "top_bottom_thickness": { - "default_value": 0.9 - }, - "top_bottom_pattern_0": { - "default_value": "concentric" - }, - "infill_pattern": { - "value": "'triangles'" - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 6 - }, - "retraction_speed": { - "default_value": 20 - }, - "cool_min_layer_time": { - "default_value": 10 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "skirt_line_count": { - "default_value": 4 - }, - "skirt_gap": { - "default_value": 5 + "machine_center_is_zero": { "default_value": false }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" }, "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors" - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": false - }, - "gantry_height": { - "default_value": 30 - }, - "acceleration_enabled": { - "default_value": true - }, - "acceleration_print": { - "default_value": 500 - }, - "acceleration_travel": { - "default_value": 500 - }, - "jerk_enabled": { - "default_value": true - }, - "jerk_print": { - "default_value": 20 - }, - "jerk_travel": { - "default_value": 20 } } } diff --git a/resources/definitions/tinyboy_e10.def.json b/resources/definitions/tinyboy_e10.def.json index 17abd4c220..5c9c6d9eb4 100644 --- a/resources/definitions/tinyboy_e10.def.json +++ b/resources/definitions/tinyboy_e10.def.json @@ -1,20 +1,23 @@ { "version": 2, "name": "TinyBoy E10_J10_L10_M10", - "inherits": "tinyboy", - "metadata": { "visible": true }, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Fred Chan", + "manufacturer": "TinyBoy / mago", + "category": "tinyboy", + "machine_extruder_trains": + { + "0": "tinyboy_extruder_0" + } + }, "overrides": { "machine_name": { "default_value": "TinyBoy E10" }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 100 - }, - "machine_height": { - "default_value": 105 - }, + "machine_width": { "default_value": 100 }, + "machine_depth": { "default_value": 100 }, + "machine_height": { "default_value": 105 }, "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, diff --git a/resources/definitions/tinyboy_e16.def.json b/resources/definitions/tinyboy_e16.def.json index 609a5d165e..df9b251c57 100644 --- a/resources/definitions/tinyboy_e16.def.json +++ b/resources/definitions/tinyboy_e16.def.json @@ -1,8 +1,17 @@ { "version": 2, "name": "TinyBoy E16_L16_M16", - "inherits": "tinyboy", - "metadata": { "visible": true }, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Fred Chan", + "manufacturer": "TinyBoy / mago", + "category": "tinyboy", + "machine_extruder_trains": + { + "0": "tinyboy_extruder_0" + } + }, "overrides": { "machine_name": { "default_value": "TinyBoy E16" }, @@ -17,4 +26,3 @@ } } } - diff --git a/resources/definitions/tinyboy_mago.def.json b/resources/definitions/tinyboy_mago.def.json index 03f0e13c6f..0ca3157da3 100644 --- a/resources/definitions/tinyboy_mago.def.json +++ b/resources/definitions/tinyboy_mago.def.json @@ -1,8 +1,17 @@ { "version": 2, "name": "mago 3d printer", - "inherits": "tinyboy", - "metadata": { "visible": true }, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Fred Chan", + "manufacturer": "TinyBoy / mago", + "category": "tinyboy", + "machine_extruder_trains": + { + "0": "tinyboy_extruder_0" + } + }, "overrides": { "machine_name": { "default_value": "mago 3d printer" }, diff --git a/resources/definitions/tinyboy_ra20.def.json b/resources/definitions/tinyboy_ra20.def.json index 099045b6de..208d11e9c8 100644 --- a/resources/definitions/tinyboy_ra20.def.json +++ b/resources/definitions/tinyboy_ra20.def.json @@ -1,12 +1,19 @@ { "version": 2, "name": "TinyBoy RA20", - "inherits": "tinyboy", - "metadata": { + "inherits": "fdmprinter", + "metadata": { "visible": true, + "author": "Fred Chan", + "manufacturer": "TinyBoy / mago", + "category": "tinyboy", "platform": "tinyboy_ra20.obj", "platform_texture": "tinyboy2.png", - "platform_offset": [ 8, -70, -8 ] + "platform_offset": [ 8, -70, -8 ], + "machine_extruder_trains": + { + "0": "tinyboy_extruder_0" + } }, "overrides": { diff --git a/resources/extruders/tinyboy_e10_extruder_0.def.json b/resources/extruders/tinyboy_extruder_0.def.json similarity index 100% rename from resources/extruders/tinyboy_e10_extruder_0.def.json rename to resources/extruders/tinyboy_extruder_0.def.json