From a09ae516f3bb802834c7ba540578e61c96250c97 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 4 Feb 2019 09:06:49 +0100 Subject: [PATCH] Fix indentation and typos --- ...creality cr-x.def.json => creality_cr-x.def.json} | 12 ++++++------ resources/extruders/cr-x_extruder_0.def.json | 4 ++-- resources/extruders/cr-x_extruder_1.def.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) rename resources/definitions/{creality cr-x.def.json => creality_cr-x.def.json} (89%) diff --git a/resources/definitions/creality cr-x.def.json b/resources/definitions/creality_cr-x.def.json similarity index 89% rename from resources/definitions/creality cr-x.def.json rename to resources/definitions/creality_cr-x.def.json index e2aa6c2506..4de1940220 100644 --- a/resources/definitions/creality cr-x.def.json +++ b/resources/definitions/creality_cr-x.def.json @@ -10,17 +10,17 @@ "category": "Other", "file_formats": "text/x-gcode", "platform": "cr-x.stl", - "has_variants": false, + "has_variants": false, "has_machine_quality": false, - "machine_extruder_trains": { + "machine_extruder_trains": { "0": "cr-x_extruder_0", "1": "cr-x_extruder_1" } }, "overrides": { - "machine_name": { "default_value": "Creality3D CR-X" }, - "machine_extruder_count": { "default_value": 2 }, + "machine_name": { "default_value": "Creality CR-X" }, + "machine_extruder_count": { "default_value": 2 }, "machine_heated_bed": { "default_value": true }, "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 300 }, @@ -44,8 +44,8 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E15 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" }, "machine_end_gcode": { "default_value": "M104 S0 ;hotend off\nM140 S0 ;bed off\nG92 E0\nG1 F2000 E-100 ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y270 ;move bed for easy part removal\nM84 ;disable steppers" }, - "material_print_temperature": { "default_value": 200 }, - "wall_thickness": { "default_value": 1 }, + "material_print_temperature": { "default_value": 200 }, + "wall_thickness": { "default_value": 1 }, "top_bottom_thickness": { "default_value": 1 }, "bottom_thickness": { "default_value": 1 } } diff --git a/resources/extruders/cr-x_extruder_0.def.json b/resources/extruders/cr-x_extruder_0.def.json index 5d04b24463..8135815afb 100644 --- a/resources/extruders/cr-x_extruder_0.def.json +++ b/resources/extruders/cr-x_extruder_0.def.json @@ -18,10 +18,10 @@ "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_start_code": { - "default_value": "\nT0 ;switch to extruder 1\nG92 E0 ;reset extuder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" + "default_value": "\nT0 ;switch to extruder 1\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" }, "machine_extruder_end_code": { - "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X295 Y265 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extuder distance\nG90" + "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X295 Y265 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" } } } diff --git a/resources/extruders/cr-x_extruder_1.def.json b/resources/extruders/cr-x_extruder_1.def.json index 31e251ccc3..9313f2ea78 100644 --- a/resources/extruders/cr-x_extruder_1.def.json +++ b/resources/extruders/cr-x_extruder_1.def.json @@ -18,10 +18,10 @@ "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_start_code": { - "default_value": "\nT1 ;switch to extruder 2\nG92 E0 ;reset extuder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extuder distance\nM104 S{material_print_temperature}" + "default_value": "\nT1 ;switch to extruder 2\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" }, "machine_extruder_end_code": { - "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X295 Y265 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extuder distance\nG90" + "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X295 Y265 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" } } }