From 2bcbe9400893905a824c83ea0ad08655dd39d0f0 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Wed, 21 Apr 2021 15:35:08 +0800 Subject: [PATCH 01/11] Standard Atom 2.0 --- resources/definitions/atom2.def.json | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 resources/definitions/atom2.def.json diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json new file mode 100644 index 0000000000..bc19ce49ef --- /dev/null +++ b/resources/definitions/atom2.def.json @@ -0,0 +1,40 @@ +{ + "name": "Atom 2", + "version": 2, + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Victor (Yu Chieh) Lin", + "manufacturer": "Layer One", + "file_formats": "text/x-gcode", + "platform_offset": [ 0, 0, 0 ], + "machine_extruder_trains": + { + "0": "atom2_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Atom 2" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_width": { "default_value": 210 }, + "machine_depth": { "default_value": 210 }, + "machine_height": { "default_value": 320 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": false }, + "machine_center_is_zero": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + + "machine_start_gcode": { + "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" + }, + + "layer_height": { "default_value": 0.2 }, + "default_material_print_temperature": { "default_value": 200 }, + "speed_print": { "default_value": 30 } + } +} \ No newline at end of file From 420fe2ab3309a6666ef36d00b9daf74d1954fe02 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Wed, 21 Apr 2021 15:36:07 +0800 Subject: [PATCH 02/11] Single Extruder - Atom 2.0 --- resources/extruders/atom2_extruder_0.def.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 resources/extruders/atom2_extruder_0.def.json diff --git a/resources/extruders/atom2_extruder_0.def.json b/resources/extruders/atom2_extruder_0.def.json new file mode 100644 index 0000000000..50e1f8501f --- /dev/null +++ b/resources/extruders/atom2_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "Atom 2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From 781a5d42a6539ecdb995752ce0c957b85b4a8d01 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Wed, 21 Apr 2021 16:37:37 +0800 Subject: [PATCH 03/11] Update Atom 2.0 --- resources/definitions/atom2.def.json | 55 +++++++++++++++++++++------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json index bc19ce49ef..2fd76df8fe 100644 --- a/resources/definitions/atom2.def.json +++ b/resources/definitions/atom2.def.json @@ -2,16 +2,13 @@ "name": "Atom 2", "version": 2, "inherits": "fdmprinter", - "metadata": - { + "metadata": { "visible": true, "author": "Victor (Yu Chieh) Lin", "manufacturer": "Layer One", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0 ], - "machine_extruder_trains": - { - "0": "atom2_extruder_0" + "platform_offset": [0,0,0], + "machine_extruder_trains": { "0": "atom2_extruder_0" } }, @@ -26,15 +23,47 @@ "machine_center_is_zero": { "default_value": true }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" - }, + "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, "layer_height": { "default_value": 0.2 }, "default_material_print_temperature": { "default_value": 200 }, - "speed_print": { "default_value": 30 } + "speed_print": { "default_value": 32 }, + "infill_before_walls": { "value": false }, + "optimize_wall_printing_order": { "value": "True" }, + "infill_sparse_density": { "default_value": 10 }, + "brim_width": + { + "label": "Brim Width", + "description": "The distance from the model to the outermost brim line. A larger brim enhances adhesion to the build plate, but also reduces the effective print area.", + "type": "float", + "unit": "mm", + "default_value": 4, + "minimum_value": "0.0", + "maximum_value_warning": "50.0", + "maximum_value": "0.5 * min(machine_width, machine_depth)", + "enabled": "resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "atom2_extruder_0", + "children": + { + "brim_line_count": + { + "label": "Brim Line Count", + "description": "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area.", + "type": "int", + "default_value": 10, + "minimum_value": "0", + "maximum_value_warning": "50 / skirt_brim_line_width", + "maximum_value": "0.5 * min(machine_width, machine_depth) / skirt_brim_line_width", + "value": 10, + "enabled": "resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')", + "settable_per_mesh": false, + "settable_per_extruder": true, + "limit_to_extruder": "atom2_extruder_0" + } + } + } } } \ No newline at end of file From d5f845831fa90f3bc496d48a8c0e37dd1ad1cb42 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Thu, 22 Apr 2021 17:07:47 +0800 Subject: [PATCH 04/11] Added Atom Plus --- resources/definitions/atom2.def.json | 2 +- resources/definitions/atomPlus.def.json | 35 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 resources/definitions/atomPlus.def.json diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json index 2fd76df8fe..3918631699 100644 --- a/resources/definitions/atom2.def.json +++ b/resources/definitions/atom2.def.json @@ -21,7 +21,7 @@ "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": false }, "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, diff --git a/resources/definitions/atomPlus.def.json b/resources/definitions/atomPlus.def.json new file mode 100644 index 0000000000..1726fee8eb --- /dev/null +++ b/resources/definitions/atomPlus.def.json @@ -0,0 +1,35 @@ +{ + "name": "Atom Plus", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Victor (Yu Chieh) Lin", + "manufacturer": "Layer One", + "file_formats": "text/x-gcode", + "platform_offset": [0,0,0], + "machine_extruder_trains": { "0": "atomPlus_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Atom Plus" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_width": { "default_value": 420 }, + "machine_depth": { "default_value": 420 }, + "machine_height": { "default_value": 910 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": false }, + "machine_center_is_zero": { "default_value": true }, + "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, + + "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, + + "layer_height": { "default_value": 0.4 }, + "default_material_print_temperature": { "default_value": 220 }, + "speed_print": { "default_value": 32 }, + "optimize_wall_printing_order": { "value": "True" }, + "infill_sparse_density": { "default_value": 10 } + } +} \ No newline at end of file From 54f41b964169acdf4edc45cb2306f0eaf6a45cbc Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Thu, 22 Apr 2021 17:11:03 +0800 Subject: [PATCH 05/11] Extruder for Atom Plus (1mm) --- resources/extruders/atomPlus_extruder_0.def.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 resources/extruders/atomPlus_extruder_0.def.json diff --git a/resources/extruders/atomPlus_extruder_0.def.json b/resources/extruders/atomPlus_extruder_0.def.json new file mode 100644 index 0000000000..7a76eada02 --- /dev/null +++ b/resources/extruders/atomPlus_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "Atom Plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 1 }, + "material_diameter": { "default_value": 1.75 } + } +} From 1dab6e39e11840313e5cb65b318dd8ef72b28637 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Thu, 29 Apr 2021 22:31:53 +0800 Subject: [PATCH 06/11] Match ID for Atom2 Co-authored-by: Jaime van Kessel --- resources/extruders/atom2_extruder_0.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/atom2_extruder_0.def.json b/resources/extruders/atom2_extruder_0.def.json index 50e1f8501f..be9d5782ff 100644 --- a/resources/extruders/atom2_extruder_0.def.json +++ b/resources/extruders/atom2_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "Atom 2", + "machine": "atom2", "position": "0" }, From fbd2b45dd0591db348cb9a9485ac7adf1824d4c3 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Thu, 29 Apr 2021 22:32:22 +0800 Subject: [PATCH 07/11] Match ID for atomPlus Co-authored-by: Jaime van Kessel --- resources/extruders/atomPlus_extruder_0.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/atomPlus_extruder_0.def.json b/resources/extruders/atomPlus_extruder_0.def.json index 7a76eada02..19ab13cf79 100644 --- a/resources/extruders/atomPlus_extruder_0.def.json +++ b/resources/extruders/atomPlus_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "Atom Plus", + "machine": "atomPlus", "position": "0" }, From d089bf16cd22cdeb121672b9c445c27b17b4e8be Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Wed, 5 May 2021 11:54:55 +0800 Subject: [PATCH 08/11] Add files via upload Minor tweaks --- resources/definitions/atom2.def.json | 10 ++-------- resources/definitions/atomPlus.def.json | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json index 3918631699..8fbbe2c698 100644 --- a/resources/definitions/atom2.def.json +++ b/resources/definitions/atom2.def.json @@ -21,15 +21,13 @@ "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": false }, "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, "layer_height": { "default_value": 0.2 }, - "default_material_print_temperature": { "default_value": 200 }, + "default_material_print_temperature": { "default_value": 210 }, "speed_print": { "default_value": 32 }, - "infill_before_walls": { "value": false }, "optimize_wall_printing_order": { "value": "True" }, "infill_sparse_density": { "default_value": 10 }, "brim_width": @@ -44,8 +42,6 @@ "maximum_value": "0.5 * min(machine_width, machine_depth)", "enabled": "resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')", "settable_per_mesh": false, - "settable_per_extruder": true, - "limit_to_extruder": "atom2_extruder_0", "children": { "brim_line_count": @@ -59,9 +55,7 @@ "maximum_value": "0.5 * min(machine_width, machine_depth) / skirt_brim_line_width", "value": 10, "enabled": "resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')", - "settable_per_mesh": false, - "settable_per_extruder": true, - "limit_to_extruder": "atom2_extruder_0" + "settable_per_mesh": false } } } diff --git a/resources/definitions/atomPlus.def.json b/resources/definitions/atomPlus.def.json index 1726fee8eb..2d053693ff 100644 --- a/resources/definitions/atomPlus.def.json +++ b/resources/definitions/atomPlus.def.json @@ -21,7 +21,6 @@ "machine_extruder_count": { "default_value": 1 }, "machine_heated_bed": { "default_value": false }, "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, From 6560766b1ffc5dd83c6eebf45d7754b77007b925 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Tue, 13 Jul 2021 22:40:39 +0800 Subject: [PATCH 09/11] Update atom2.def.json Simplify brim width to adjust only the value --- resources/definitions/atom2.def.json | 32 ++-------------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json index 8fbbe2c698..d7a26546d8 100644 --- a/resources/definitions/atom2.def.json +++ b/resources/definitions/atom2.def.json @@ -30,34 +30,6 @@ "speed_print": { "default_value": 32 }, "optimize_wall_printing_order": { "value": "True" }, "infill_sparse_density": { "default_value": 10 }, - "brim_width": - { - "label": "Brim Width", - "description": "The distance from the model to the outermost brim line. A larger brim enhances adhesion to the build plate, but also reduces the effective print area.", - "type": "float", - "unit": "mm", - "default_value": 4, - "minimum_value": "0.0", - "maximum_value_warning": "50.0", - "maximum_value": "0.5 * min(machine_width, machine_depth)", - "enabled": "resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')", - "settable_per_mesh": false, - "children": - { - "brim_line_count": - { - "label": "Brim Line Count", - "description": "The number of lines used for a brim. More brim lines enhance adhesion to the build plate, but also reduces the effective print area.", - "type": "int", - "default_value": 10, - "minimum_value": "0", - "maximum_value_warning": "50 / skirt_brim_line_width", - "maximum_value": "0.5 * min(machine_width, machine_depth) / skirt_brim_line_width", - "value": 10, - "enabled": "resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')", - "settable_per_mesh": false - } - } - } + "brim_width": { "default_value": 4 } } -} \ No newline at end of file +} From 8414e8b52372372ea54554fcfc44512257a4f206 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Tue, 13 Jul 2021 22:42:03 +0800 Subject: [PATCH 10/11] Delete atomPlus.def.json Prototype machine --- resources/definitions/atomPlus.def.json | 34 ------------------------- 1 file changed, 34 deletions(-) delete mode 100644 resources/definitions/atomPlus.def.json diff --git a/resources/definitions/atomPlus.def.json b/resources/definitions/atomPlus.def.json deleted file mode 100644 index 2d053693ff..0000000000 --- a/resources/definitions/atomPlus.def.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "Atom Plus", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Victor (Yu Chieh) Lin", - "manufacturer": "Layer One", - "file_formats": "text/x-gcode", - "platform_offset": [0,0,0], - "machine_extruder_trains": { "0": "atomPlus_extruder_0" - } - }, - - "overrides": { - "machine_name": { "default_value": "Atom Plus" }, - "machine_shape": { "default_value": "elliptic" }, - "machine_width": { "default_value": 420 }, - "machine_depth": { "default_value": 420 }, - "machine_height": { "default_value": 910 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": false }, - "machine_center_is_zero": { "default_value": true }, - - "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, - "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, - - "layer_height": { "default_value": 0.4 }, - "default_material_print_temperature": { "default_value": 220 }, - "speed_print": { "default_value": 32 }, - "optimize_wall_printing_order": { "value": "True" }, - "infill_sparse_density": { "default_value": 10 } - } -} \ No newline at end of file From 52b022c575bfb6205b5094866da6a8046d0e9056 Mon Sep 17 00:00:00 2001 From: Victor Lin <60565737+v-xup6@users.noreply.github.com> Date: Tue, 13 Jul 2021 22:42:12 +0800 Subject: [PATCH 11/11] Delete atomPlus_extruder_0.def.json Prototype machine --- resources/extruders/atomPlus_extruder_0.def.json | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 resources/extruders/atomPlus_extruder_0.def.json diff --git a/resources/extruders/atomPlus_extruder_0.def.json b/resources/extruders/atomPlus_extruder_0.def.json deleted file mode 100644 index 19ab13cf79..0000000000 --- a/resources/extruders/atomPlus_extruder_0.def.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "atomPlus", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 1 }, - "material_diameter": { "default_value": 1.75 } - } -}