From 2cbaece3e1472639c29a5b2d7f193b62eabcadf9 Mon Sep 17 00:00:00 2001 From: pinchies <> Date: Fri, 26 Oct 2018 22:21:01 +1100 Subject: [PATCH 1/4] Add JGAurora Z-603S Add a preset for the JGAurora Z-603S to model list --- .../definitions/jgaurora_z_603s.def.json | 96 +++++++++++++++++++ .../jgaurora_z_603s_extruder_0.def.json | 16 ++++ 2 files changed, 112 insertions(+) create mode 100644 resources/definitions/jgaurora_z_603s.def.json create mode 100644 resources/extruders/jgaurora_z_603s_extruder_0.def.json diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json new file mode 100644 index 0000000000..af7fa823db --- /dev/null +++ b/resources/definitions/jgaurora_z_603s.def.json @@ -0,0 +1,96 @@ +{ + "name": "JGAurora Z-603S", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Samuel Pinches", + "manufacturer": "JGAurora", + "file_formats": "text/x-gcode", + "preferred_quality_type": "fine", + "machine_extruder_trains": + { + "0": "jgaurora_z_603s_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "JGAurora Z-603S" + }, + "machine_start_gcode": { + "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F6000 ;move Z to position 15.0 mm as fast as possible\nG92 E0 ;zero the extruded length\nG1 X0.0 Y0.0 F1000.0 ;go to edge of print area\nG1 X60.0 E9.0 F1000.0 ;intro line\nG1 X100.0 E21.5 F1000.0 ;intro line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" + }, + "machine_end_gcode": { + "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" + }, + "machine_width": { + "default_value": 280 + }, + "machine_height": { + "default_value": 175 + }, + "machine_depth": { + "default_value": 180 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "gantry_height": { + "default_value": 10 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_print_temperature": { + "default_value": 210 + }, + "material_bed_temperature": { + "default_value": 55 + }, + "layer_height": { + "default_value": 0.15 + }, + "layer_height_0": { + "default_value": 0.2 + }, + "wall_thickness": { + "default_value": 1.2 + }, + "speed_print": { + "default_value": 60 + }, + "speed_infill": { + "default_value": 60 + }, + "speed_wall": { + "default_value": 30 + }, + "speed_topbottom": { + "default_value": 45 + }, + "speed_travel": { + "default_value": 125 + }, + "speed_layer_0": { + "default_value": 20 + }, + "support_enable": { + "default_value": true + }, + "retraction_enable": { + "default_value": true + }, + "retraction_amount": { + "default_value": 5 + }, + "retraction_speed": { + "default_value": 50 + } + } +} \ No newline at end of file diff --git a/resources/extruders/jgaurora_z_603s_extruder_0.def.json b/resources/extruders/jgaurora_z_603s_extruder_0.def.json new file mode 100644 index 0000000000..987425b28a --- /dev/null +++ b/resources/extruders/jgaurora_z_603s_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "jgaurora_z_603s_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "jgaurora_z_603s", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From bc5f92b69b096234512fa8e9ad0f3a0d63c7dd71 Mon Sep 17 00:00:00 2001 From: pinchies <> Date: Fri, 26 Oct 2018 22:24:04 +1100 Subject: [PATCH 2/4] Add JGAurora A1 Add a preset for the JGAurora A1 to model list --- resources/definitions/jgaurora_a1.def.json | 96 +++++++++++++++++++ .../extruders/jgaurora_a1_extruder_0.def.json | 16 ++++ 2 files changed, 112 insertions(+) create mode 100644 resources/definitions/jgaurora_a1.def.json create mode 100644 resources/extruders/jgaurora_a1_extruder_0.def.json diff --git a/resources/definitions/jgaurora_a1.def.json b/resources/definitions/jgaurora_a1.def.json new file mode 100644 index 0000000000..004fd8741d --- /dev/null +++ b/resources/definitions/jgaurora_a1.def.json @@ -0,0 +1,96 @@ +{ + "name": "JGAurora A1", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Samuel Pinches", + "manufacturer": "JGAurora", + "file_formats": "text/x-gcode", + "preferred_quality_type": "fine", + "machine_extruder_trains": + { + "0": "jgaurora_a1_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "JGAurora A1" + }, + "machine_start_gcode": { + "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F6000 ;move Z to position 15.0 mm as fast as possible\nG92 E0 ;zero the extruded length\nG1 X0.0 Y0.0 F1000.0 ;go to edge of print area\nG1 X60.0 E9.0 F1000.0 ;intro line\nG1 X100.0 E21.5 F1000.0 ;intro line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" + }, + "machine_end_gcode": { + "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" + }, + "machine_width": { + "default_value": 300 + }, + "machine_height": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "gantry_height": { + "default_value": 10 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_print_temperature": { + "default_value": 215 + }, + "material_bed_temperature": { + "default_value": 67 + }, + "layer_height": { + "default_value": 0.15 + }, + "layer_height_0": { + "default_value": 0.12 + }, + "wall_thickness": { + "default_value": 1.2 + }, + "speed_print": { + "default_value": 40 + }, + "speed_infill": { + "default_value": 40 + }, + "speed_wall": { + "default_value": 35 + }, + "speed_topbottom": { + "default_value": 35 + }, + "speed_travel": { + "default_value": 120 + }, + "speed_layer_0": { + "default_value": 12 + }, + "support_enable": { + "default_value": true + }, + "retraction_enable": { + "default_value": true + }, + "retraction_amount": { + "default_value": 6 + }, + "retraction_speed": { + "default_value": 40 + } + } +} \ No newline at end of file diff --git a/resources/extruders/jgaurora_a1_extruder_0.def.json b/resources/extruders/jgaurora_a1_extruder_0.def.json new file mode 100644 index 0000000000..71742b734a --- /dev/null +++ b/resources/extruders/jgaurora_a1_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "jgaurora_a1_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "jgaurora_a1", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From 5d4aa569a9d6505736944b2f5ccfdb2548d29ba7 Mon Sep 17 00:00:00 2001 From: pinchies <> Date: Fri, 26 Oct 2018 22:34:15 +1100 Subject: [PATCH 3/4] Revert "Add JGAurora A1" This reverts commit bc5f92b69b096234512fa8e9ad0f3a0d63c7dd71. --- resources/definitions/jgaurora_a1.def.json | 96 ------------------- .../extruders/jgaurora_a1_extruder_0.def.json | 16 ---- 2 files changed, 112 deletions(-) delete mode 100644 resources/definitions/jgaurora_a1.def.json delete mode 100644 resources/extruders/jgaurora_a1_extruder_0.def.json diff --git a/resources/definitions/jgaurora_a1.def.json b/resources/definitions/jgaurora_a1.def.json deleted file mode 100644 index 004fd8741d..0000000000 --- a/resources/definitions/jgaurora_a1.def.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "name": "JGAurora A1", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Samuel Pinches", - "manufacturer": "JGAurora", - "file_formats": "text/x-gcode", - "preferred_quality_type": "fine", - "machine_extruder_trains": - { - "0": "jgaurora_a1_extruder_0" - } - }, - "overrides": { - "machine_name": { - "default_value": "JGAurora A1" - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F6000 ;move Z to position 15.0 mm as fast as possible\nG92 E0 ;zero the extruded length\nG1 X0.0 Y0.0 F1000.0 ;go to edge of print area\nG1 X60.0 E9.0 F1000.0 ;intro line\nG1 X100.0 E21.5 F1000.0 ;intro line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "default_value": 10 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "material_print_temperature": { - "default_value": 215 - }, - "material_bed_temperature": { - "default_value": 67 - }, - "layer_height": { - "default_value": 0.15 - }, - "layer_height_0": { - "default_value": 0.12 - }, - "wall_thickness": { - "default_value": 1.2 - }, - "speed_print": { - "default_value": 40 - }, - "speed_infill": { - "default_value": 40 - }, - "speed_wall": { - "default_value": 35 - }, - "speed_topbottom": { - "default_value": 35 - }, - "speed_travel": { - "default_value": 120 - }, - "speed_layer_0": { - "default_value": 12 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 6 - }, - "retraction_speed": { - "default_value": 40 - } - } -} \ No newline at end of file diff --git a/resources/extruders/jgaurora_a1_extruder_0.def.json b/resources/extruders/jgaurora_a1_extruder_0.def.json deleted file mode 100644 index 71742b734a..0000000000 --- a/resources/extruders/jgaurora_a1_extruder_0.def.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "id": "jgaurora_a1_extruder_0", - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "jgaurora_a1", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} From 46c6ef71abfcdb6d617c724e3f72af77a5e48176 Mon Sep 17 00:00:00 2001 From: pinchies Date: Sat, 27 Oct 2018 03:50:15 +1100 Subject: [PATCH 4/4] Update jgaurora_z_603s.def.json --- resources/definitions/jgaurora_z_603s.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json index af7fa823db..59e0ff129c 100644 --- a/resources/definitions/jgaurora_z_603s.def.json +++ b/resources/definitions/jgaurora_z_603s.def.json @@ -18,7 +18,7 @@ "default_value": "JGAurora Z-603S" }, "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F6000 ;move Z to position 15.0 mm as fast as possible\nG92 E0 ;zero the extruded length\nG1 X0.0 Y0.0 F1000.0 ;go to edge of print area\nG1 X60.0 E9.0 F1000.0 ;intro line\nG1 X100.0 E21.5 F1000.0 ;intro line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" + "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" @@ -93,4 +93,4 @@ "default_value": 50 } } -} \ No newline at end of file +}