From 64354fb0d9ebfc1e6060a781de7f9cefbc804ad7 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sat, 6 Aug 2022 16:11:02 -0300 Subject: [PATCH 01/22] Create creality_sermoonv1.def.json --- .../definitions/creality_sermoonv1.def.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/definitions/creality_sermoonv1.def.json diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json new file mode 100644 index 0000000000..fdc8a2b339 --- /dev/null +++ b/resources/definitions/creality_sermoonv1.def.json @@ -0,0 +1,25 @@ +{ + "name": "Creality Sermoon V1", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Sermoon V1" }, + "machine_width": { "default_value": 175 }, + "machine_depth": { "default_value": 175 }, + "machine_height": { "default_value": 165 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} From e4cd944a37346bd426c1a53600f11b5ce9f91f2d Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sat, 6 Aug 2022 16:12:27 -0300 Subject: [PATCH 02/22] Create creality_sermoonv1pro.def.json --- .../creality_sermoonv1pro.def.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/definitions/creality_sermoonv1pro.def.json diff --git a/resources/definitions/creality_sermoonv1pro.def.json b/resources/definitions/creality_sermoonv1pro.def.json new file mode 100644 index 0000000000..9b603c7617 --- /dev/null +++ b/resources/definitions/creality_sermoonv1pro.def.json @@ -0,0 +1,25 @@ +{ + "name": "Creality Sermoon V1 Pro", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Sermoon V1 Pro" }, + "machine_width": { "default_value": 175 }, + "machine_depth": { "default_value": 175 }, + "machine_height": { "default_value": 165 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} From bc68c753fb55708c93f1ffab76fcbc816118a2af Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Thu, 11 Aug 2022 17:56:44 -0300 Subject: [PATCH 03/22] Delete creality_sermoonv1pro.def.json Delete redundant sermoon v1 pro as it is the same printer model on all relevant specs --- .../creality_sermoonv1pro.def.json | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 resources/definitions/creality_sermoonv1pro.def.json diff --git a/resources/definitions/creality_sermoonv1pro.def.json b/resources/definitions/creality_sermoonv1pro.def.json deleted file mode 100644 index 9b603c7617..0000000000 --- a/resources/definitions/creality_sermoonv1pro.def.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "Creality Sermoon V1 Pro", - "version": 2, - "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality Sermoon V1 Pro" }, - "machine_width": { "default_value": 175 }, - "machine_depth": { "default_value": 175 }, - "machine_height": { "default_value": 165 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [32, -32], - [32, 34] - ] - }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true - } -} From ae65a16b453ddcfb0729c65bb7051ed3a97c6462 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Thu, 11 Aug 2022 17:57:30 -0300 Subject: [PATCH 04/22] Update creality_sermoonv1.def.json --- resources/definitions/creality_sermoonv1.def.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index fdc8a2b339..eed28a4e59 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "creality_base", "overrides": { - "machine_name": { "default_value": "Creality Sermoon V1" }, + "machine_name": { "default_value": "Creality Sermoon V1/V1 Pro" }, "machine_width": { "default_value": 175 }, "machine_depth": { "default_value": 175 }, "machine_height": { "default_value": 165 }, @@ -14,9 +14,7 @@ [32, 34] ] }, - "gantry_height": { "value": 25 } - }, "metadata": { "quality_definition": "creality_base", From fa9b8b94369b392b05c574c33e694a6eb57eeb87 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Thu, 11 Aug 2022 17:57:58 -0300 Subject: [PATCH 05/22] Update creality_sermoonv1.def.json --- resources/definitions/creality_sermoonv1.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index eed28a4e59..3297a9bd93 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -1,9 +1,9 @@ { - "name": "Creality Sermoon V1", + "name": "Creality Sermoon V1/V1 Pro", "version": 2, "inherits": "creality_base", "overrides": { - "machine_name": { "default_value": "Creality Sermoon V1/V1 Pro" }, + "machine_name": { "default_value": "Creality Sermoon V1" }, "machine_width": { "default_value": 175 }, "machine_depth": { "default_value": 175 }, "machine_height": { "default_value": 165 }, From 4501ce3f3853d533afb824f35100255ed832776a Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Thu, 11 Aug 2022 18:09:14 -0300 Subject: [PATCH 06/22] Sermoon V1/V1 Pro: Update metadata and add custom machine_start_gcode, machine_end_gcode --- .../definitions/creality_sermoonv1.def.json | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 3297a9bd93..836ca3e525 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -2,22 +2,40 @@ "name": "Creality Sermoon V1/V1 Pro", "version": 2, "inherits": "creality_base", + "metadata": { + "author": "Luis Gabriel Gomez", + "quality_definition": "creality_base", + "visible": true + }, "overrides": { - "machine_name": { "default_value": "Creality Sermoon V1" }, - "machine_width": { "default_value": 175 }, - "machine_depth": { "default_value": 175 }, - "machine_height": { "default_value": 165 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_name": { + "default_value": "Creality Sermoon V1" + }, + "machine_width": { + "default_value": 175 + }, + "machine_depth": { + "default_value": 175 + }, + "machine_height": { + "default_value": 165 + }, + "machine_head_with_fans_polygon": { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - "gantry_height": { "value": 25 } - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "gantry_height": { + "value": 25 + }, + "machine_start_gcode": { + "default_value": "; -- START GCODE --\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y170.0 Z0.28 F1500.0 E12 ;Draw the first line\nG1 X10.4 Y170.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" + }, + "machine_end_gcode": { + "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" + } } } From b07eeeba9a19054bdf9f47a3c87c133cc7260241 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Thu, 11 Aug 2022 18:13:44 -0300 Subject: [PATCH 07/22] Sermoon V1: Disable machine centering by default --- resources/definitions/creality_sermoonv1.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 836ca3e525..6cd8c249d6 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -31,6 +31,9 @@ "gantry_height": { "value": 25 }, + "machine_center_is_zero": { + "default_value": false + }, "machine_start_gcode": { "default_value": "; -- START GCODE --\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y170.0 Z0.28 F1500.0 E12 ;Draw the first line\nG1 X10.4 Y170.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, From fef2d945c10e2bba10790476df0ccbb720f1a9c0 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sat, 17 Sep 2022 16:00:51 -0300 Subject: [PATCH 08/22] Sermoon V1: Update definition, add variants --- resources/definitions/creality_sermoonv1.def.json | 7 +++++-- resources/variants/creality_sermoonv1_0.2.inst.cfg | 12 ++++++++++++ resources/variants/creality_sermoonv1_0.3.inst.cfg | 12 ++++++++++++ resources/variants/creality_sermoonv1_0.4.inst.cfg | 12 ++++++++++++ resources/variants/creality_sermoonv1_0.5.inst.cfg | 12 ++++++++++++ resources/variants/creality_sermoonv1_0.6.inst.cfg | 12 ++++++++++++ resources/variants/creality_sermoonv1_0.8.inst.cfg | 12 ++++++++++++ 7 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 resources/variants/creality_sermoonv1_0.2.inst.cfg create mode 100644 resources/variants/creality_sermoonv1_0.3.inst.cfg create mode 100644 resources/variants/creality_sermoonv1_0.4.inst.cfg create mode 100644 resources/variants/creality_sermoonv1_0.5.inst.cfg create mode 100644 resources/variants/creality_sermoonv1_0.6.inst.cfg create mode 100644 resources/variants/creality_sermoonv1_0.8.inst.cfg diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 6cd8c249d6..a0ef48e080 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -28,6 +28,8 @@ [32, 34] ] }, + "has_variants": true, + "preferred_variant_name": "0.4mm Nozzle", "gantry_height": { "value": 25 }, @@ -39,6 +41,7 @@ }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" - } + }, + "speed_print": { "default_value": 50 } } -} +} \ No newline at end of file diff --git a/resources/variants/creality_sermoonv1_0.2.inst.cfg b/resources/variants/creality_sermoonv1_0.2.inst.cfg new file mode 100644 index 0000000000..0d17239e58 --- /dev/null +++ b/resources/variants/creality_sermoonv1_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_sermoonv1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_sermoonv1_0.3.inst.cfg b/resources/variants/creality_sermoonv1_0.3.inst.cfg new file mode 100644 index 0000000000..c815600706 --- /dev/null +++ b/resources/variants/creality_sermoonv1_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_sermoonv1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_sermoonv1_0.4.inst.cfg b/resources/variants/creality_sermoonv1_0.4.inst.cfg new file mode 100644 index 0000000000..49ad44a838 --- /dev/null +++ b/resources/variants/creality_sermoonv1_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_sermoonv1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_sermoonv1_0.5.inst.cfg b/resources/variants/creality_sermoonv1_0.5.inst.cfg new file mode 100644 index 0000000000..82a3d57259 --- /dev/null +++ b/resources/variants/creality_sermoonv1_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_sermoonv1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_sermoonv1_0.6.inst.cfg b/resources/variants/creality_sermoonv1_0.6.inst.cfg new file mode 100644 index 0000000000..0004e17fa9 --- /dev/null +++ b/resources/variants/creality_sermoonv1_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_sermoonv1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_sermoonv1_0.8.inst.cfg b/resources/variants/creality_sermoonv1_0.8.inst.cfg new file mode 100644 index 0000000000..10d4cdb170 --- /dev/null +++ b/resources/variants/creality_sermoonv1_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_sermoonv1 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 From ed6014f43343d655339d37aae971b42da322a2d9 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Tue, 20 Sep 2022 22:44:36 -0300 Subject: [PATCH 09/22] Update resources/definitions/creality_sermoonv1.def.json Co-authored-by: Jaime van Kessel --- resources/definitions/creality_sermoonv1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index a0ef48e080..11e8483eef 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -42,6 +42,6 @@ "machine_end_gcode": { "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, - "speed_print": { "default_value": 50 } + "speed_print": { "value": 50 } } } \ No newline at end of file From 7c8cf21698890ef893133a330d26683f8631d11d Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Tue, 20 Sep 2022 22:46:33 -0300 Subject: [PATCH 10/22] Apply PR feedback on sermoon v1 def See #12966 --- resources/definitions/creality_sermoonv1.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 11e8483eef..214b189e58 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -5,7 +5,8 @@ "metadata": { "author": "Luis Gabriel Gomez", "quality_definition": "creality_base", - "visible": true + "visible": true, + "has_variants": true }, "overrides": { "machine_name": { @@ -28,7 +29,6 @@ [32, 34] ] }, - "has_variants": true, "preferred_variant_name": "0.4mm Nozzle", "gantry_height": { "value": 25 From a99f7298e8b4e7b720ec2fe2ccf4f952e95209d0 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sat, 6 Aug 2022 16:12:27 -0300 Subject: [PATCH 11/22] Create creality_sermoonv1pro.def.json --- .../creality_sermoonv1pro.def.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/definitions/creality_sermoonv1pro.def.json diff --git a/resources/definitions/creality_sermoonv1pro.def.json b/resources/definitions/creality_sermoonv1pro.def.json new file mode 100644 index 0000000000..9b603c7617 --- /dev/null +++ b/resources/definitions/creality_sermoonv1pro.def.json @@ -0,0 +1,25 @@ +{ + "name": "Creality Sermoon V1 Pro", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Sermoon V1 Pro" }, + "machine_width": { "default_value": 175 }, + "machine_depth": { "default_value": 175 }, + "machine_height": { "default_value": 165 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} From 1dae3c440be45e7b279622c15b5d213a885b0403 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Thu, 11 Aug 2022 17:56:44 -0300 Subject: [PATCH 12/22] Delete creality_sermoonv1pro.def.json Delete redundant sermoon v1 pro as it is the same printer model on all relevant specs --- .../creality_sermoonv1pro.def.json | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 resources/definitions/creality_sermoonv1pro.def.json diff --git a/resources/definitions/creality_sermoonv1pro.def.json b/resources/definitions/creality_sermoonv1pro.def.json deleted file mode 100644 index 9b603c7617..0000000000 --- a/resources/definitions/creality_sermoonv1pro.def.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "Creality Sermoon V1 Pro", - "version": 2, - "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality Sermoon V1 Pro" }, - "machine_width": { "default_value": 175 }, - "machine_depth": { "default_value": 175 }, - "machine_height": { "default_value": 165 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [32, -32], - [32, 34] - ] - }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true - } -} From 86cf975b7df69169f1dffea277baf3af83746ea1 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Thu, 11 Aug 2022 18:09:14 -0300 Subject: [PATCH 13/22] Sermoon V1/V1 Pro: Update metadata and add custom machine_start_gcode, machine_end_gcode --- resources/definitions/creality_sermoonv1.def.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 214b189e58..12e31ce6ce 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -5,8 +5,7 @@ "metadata": { "author": "Luis Gabriel Gomez", "quality_definition": "creality_base", - "visible": true, - "has_variants": true + "visible": true }, "overrides": { "machine_name": { @@ -29,19 +28,14 @@ [32, 34] ] }, - "preferred_variant_name": "0.4mm Nozzle", "gantry_height": { "value": 25 }, - "machine_center_is_zero": { - "default_value": false - }, "machine_start_gcode": { "default_value": "; -- START GCODE --\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y170.0 Z0.28 F1500.0 E12 ;Draw the first line\nG1 X10.4 Y170.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" - }, - "speed_print": { "value": 50 } + } } } \ No newline at end of file From b16d7ec8246728f6ba3df00f1b593c9f09841a41 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Thu, 11 Aug 2022 18:13:44 -0300 Subject: [PATCH 14/22] Sermoon V1: Disable machine centering by default --- resources/definitions/creality_sermoonv1.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 12e31ce6ce..b48305b8da 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -31,6 +31,9 @@ "gantry_height": { "value": 25 }, + "machine_center_is_zero": { + "default_value": false + }, "machine_start_gcode": { "default_value": "; -- START GCODE --\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y170.0 Z0.28 F1500.0 E12 ;Draw the first line\nG1 X10.4 Y170.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, From 87aebe68e4e902ef78e5e0300d0791415aee0cad Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Sat, 17 Sep 2022 16:00:51 -0300 Subject: [PATCH 15/22] Sermoon V1: Update definition, add variants --- resources/definitions/creality_sermoonv1.def.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index b48305b8da..a0ef48e080 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -28,6 +28,8 @@ [32, 34] ] }, + "has_variants": true, + "preferred_variant_name": "0.4mm Nozzle", "gantry_height": { "value": 25 }, @@ -39,6 +41,7 @@ }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" - } + }, + "speed_print": { "default_value": 50 } } } \ No newline at end of file From 4b38af378972f9305478ef04d4a2487a5ca6efb7 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Tue, 20 Sep 2022 22:44:36 -0300 Subject: [PATCH 16/22] Update resources/definitions/creality_sermoonv1.def.json Co-authored-by: Jaime van Kessel --- resources/definitions/creality_sermoonv1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index a0ef48e080..11e8483eef 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -42,6 +42,6 @@ "machine_end_gcode": { "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, - "speed_print": { "default_value": 50 } + "speed_print": { "value": 50 } } } \ No newline at end of file From 4fabf0aeaa3e7074ae27a63eb49ce37f085c6435 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Tue, 20 Sep 2022 22:46:33 -0300 Subject: [PATCH 17/22] Apply PR feedback on sermoon v1 def See #12966 --- resources/definitions/creality_sermoonv1.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 11e8483eef..214b189e58 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -5,7 +5,8 @@ "metadata": { "author": "Luis Gabriel Gomez", "quality_definition": "creality_base", - "visible": true + "visible": true, + "has_variants": true }, "overrides": { "machine_name": { @@ -28,7 +29,6 @@ [32, 34] ] }, - "has_variants": true, "preferred_variant_name": "0.4mm Nozzle", "gantry_height": { "value": 25 From 60f326715a3bffd0a06b102f7497b338e14b93b0 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Wed, 30 Nov 2022 19:43:34 -0300 Subject: [PATCH 18/22] Revert: remove non-standard nozzle profiles --- resources/variants/creality_sermoonv1_0.2.inst.cfg | 12 ------------ resources/variants/creality_sermoonv1_0.3.inst.cfg | 12 ------------ resources/variants/creality_sermoonv1_0.5.inst.cfg | 12 ------------ resources/variants/creality_sermoonv1_0.6.inst.cfg | 12 ------------ resources/variants/creality_sermoonv1_0.8.inst.cfg | 12 ------------ 5 files changed, 60 deletions(-) delete mode 100644 resources/variants/creality_sermoonv1_0.2.inst.cfg delete mode 100644 resources/variants/creality_sermoonv1_0.3.inst.cfg delete mode 100644 resources/variants/creality_sermoonv1_0.5.inst.cfg delete mode 100644 resources/variants/creality_sermoonv1_0.6.inst.cfg delete mode 100644 resources/variants/creality_sermoonv1_0.8.inst.cfg diff --git a/resources/variants/creality_sermoonv1_0.2.inst.cfg b/resources/variants/creality_sermoonv1_0.2.inst.cfg deleted file mode 100644 index 0d17239e58..0000000000 --- a/resources/variants/creality_sermoonv1_0.2.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.2mm Nozzle -version = 4 -definition = creality_sermoonv1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_sermoonv1_0.3.inst.cfg b/resources/variants/creality_sermoonv1_0.3.inst.cfg deleted file mode 100644 index c815600706..0000000000 --- a/resources/variants/creality_sermoonv1_0.3.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.3mm Nozzle -version = 4 -definition = creality_sermoonv1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_sermoonv1_0.5.inst.cfg b/resources/variants/creality_sermoonv1_0.5.inst.cfg deleted file mode 100644 index 82a3d57259..0000000000 --- a/resources/variants/creality_sermoonv1_0.5.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.5mm Nozzle -version = 4 -definition = creality_sermoonv1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_sermoonv1_0.6.inst.cfg b/resources/variants/creality_sermoonv1_0.6.inst.cfg deleted file mode 100644 index 0004e17fa9..0000000000 --- a/resources/variants/creality_sermoonv1_0.6.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.6mm Nozzle -version = 4 -definition = creality_sermoonv1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_sermoonv1_0.8.inst.cfg b/resources/variants/creality_sermoonv1_0.8.inst.cfg deleted file mode 100644 index 10d4cdb170..0000000000 --- a/resources/variants/creality_sermoonv1_0.8.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.8mm Nozzle -version = 4 -definition = creality_sermoonv1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 From b1507e8d71c4e71ee7c759a0797bc93cd7892ea1 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Wed, 30 Nov 2022 20:24:01 -0300 Subject: [PATCH 19/22] Change definition name --- resources/definitions/creality_sermoonv1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 214b189e58..244d63cd80 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -1,5 +1,5 @@ { - "name": "Creality Sermoon V1/V1 Pro", + "name": "Creality Sermoon V1 & V1 Pro", "version": 2, "inherits": "creality_base", "metadata": { From e897cfdb39baa65aeb2087a744c3c405a7b75c7c Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Wed, 30 Nov 2022 20:27:42 -0300 Subject: [PATCH 20/22] Update resources/definitions/creality_sermoonv1.def.json Co-authored-by: Jelle Spijker --- resources/definitions/creality_sermoonv1.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index 244d63cd80..f50e8b67ff 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -29,7 +29,6 @@ [32, 34] ] }, - "preferred_variant_name": "0.4mm Nozzle", "gantry_height": { "value": 25 }, From 4c1f6041e4e4858be02952a6b38591538d4a552c Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Wed, 30 Nov 2022 20:32:16 -0300 Subject: [PATCH 21/22] Update resources/definitions/creality_sermoonv1.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/creality_sermoonv1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index f50e8b67ff..d147139440 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -41,6 +41,6 @@ "machine_end_gcode": { "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, - "speed_print": { "value": 50 } + } } \ No newline at end of file From d810623f75f7b75b4551a0bcb0fc92f19ad324d1 Mon Sep 17 00:00:00 2001 From: Luis Gabriel Gomez Date: Wed, 30 Nov 2022 20:39:44 -0300 Subject: [PATCH 22/22] Fix gh commit leftover --- resources/definitions/creality_sermoonv1.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/creality_sermoonv1.def.json b/resources/definitions/creality_sermoonv1.def.json index d147139440..71f35119a8 100644 --- a/resources/definitions/creality_sermoonv1.def.json +++ b/resources/definitions/creality_sermoonv1.def.json @@ -40,7 +40,6 @@ }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z0.5 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" - }, - + } } } \ No newline at end of file