From 39aec54a56b566e4f08fa5ccd0fc476d8d1ceb79 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 16 Jan 2018 09:27:56 +0100 Subject: [PATCH] Fix reference to Tevo Black Widow model Also fix some whitespace mistakes according to code style. Lots of tabs in there, whitespace at the end of a line, brackets on the same line, etc. --- .../definitions/anycubic_i3_mega.def.json | 92 +++++++++++-------- .../definitions/tevo_blackwidow.def.json | 47 ++++++---- 2 files changed, 83 insertions(+), 56 deletions(-) diff --git a/resources/definitions/anycubic_i3_mega.def.json b/resources/definitions/anycubic_i3_mega.def.json index a373872de8..cba868900c 100644 --- a/resources/definitions/anycubic_i3_mega.def.json +++ b/resources/definitions/anycubic_i3_mega.def.json @@ -1,55 +1,69 @@ { - "version":2, - "name":"Anycubic i3 Mega", - "inherits":"fdmprinter", - "metadata":{ - "visible":true, - "author":"TheTobby", - "manufacturer":"Anycubic", - "file_formats":"text/x-gcode", - "icon":"icon_ultimaker2", - "platform":"anycubic_i3_mega_platform.stl", - "has_materials": false, - "has_machine_quality": true, - "preferred_quality": "*normal*" + "version": 2, + "name": "Anycubic i3 Mega", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "TheTobby", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2", + "platform": "anycubic_i3_mega_platform.stl", + "has_materials": false, + "has_machine_quality": true, + "preferred_quality": "*normal*" }, - - "overrides":{ - "machine_name":{ - "default_value":"Anycubic i3 Mega" + + "overrides": + { + "machine_name": + { + "default_value": "Anycubic i3 Mega" }, - "machine_heated_bed":{ - "default_value":true + "machine_heated_bed": + { + "default_value": true }, - "machine_width":{ - "default_value":210 + "machine_width": + { + "default_value": 210 }, - "machine_height":{ - "default_value":205 + "machine_height": + { + "default_value": 205 }, - "machine_depth":{ - "default_value":210 + "machine_depth": + { + "default_value": 210 }, - "machine_center_is_zero":{ - "default_value":false + "machine_center_is_zero": + { + "default_value": false }, - "machine_nozzle_size":{ - "default_value":0.4 + "machine_nozzle_size": + { + "default_value": 0.4 }, - "material_diameter":{ - "default_value":1.75 + "material_diameter": + { + "default_value": 1.75 }, - "gantry_height":{ - "default_value":0 + "gantry_height": + { + "default_value": 0 }, - "machine_gcode_flavor":{ - "default_value":"RepRap (Marlin/Sprinter)" + "machine_gcode_flavor": + { + "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode":{ - "default_value":"G21 ;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\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5" + "machine_start_gcode": + { + "default_value": "G21 ;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\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5" }, - "machine_end_gcode":{ - "default_value":"M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;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\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" + "machine_end_gcode": + { + "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;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\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" } } } diff --git a/resources/definitions/tevo_blackwidow.def.json b/resources/definitions/tevo_blackwidow.def.json index 9d7166f4a2..04cadfb160 100644 --- a/resources/definitions/tevo_blackwidow.def.json +++ b/resources/definitions/tevo_blackwidow.def.json @@ -8,46 +8,59 @@ "manufacturer": "Tevo", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", - "has_materials": false, + "has_materials": false, "has_machine_quality": true, - "platform": "prusai3_platform.stl", - "preferred_quality": "*normal*" + "platform": "tevo_blackwidow.stl", + "preferred_quality": "*normal*" }, - "overrides": { - "machine_name": { + "overrides": + { + "machine_name": + { "default_value": "Tevo Black Widow" }, - "machine_heated_bed": { + "machine_heated_bed": + { "default_value": true }, - "machine_width": { + "machine_width": + { "default_value": 350 }, - "machine_height": { + "machine_height": + { "default_value": 250 }, - "machine_depth": { + "machine_depth": + { "default_value": 250 }, - "machine_center_is_zero": { + "machine_center_is_zero": + { "default_value": false }, - "machine_nozzle_size": { + "machine_nozzle_size": + { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 + "material_diameter": + { + "default_value": 1.75 }, - "gantry_height": { + "gantry_height": + { "default_value": 0 }, - "machine_gcode_flavor": { + "machine_gcode_flavor": + { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { + "machine_start_gcode": + { "default_value": "M280 P0 S160 ; release BLTouch alarm (OK to send for Non BLTouch)\nM420 Z2 ; set fade leveling at 2mm for BLTouch (OK to send for Non BLTouch)\nG28 ; home all\nG29 ; probe bed\nG92 E0 ;zero the extruded length\nG1 X0.0 Y50.0 Z10.0 F3600\n; perform wipe and prime\nG1 Z0.0 F1000\nG1 Z0.2 Y70.0 E9.0 F1000.0 ; prime\nG1 Y100.0 E12.5 F1000.0 ; prime\nG92 E0 ; zero extruder again\nM117 Printing..." }, - "machine_end_gcode": { + "machine_end_gcode": + { "default_value": "G92 E0 ; zero the extruded length again\nG1 E-1.5 F500 ; retract the filament to release some of the pressure\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nG28 X0 ; home X axis\nG1 Y245 ; move Y axis to end position\nM84 ; disable motors\nM107 ; turn off fan" } }