From f8bc2e7b076960756f661786bb81be58c9b5c837 Mon Sep 17 00:00:00 2001 From: Daniel Green Date: Sat, 23 Feb 2019 18:21:52 -0800 Subject: [PATCH 1/4] Adds a printer definition for the FLSUN QQ --- resources/definitions/flsun_qq.def.json | 48 +++++++++++++++++++ .../extruders/flsun_qq_extruder.def.json | 15 ++++++ 2 files changed, 63 insertions(+) create mode 100644 resources/definitions/flsun_qq.def.json create mode 100644 resources/extruders/flsun_qq_extruder.def.json diff --git a/resources/definitions/flsun_qq.def.json b/resources/definitions/flsun_qq.def.json new file mode 100644 index 0000000000..390178cb2a --- /dev/null +++ b/resources/definitions/flsun_qq.def.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "name": "FLSUN QQ", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "FLSUN", + "author": "Daniel Green", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2", + "platform_offset": [0, 0, 0], + "machine_extruder_trains": { + "0": "flsun_qq_extruder" + } + }, + "overrides": { + "machine_extruder_count": { + "default_value": 1 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 240 + }, + "machine_height": { + "default_value": 285 + }, + "machine_depth": { + "default_value": 240 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "" + }, + "machine_end_gcode": { + "default_value": "" + }, + "machine_shape": { + "default_value": "elliptic" + } + } +} diff --git a/resources/extruders/flsun_qq_extruder.def.json b/resources/extruders/flsun_qq_extruder.def.json new file mode 100644 index 0000000000..120e731ae5 --- /dev/null +++ b/resources/extruders/flsun_qq_extruder.def.json @@ -0,0 +1,15 @@ +{ + "id": "flsun_qq_extruder", + "version": 1, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "flsun_qq", + "position": "0" + }, + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From 1d4298a27fa68e1116e48691d8020e1f00206f19 Mon Sep 17 00:00:00 2001 From: Daniel Green Date: Sun, 24 Feb 2019 17:40:46 -0800 Subject: [PATCH 2/4] Fixes the version setting. Adds start and end g-code --- resources/definitions/flsun_qq.def.json | 6 +++--- resources/extruders/flsun_qq_extruder.def.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/flsun_qq.def.json b/resources/definitions/flsun_qq.def.json index 390178cb2a..9e2924a35d 100644 --- a/resources/definitions/flsun_qq.def.json +++ b/resources/definitions/flsun_qq.def.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "FLSUN QQ", "inherits": "fdmprinter", "metadata": { @@ -36,10 +36,10 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": "" + "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, "machine_end_gcode": { - "default_value": "" + "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, "machine_shape": { "default_value": "elliptic" diff --git a/resources/extruders/flsun_qq_extruder.def.json b/resources/extruders/flsun_qq_extruder.def.json index 120e731ae5..7c93776836 100644 --- a/resources/extruders/flsun_qq_extruder.def.json +++ b/resources/extruders/flsun_qq_extruder.def.json @@ -1,6 +1,6 @@ { "id": "flsun_qq_extruder", - "version": 1, + "version": 2, "name": "Extruder", "inherits": "fdmextruder", "metadata": { From b7efc1baf0dd1117c714d883c73d17738507826d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 25 Feb 2019 11:19:51 +0100 Subject: [PATCH 3/4] Change tabs to spaces We use spaces to indent, normally. --- resources/definitions/flsun_qq.def.json | 92 ++++++++++++------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/resources/definitions/flsun_qq.def.json b/resources/definitions/flsun_qq.def.json index 9e2924a35d..643efa1292 100644 --- a/resources/definitions/flsun_qq.def.json +++ b/resources/definitions/flsun_qq.def.json @@ -1,48 +1,48 @@ { - "version": 2, - "name": "FLSUN QQ", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "manufacturer": "FLSUN", - "author": "Daniel Green", - "file_formats": "text/x-gcode", - "icon": "icon_ultimaker2", - "platform_offset": [0, 0, 0], - "machine_extruder_trains": { - "0": "flsun_qq_extruder" - } - }, - "overrides": { - "machine_extruder_count": { - "default_value": 1 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 240 - }, - "machine_height": { - "default_value": 285 - }, - "machine_depth": { - "default_value": 240 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - }, - "machine_shape": { - "default_value": "elliptic" - } - } + "version": 2, + "name": "FLSUN QQ", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "FLSUN", + "author": "Daniel Green", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2", + "platform_offset": [0, 0, 0], + "machine_extruder_trains": { + "0": "flsun_qq_extruder" + } + }, + "overrides": { + "machine_extruder_count": { + "default_value": 1 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 240 + }, + "machine_height": { + "default_value": 285 + }, + "machine_depth": { + "default_value": 240 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + }, + "machine_shape": { + "default_value": "elliptic" + } + } } From 5219b1ff9b215a5df0791b88f136faadaf8a78c3 Mon Sep 17 00:00:00 2001 From: Daniel Green Date: Tue, 26 Feb 2019 07:21:46 -0800 Subject: [PATCH 4/4] Removes unnecessary fields. --- resources/definitions/flsun_qq.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/flsun_qq.def.json b/resources/definitions/flsun_qq.def.json index 9e2924a35d..f79a97f112 100644 --- a/resources/definitions/flsun_qq.def.json +++ b/resources/definitions/flsun_qq.def.json @@ -7,8 +7,6 @@ "manufacturer": "FLSUN", "author": "Daniel Green", "file_formats": "text/x-gcode", - "icon": "icon_ultimaker2", - "platform_offset": [0, 0, 0], "machine_extruder_trains": { "0": "flsun_qq_extruder" }