From 1f91fd0912173827a75840c61b0be5c0ed4e4472 Mon Sep 17 00:00:00 2001 From: izilzty Date: Tue, 6 Sep 2022 16:33:44 +0800 Subject: [PATCH 1/4] Add profile for Creality Ender 3 S1 Pro and Plus --- .../creality_ender3s1plus.def.json | 34 +++++++++++++++++++ .../definitions/creality_ender3s1pro.def.json | 34 +++++++++++++++++++ .../creality_ender3s1plus_0.2.inst.cfg | 12 +++++++ .../creality_ender3s1plus_0.3.inst.cfg | 12 +++++++ .../creality_ender3s1plus_0.4.inst.cfg | 12 +++++++ .../creality_ender3s1plus_0.5.inst.cfg | 12 +++++++ .../creality_ender3s1plus_0.6.inst.cfg | 12 +++++++ .../creality_ender3s1plus_0.8.inst.cfg | 12 +++++++ .../creality_ender3s1plus_1.0.inst.cfg | 12 +++++++ .../creality_ender3s1pro_0.4.inst.cfg | 12 +++++++ 10 files changed, 164 insertions(+) create mode 100644 resources/definitions/creality_ender3s1plus.def.json create mode 100644 resources/definitions/creality_ender3s1pro.def.json create mode 100644 resources/variants/creality_ender3s1plus_0.2.inst.cfg create mode 100644 resources/variants/creality_ender3s1plus_0.3.inst.cfg create mode 100644 resources/variants/creality_ender3s1plus_0.4.inst.cfg create mode 100644 resources/variants/creality_ender3s1plus_0.5.inst.cfg create mode 100644 resources/variants/creality_ender3s1plus_0.6.inst.cfg create mode 100644 resources/variants/creality_ender3s1plus_0.8.inst.cfg create mode 100644 resources/variants/creality_ender3s1plus_1.0.inst.cfg create mode 100644 resources/variants/creality_ender3s1pro_0.4.inst.cfg diff --git a/resources/definitions/creality_ender3s1plus.def.json b/resources/definitions/creality_ender3s1plus.def.json new file mode 100644 index 0000000000..573cbd41b6 --- /dev/null +++ b/resources/definitions/creality_ender3s1plus.def.json @@ -0,0 +1,34 @@ +{ + "name": "Creality Ender-3 S1 Plus", + "version": 2, + "inherits": "creality_base", + "metadata": { + "quality_definition": "creality_base", + "visible": true + }, + "overrides": { + "machine_name": { "default_value": "Creality Ender-3 S1 Plus" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_start_gcode": { + "default_value": "; Ender 3 S1 Plus Start G-code\nG28 ;Home\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 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" + }, + + "gantry_height": { "value": 25 }, + + "speed_print": {"value": 50}, + "speed_layer_0": {"value": 25}, + "speed_travel": { "default_value": 120 }, + "retraction_amount": {"value": 0.8}, + "retraction_speed": { "default_value": 40} + + } +} diff --git a/resources/definitions/creality_ender3s1pro.def.json b/resources/definitions/creality_ender3s1pro.def.json new file mode 100644 index 0000000000..46a888ad8e --- /dev/null +++ b/resources/definitions/creality_ender3s1pro.def.json @@ -0,0 +1,34 @@ +{ + "name": "Creality Ender-3 S1 Pro", + "version": 2, + "inherits": "creality_base", + "metadata": { + "quality_definition": "creality_base", + "visible": true + }, + "overrides": { + "machine_name": { "default_value": "Creality Ender-3 S1 Pro" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 270 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_start_gcode": { + "default_value": "; Ender 3 S1 Pro Start G-code\nG28 ;Home\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 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" + }, + + "gantry_height": { "value": 25 }, + + "speed_print": {"value": 50}, + "speed_layer_0": {"value": 20}, + "speed_travel": { "default_value": 120 }, + "retraction_amount": {"value": 0.8}, + "retraction_speed": { "default_value": 40} + + } +} diff --git a/resources/variants/creality_ender3s1plus_0.2.inst.cfg b/resources/variants/creality_ender3s1plus_0.2.inst.cfg new file mode 100644 index 0000000000..60c7244e1b --- /dev/null +++ b/resources/variants/creality_ender3s1plus_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_ender3s1plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender3s1plus_0.3.inst.cfg b/resources/variants/creality_ender3s1plus_0.3.inst.cfg new file mode 100644 index 0000000000..c894c66338 --- /dev/null +++ b/resources/variants/creality_ender3s1plus_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_ender3s1plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender3s1plus_0.4.inst.cfg b/resources/variants/creality_ender3s1plus_0.4.inst.cfg new file mode 100644 index 0000000000..fc4aadfc60 --- /dev/null +++ b/resources/variants/creality_ender3s1plus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_ender3s1plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender3s1plus_0.5.inst.cfg b/resources/variants/creality_ender3s1plus_0.5.inst.cfg new file mode 100644 index 0000000000..1cdb2ed71e --- /dev/null +++ b/resources/variants/creality_ender3s1plus_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_ender3s1plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender3s1plus_0.6.inst.cfg b/resources/variants/creality_ender3s1plus_0.6.inst.cfg new file mode 100644 index 0000000000..d3324f7a69 --- /dev/null +++ b/resources/variants/creality_ender3s1plus_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_ender3s1plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender3s1plus_0.8.inst.cfg b/resources/variants/creality_ender3s1plus_0.8.inst.cfg new file mode 100644 index 0000000000..a9a45c082c --- /dev/null +++ b/resources/variants/creality_ender3s1plus_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_ender3s1plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender3s1plus_1.0.inst.cfg b/resources/variants/creality_ender3s1plus_1.0.inst.cfg new file mode 100644 index 0000000000..184d48ae29 --- /dev/null +++ b/resources/variants/creality_ender3s1plus_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_ender3s1plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/creality_ender3s1pro_0.4.inst.cfg b/resources/variants/creality_ender3s1pro_0.4.inst.cfg new file mode 100644 index 0000000000..76dd2d83d8 --- /dev/null +++ b/resources/variants/creality_ender3s1pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_ender3s1pro + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 From f18c66ef40797c54bedb4fe11da77508f9a919bc Mon Sep 17 00:00:00 2001 From: izilzty Date: Sat, 17 Sep 2022 16:43:31 +0800 Subject: [PATCH 2/4] Update setting_version and format json file --- resources/definitions/creality_ender3s1plus.def.json | 10 +++++----- resources/definitions/creality_ender3s1pro.def.json | 10 +++++----- resources/variants/creality_ender3s1plus_0.2.inst.cfg | 2 +- resources/variants/creality_ender3s1plus_0.3.inst.cfg | 2 +- resources/variants/creality_ender3s1plus_0.4.inst.cfg | 2 +- resources/variants/creality_ender3s1plus_0.5.inst.cfg | 2 +- resources/variants/creality_ender3s1plus_0.6.inst.cfg | 2 +- resources/variants/creality_ender3s1plus_0.8.inst.cfg | 2 +- resources/variants/creality_ender3s1plus_1.0.inst.cfg | 2 +- resources/variants/creality_ender3s1pro_0.4.inst.cfg | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/definitions/creality_ender3s1plus.def.json b/resources/definitions/creality_ender3s1plus.def.json index 573cbd41b6..38784fabe0 100644 --- a/resources/definitions/creality_ender3s1plus.def.json +++ b/resources/definitions/creality_ender3s1plus.def.json @@ -24,11 +24,11 @@ "gantry_height": { "value": 25 }, - "speed_print": {"value": 50}, - "speed_layer_0": {"value": 25}, + "speed_print": { "value": 50 }, + "speed_layer_0": { "value": 25 }, "speed_travel": { "default_value": 120 }, - "retraction_amount": {"value": 0.8}, - "retraction_speed": { "default_value": 40} - + + "retraction_amount": { "value": 0.8 }, + "retraction_speed": { "default_value": 40 } } } diff --git a/resources/definitions/creality_ender3s1pro.def.json b/resources/definitions/creality_ender3s1pro.def.json index 46a888ad8e..6e028fb32d 100644 --- a/resources/definitions/creality_ender3s1pro.def.json +++ b/resources/definitions/creality_ender3s1pro.def.json @@ -24,11 +24,11 @@ "gantry_height": { "value": 25 }, - "speed_print": {"value": 50}, - "speed_layer_0": {"value": 20}, + "speed_print": { "value": 50 }, + "speed_layer_0": { "value": 20 }, "speed_travel": { "default_value": 120 }, - "retraction_amount": {"value": 0.8}, - "retraction_speed": { "default_value": 40} - + + "retraction_amount": { "value": 0.8 }, + "retraction_speed": { "default_value": 40 } } } diff --git a/resources/variants/creality_ender3s1plus_0.2.inst.cfg b/resources/variants/creality_ender3s1plus_0.2.inst.cfg index 60c7244e1b..7cfd154ab6 100644 --- a/resources/variants/creality_ender3s1plus_0.2.inst.cfg +++ b/resources/variants/creality_ender3s1plus_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3s1plus [metadata] -setting_version = 16 +setting_version = 20 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3s1plus_0.3.inst.cfg b/resources/variants/creality_ender3s1plus_0.3.inst.cfg index c894c66338..a531f6ee33 100644 --- a/resources/variants/creality_ender3s1plus_0.3.inst.cfg +++ b/resources/variants/creality_ender3s1plus_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3s1plus [metadata] -setting_version = 16 +setting_version = 20 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3s1plus_0.4.inst.cfg b/resources/variants/creality_ender3s1plus_0.4.inst.cfg index fc4aadfc60..6f675550fc 100644 --- a/resources/variants/creality_ender3s1plus_0.4.inst.cfg +++ b/resources/variants/creality_ender3s1plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3s1plus [metadata] -setting_version = 16 +setting_version = 20 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3s1plus_0.5.inst.cfg b/resources/variants/creality_ender3s1plus_0.5.inst.cfg index 1cdb2ed71e..2ebba008f7 100644 --- a/resources/variants/creality_ender3s1plus_0.5.inst.cfg +++ b/resources/variants/creality_ender3s1plus_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3s1plus [metadata] -setting_version = 16 +setting_version = 20 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3s1plus_0.6.inst.cfg b/resources/variants/creality_ender3s1plus_0.6.inst.cfg index d3324f7a69..41bbdf774a 100644 --- a/resources/variants/creality_ender3s1plus_0.6.inst.cfg +++ b/resources/variants/creality_ender3s1plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3s1plus [metadata] -setting_version = 16 +setting_version = 20 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3s1plus_0.8.inst.cfg b/resources/variants/creality_ender3s1plus_0.8.inst.cfg index a9a45c082c..056dee24e0 100644 --- a/resources/variants/creality_ender3s1plus_0.8.inst.cfg +++ b/resources/variants/creality_ender3s1plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3s1plus [metadata] -setting_version = 16 +setting_version = 20 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3s1plus_1.0.inst.cfg b/resources/variants/creality_ender3s1plus_1.0.inst.cfg index 184d48ae29..da0ef959d0 100644 --- a/resources/variants/creality_ender3s1plus_1.0.inst.cfg +++ b/resources/variants/creality_ender3s1plus_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3s1plus [metadata] -setting_version = 16 +setting_version = 20 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3s1pro_0.4.inst.cfg b/resources/variants/creality_ender3s1pro_0.4.inst.cfg index 76dd2d83d8..c842c6fb36 100644 --- a/resources/variants/creality_ender3s1pro_0.4.inst.cfg +++ b/resources/variants/creality_ender3s1pro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3s1pro [metadata] -setting_version = 16 +setting_version = 20 type = variant hardware_type = nozzle From f3c95d38083e0cbc8a7993b03707641b9203b3e2 Mon Sep 17 00:00:00 2001 From: izilzty Date: Mon, 19 Sep 2022 17:16:25 +0800 Subject: [PATCH 3/4] Fix speed_travel value --- resources/definitions/creality_ender3s1plus.def.json | 2 +- resources/definitions/creality_ender3s1pro.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_ender3s1plus.def.json b/resources/definitions/creality_ender3s1plus.def.json index 38784fabe0..33692ad569 100644 --- a/resources/definitions/creality_ender3s1plus.def.json +++ b/resources/definitions/creality_ender3s1plus.def.json @@ -26,7 +26,7 @@ "speed_print": { "value": 50 }, "speed_layer_0": { "value": 25 }, - "speed_travel": { "default_value": 120 }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "retraction_amount": { "value": 0.8 }, "retraction_speed": { "default_value": 40 } diff --git a/resources/definitions/creality_ender3s1pro.def.json b/resources/definitions/creality_ender3s1pro.def.json index 6e028fb32d..2aa8be58b2 100644 --- a/resources/definitions/creality_ender3s1pro.def.json +++ b/resources/definitions/creality_ender3s1pro.def.json @@ -26,7 +26,7 @@ "speed_print": { "value": 50 }, "speed_layer_0": { "value": 20 }, - "speed_travel": { "default_value": 120 }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "retraction_amount": { "value": 0.8 }, "retraction_speed": { "default_value": 40 } From f6fcf917ec103b77b430a2f57c1110f36555770b Mon Sep 17 00:00:00 2001 From: izilzty Date: Thu, 1 Dec 2022 21:14:37 +0800 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/creality_ender3s1plus.def.json | 2 +- resources/definitions/creality_ender3s1pro.def.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/creality_ender3s1plus.def.json b/resources/definitions/creality_ender3s1plus.def.json index 33692ad569..3e4101fd07 100644 --- a/resources/definitions/creality_ender3s1plus.def.json +++ b/resources/definitions/creality_ender3s1plus.def.json @@ -24,7 +24,7 @@ "gantry_height": { "value": 25 }, - "speed_print": { "value": 50 }, + "speed_layer_0": { "value": 25 }, "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, diff --git a/resources/definitions/creality_ender3s1pro.def.json b/resources/definitions/creality_ender3s1pro.def.json index 2aa8be58b2..ab638820cd 100644 --- a/resources/definitions/creality_ender3s1pro.def.json +++ b/resources/definitions/creality_ender3s1pro.def.json @@ -24,8 +24,8 @@ "gantry_height": { "value": 25 }, - "speed_print": { "value": 50 }, - "speed_layer_0": { "value": 20 }, + + "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, "retraction_amount": { "value": 0.8 },