From e11ce2674f03529ea0b1083dbdd65329d6b1e1e0 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Jul 2018 15:10:27 +0200 Subject: [PATCH] CURA-5334 formatting --- resources/definitions/fabtotum.def.json | 139 +++++++++--------- resources/definitions/gmax15plus.def.json | 7 +- .../extruders/malyan_m180_extruder_0.def.json | 4 +- 3 files changed, 75 insertions(+), 75 deletions(-) diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index cc8524c3b0..0b9b768866 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -1,73 +1,72 @@ { - "version": 2, - "name": "FABtotum Personal Fabricator", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "FABtotum", - "manufacturer": "FABtotum", - "category": "Other", - "file_formats": "text/x-gcode", - "platform": "fabtotum_platform.stl", - "icon": "fabtotum_platform.png", - "has_machine_quality": true, - "has_variants": true, - "variants_name": "Head", - "preferred_variant_name": "Lite 0.4 mm", - "preferred_material": "fabtotum_pla", - "supports_usb_connection": false, - "machine_extruder_trains": - { - "0": "fabtotum_extruder_0" + "version": 2, + "name": "FABtotum Personal Fabricator", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "FABtotum", + "manufacturer": "FABtotum", + "category": "Other", + "file_formats": "text/x-gcode", + "platform": "fabtotum_platform.stl", + "icon": "fabtotum_platform.png", + "has_machine_quality": true, + "has_variants": true, + "variants_name": "Head", + "preferred_variant_name": "Lite 0.4 mm", + "preferred_material": "fabtotum_pla", + "supports_usb_connection": false, + "machine_extruder_trains": + { + "0": "fabtotum_extruder_0" + } + }, + "overrides": { + "machine_name": { "default_value": "FABtotum Personal Fabricator" }, + "machine_start_gcode": { + "default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM300 S2 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35 ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \n;print" + }, + "machine_end_gcode": { + "default_value": "M104 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+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)" + }, + "gantry_height": { "default_value": 55 }, + "machine_width": { "default_value": 214 }, + "machine_height": { "default_value": 241.5 }, + "machine_depth": { "default_value": 234 }, + "machine_center_is_zero": { "default_value": false }, + "machine_heated_bed": { "default_value": true }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_max_feedrate_x": { "default_value": 250 }, + "machine_max_feedrate_y": { "default_value": 250 }, + "machine_max_feedrate_z": { "default_value": 15 }, + "machine_max_acceleration_x": { "default_value": 10000 }, + "machine_max_acceleration_y": { "default_value": 10000 }, + "machine_max_acceleration_z": { "default_value": 50 }, + "machine_max_acceleration_e": { "default_value": 100 }, + "machine_acceleration": { "default_value": 4000 }, + "machine_max_jerk_xy": { "default_value": 25.0 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 1.0 }, + "retraction_hop_enabled": { "default_value": false }, + "material_final_print_temperature": { "value": "material_print_temperature - 5" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "travel_avoid_distance": { "default_value": 1, "value": 1 }, + "speed_travel": { "default_value": 200, "value": 200 }, + "speed_infill": { "value": "round(speed_print * 1.05, 0)" }, + "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, + "speed_wall": { "value": "speed_print" }, + "speed_wall_0": { "value": "round(speed_print * 0.9, 0)" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, + "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_line_count": { "default_value": 3 }, + "skirt_brim_minimal_length": { "default_value": 150 }, + "infill_sparse_density": { "default_value": 24 }, + "top_bottom_thickness": { "default_value": 0.6 }, + "support_z_distance": { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" }, + "support_interface_enable": { "default_value": true } } - }, - - "overrides": { - "machine_name": { "default_value": "FABtotum Personal Fabricator" }, - "machine_start_gcode": { - "default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM300 S2 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35 ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \n;print" - }, - "machine_end_gcode": { - "default_value": "M104 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+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)" - }, - "gantry_height": { "default_value": 55 }, - "machine_width": { "default_value": 214 }, - "machine_height": { "default_value": 241.5 }, - "machine_depth": { "default_value": 234 }, - "machine_center_is_zero": { "default_value": false }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_max_feedrate_x": { "default_value": 250 }, - "machine_max_feedrate_y": { "default_value": 250 }, - "machine_max_feedrate_z": { "default_value": 15 }, - "machine_max_acceleration_x": { "default_value": 10000 }, - "machine_max_acceleration_y": { "default_value": 10000 }, - "machine_max_acceleration_z": { "default_value": 50 }, - "machine_max_acceleration_e": { "default_value": 100 }, - "machine_acceleration": { "default_value": 4000 }, - "machine_max_jerk_xy": { "default_value": 25.0 }, - "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 1.0 }, - "retraction_hop_enabled": { "default_value": false }, - "material_final_print_temperature": { "value": "material_print_temperature - 5" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "travel_avoid_distance": { "default_value": 1, "value": 1 }, - "speed_travel": { "default_value": 200, "value": 200 }, - "speed_infill": { "value": "round(speed_print * 1.05, 0)" }, - "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, - "speed_wall": { "value": "speed_print" }, - "speed_wall_0": { "value": "round(speed_print * 0.9, 0)" }, - "speed_wall_x": { "value": "speed_wall" }, - "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, - "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "skirt_line_count": { "default_value": 3 }, - "skirt_brim_minimal_length": { "default_value": 150 }, - "infill_sparse_density": { "default_value": 24 }, - "top_bottom_thickness": { "default_value": 0.6 }, - "support_z_distance": { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" }, - "support_interface_enable": { "default_value": true } - } } diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index f0930259cb..d112c62fe8 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -12,10 +12,9 @@ "platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl", "has_machine_quality": true, "has_variants": true, - "variants_name": "Hotend", - "preferred_variant_name": "0.5mm E3D (Default)", - "machine_extruder_trains": - { + "variants_name": "Hotend", + "preferred_variant_name": "0.5mm E3D (Default)", + "machine_extruder_trains": { "0": "gmax15plus_extruder_0" } }, diff --git a/resources/extruders/malyan_m180_extruder_0.def.json b/resources/extruders/malyan_m180_extruder_0.def.json index be01655e1f..bdf5350b26 100644 --- a/resources/extruders/malyan_m180_extruder_0.def.json +++ b/resources/extruders/malyan_m180_extruder_0.def.json @@ -11,6 +11,8 @@ "overrides": { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { + "default_value": 1.75 + } } }