From 4cc45da84d3238d03ae30fdf88bd4c143aa103a2 Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:09:00 +0100 Subject: [PATCH 1/5] Added Creality Ender-5 S1 Def --- .../definitions/creality_ender5s1.def.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 resources/definitions/creality_ender5s1.def.json diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json new file mode 100644 index 0000000000..e4cdf12e60 --- /dev/null +++ b/resources/definitions/creality_ender5s1.def.json @@ -0,0 +1,42 @@ +{ + "name": "Creality Ender-5 S1", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Ender-5/Ender-3Pro" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\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\n" }, + "machine_width": { "default_value": 225 }, + "machine_depth": { "default_value": 225 }, + "machine_height": { "default_value": 305 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 }, + "build_volume_temperature": { "value": 195 }, + "material_bed_temperature": { "value": 60 }, + "retraction_amount": { "value": 2}, + "z_seam_type": { "value": "'sharpest_corner'" }, + "support_z_distance": { "value": 0.25 }, + "cool_min_layer_time": { "value": 5 }, + "wall_thickness": {"value": "line_width * 3" }, + "retraction_speed": { "value": 45 }, + "speed_print": { "value": 80.0 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} \ No newline at end of file From bd27d3a15405ff3cde6bc37699aea037c5916c4b Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:50:06 +0100 Subject: [PATCH 2/5] Added Creality Ender-5 S1 Nozzle Variants --- resources/variants/creality_ender5s1_0.2.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.3.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.4.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.5.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.6.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.8.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_1.0.inst.cfg | 12 ++++++++++++ 7 files changed, 84 insertions(+) create mode 100644 resources/variants/creality_ender5s1_0.2.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.3.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.4.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.5.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.6.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.8.inst.cfg create mode 100644 resources/variants/creality_ender5s1_1.0.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality_ender5s1_0.2.inst.cfg new file mode 100644 index 0000000000..efb2a8342c --- /dev/null +++ b/resources/variants/creality_ender5s1_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality_ender5s1_0.3.inst.cfg new file mode 100644 index 0000000000..c9d4204ace --- /dev/null +++ b/resources/variants/creality_ender5s1_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality_ender5s1_0.4.inst.cfg new file mode 100644 index 0000000000..9046a71b0b --- /dev/null +++ b/resources/variants/creality_ender5s1_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality_ender5s1_0.5.inst.cfg new file mode 100644 index 0000000000..c8ce62ffc7 --- /dev/null +++ b/resources/variants/creality_ender5s1_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality_ender5s1_0.6.inst.cfg new file mode 100644 index 0000000000..3eba1d8b6b --- /dev/null +++ b/resources/variants/creality_ender5s1_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality_ender5s1_0.8.inst.cfg new file mode 100644 index 0000000000..e697ea96cb --- /dev/null +++ b/resources/variants/creality_ender5s1_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality_ender5s1_1.0.inst.cfg new file mode 100644 index 0000000000..7901fe9e68 --- /dev/null +++ b/resources/variants/creality_ender5s1_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 From 4b9a40215e767f4384dd670ccd632031403c784c Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:52:21 +0100 Subject: [PATCH 3/5] Moved Creality Ender-5 S1 Nozzle Variants into the correct folder --- resources/variants/{ => creality}/creality_ender5s1_0.2.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.3.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.4.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.5.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.6.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.8.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_1.0.inst.cfg | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename resources/variants/{ => creality}/creality_ender5s1_0.2.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.3.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.4.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.5.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.6.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.8.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_1.0.inst.cfg (100%) diff --git a/resources/variants/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.2.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.2.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.3.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.3.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.4.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.4.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.5.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.5.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.6.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.6.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.8.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.8.inst.cfg diff --git a/resources/variants/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_1.0.inst.cfg rename to resources/variants/creality/creality_ender5s1_1.0.inst.cfg From 5acba34f97f35153fbccd60c00a04d0873749173 Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:57:36 +0100 Subject: [PATCH 4/5] Updated Creality Ender-5 S1 Nozzle Variants Names --- resources/definitions/creality_ender5s1.def.json | 2 +- resources/variants/creality/creality_ender5s1_0.2.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.3.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.4.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.5.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.6.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.8.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_1.0.inst.cfg | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json index e4cdf12e60..6272d3e04a 100644 --- a/resources/definitions/creality_ender5s1.def.json +++ b/resources/definitions/creality_ender5s1.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "creality_base", "overrides": { - "machine_name": { "default_value": "Creality Ender-5/Ender-3Pro" }, + "machine_name": { "default_value": "Creality Ender-5 S1" }, "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\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\n" }, "machine_width": { "default_value": 225 }, "machine_depth": { "default_value": 225 }, diff --git a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg index efb2a8342c..b5969358e6 100644 --- a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.2mm +name = 0.2mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg index c9d4204ace..c8314bda4d 100644 --- a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.3mm +name = 0.3mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg index 9046a71b0b..1b519ad121 100644 --- a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.4mm +name = 0.4mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg index c8ce62ffc7..6bc413f30b 100644 --- a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.5mm +name = 0.5mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg index 3eba1d8b6b..f235650911 100644 --- a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.6mm +name = 0.6mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg index e697ea96cb..52b16eea23 100644 --- a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.8mm +name = 0.8mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg index 7901fe9e68..06c558c42b 100644 --- a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 1.0mm +name = 1.0mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle From b1e85a1b9c30c449797c1922c69446678b858aff Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 20:46:27 +0100 Subject: [PATCH 5/5] Updated Creality Ender-5 S1 Profile to be more inline with other defs --- .../definitions/creality_ender5s1.def.json | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json index 6272d3e04a..6deeba5c6f 100644 --- a/resources/definitions/creality_ender5s1.def.json +++ b/resources/definitions/creality_ender5s1.def.json @@ -2,28 +2,25 @@ "name": "Creality Ender-5 S1", "version": 2, "inherits": "creality_base", + "metadata": { + "quality_definition": "creality_base", + "visible": true + }, "overrides": { - "machine_name": { "default_value": "Creality Ender-5 S1" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\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\n" }, - "machine_width": { "default_value": 225 }, + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 225 }, - "machine_height": { "default_value": 305 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 }, + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Creality Ender-5 S1" }, + "machine_width": { "default_value": 225 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\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\n" }, "build_volume_temperature": { "value": 195 }, "material_bed_temperature": { "value": 60 }, "retraction_amount": { "value": 2}, @@ -33,10 +30,5 @@ "wall_thickness": {"value": "line_width * 3" }, "retraction_speed": { "value": 45 }, "speed_print": { "value": 80.0 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true } } \ No newline at end of file