From 603f49122f3e581281e5f4ff2e559d9738d55bd2 Mon Sep 17 00:00:00 2001 From: DSNS <48170013+dsnsgithub@users.noreply.github.com> Date: Sat, 30 Dec 2023 21:17:01 -0800 Subject: [PATCH 01/11] Fix Ender 5 Plus ABL command --- resources/definitions/creality_ender5plus.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_ender5plus.def.json b/resources/definitions/creality_ender5plus.def.json index b7b11343e5..24bf10cd0d 100644 --- a/resources/definitions/creality_ender5plus.def.json +++ b/resources/definitions/creality_ender5plus.def.json @@ -23,8 +23,8 @@ }, "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Creality Ender-5 Plus" }, - "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\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 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" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nG29 ;Auto bed level\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 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" }, "machine_width": { "default_value": 350 }, "speed_print": { "value": 80.0 } } -} \ No newline at end of file +} From d458437d5010f9f0785c5e9fa070d9d5f765730b Mon Sep 17 00:00:00 2001 From: Jacob Pedersen Date: Mon, 19 Feb 2024 11:16:01 +0100 Subject: [PATCH 02/11] Add definition and variants for creality ender3 v2 neo --- .../definitions/creality_ender3v2neo.def.json | 34 +++++++++++++++++++ .../creality_ender3v2neo_0.2.inst.cfg | 13 +++++++ .../creality_ender3v2neo_0.3.inst.cfg | 12 +++++++ .../creality_ender3v2neo_0.4.inst.cfg | 12 +++++++ .../creality_ender3v2neo_0.5.inst.cfg | 13 +++++++ .../creality_ender3v2neo_0.6.inst.cfg | 12 +++++++ .../creality_ender3v2neo_0.8.inst.cfg | 12 +++++++ .../creality_ender3v2neo_1.0.inst.cfg | 12 +++++++ 8 files changed, 120 insertions(+) create mode 100644 resources/definitions/creality_ender3v2neo.def.json create mode 100644 resources/variants/creality/creality_ender3v2neo_0.2.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v2neo_0.3.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v2neo_0.4.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v2neo_0.5.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v2neo_0.6.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v2neo_0.8.inst.cfg create mode 100644 resources/variants/creality/creality_ender3v2neo_1.0.inst.cfg diff --git a/resources/definitions/creality_ender3v2neo.def.json b/resources/definitions/creality_ender3v2neo.def.json new file mode 100644 index 0000000000..05998865e2 --- /dev/null +++ b/resources/definitions/creality_ender3v2neo.def.json @@ -0,0 +1,34 @@ +{ + "name": "Creality Ender-3 v2 Neo", + "version": 2, + "inherits": "creality_base", + "metadata": { + "quality_definition": "creality_base", + "visible": true, + "platform": "creality_ender3.3mf" + }, + "overrides": { + "machine_name": { "default_value": "Creality Ender-3 v2 Neo" }, + "machine_width": { "default_value": 230 }, + "machine_depth": { "default_value": 230 }, + "machine_height": { "default_value": 250 }, + "machine_head_polygon": { "default_value": [ + [-1, 1], + [-1, -1], + [1, -1], + [1, 1] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_start_gcode": { "default_value": "G92 E0 ;Reset Extruder\nG28 ;Home\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" }, + "retraction_amount": { "value": 4}, + "retraction_speed": { "value": 25}, + "gantry_height": { "value": 25 } + } +} diff --git a/resources/variants/creality/creality_ender3v2neo_0.2.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.2.inst.cfg new file mode 100644 index 0000000000..0dda448bef --- /dev/null +++ b/resources/variants/creality/creality_ender3v2neo_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v2neo +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality/creality_ender3v2neo_0.3.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.3.inst.cfg new file mode 100644 index 0000000000..fcb0dac3f3 --- /dev/null +++ b/resources/variants/creality/creality_ender3v2neo_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = creality_ender3v2neo +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality/creality_ender3v2neo_0.4.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.4.inst.cfg new file mode 100644 index 0000000000..aeeba41ff6 --- /dev/null +++ b/resources/variants/creality/creality_ender3v2neo_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = creality_ender3v2neo +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality/creality_ender3v2neo_0.5.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.5.inst.cfg new file mode 100644 index 0000000000..810acc8e74 --- /dev/null +++ b/resources/variants/creality/creality_ender3v2neo_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3v2neo +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality/creality_ender3v2neo_0.6.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.6.inst.cfg new file mode 100644 index 0000000000..ad49249db3 --- /dev/null +++ b/resources/variants/creality/creality_ender3v2neo_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = creality_ender3v2neo +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality/creality_ender3v2neo_0.8.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.8.inst.cfg new file mode 100644 index 0000000000..bfb1bdf0fb --- /dev/null +++ b/resources/variants/creality/creality_ender3v2neo_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = creality_ender3v2neo +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality/creality_ender3v2neo_1.0.inst.cfg b/resources/variants/creality/creality_ender3v2neo_1.0.inst.cfg new file mode 100644 index 0000000000..eeb644d0f5 --- /dev/null +++ b/resources/variants/creality/creality_ender3v2neo_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = creality_ender3v2neo +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 1.0 From 0b222d9be229374fb2a33827f4542b8a43f81e81 Mon Sep 17 00:00:00 2001 From: sheep007 <42427653+zanghao912@users.noreply.github.com> Date: Fri, 23 Feb 2024 10:34:10 +0800 Subject: [PATCH 03/11] Update creality_ender3v3se.def.json --- resources/definitions/creality_ender3v3se.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json index 5769e3e493..12b863b506 100644 --- a/resources/definitions/creality_ender3v3se.def.json +++ b/resources/definitions/creality_ender3v3se.def.json @@ -45,7 +45,7 @@ "machine_max_feedrate_y": { "value": 500 }, "machine_max_feedrate_z": { "value": 30 }, "machine_name": { "default_value": "Creality Ender-3 V3 SE" }, - "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Enable mesh leveling\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\nM109 S[material_print_temperature_layer_0]\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.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 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" }, + "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Enable mesh leveling\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\nM109 S{material_print_temperature_layer_0}\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.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 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" }, "machine_width": { "default_value": 220 }, "retraction_amount": { "value": 0.8 }, "retraction_speed": { "default_value": 40 }, From 68d1fb4c6fca8dedb5e7ab57de2f7a4e0d8cae4d Mon Sep 17 00:00:00 2001 From: sheep007 <42427653+zanghao912@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:42:58 +0800 Subject: [PATCH 04/11] fix Anycubic Kobra Go & Kobra 2 start Gcode BUG --- resources/definitions/anycubic_kobra2.def.json | 2 +- resources/definitions/anycubic_kobra_go.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/anycubic_kobra2.def.json b/resources/definitions/anycubic_kobra2.def.json index aea6b4d344..965504338b 100644 --- a/resources/definitions/anycubic_kobra2.def.json +++ b/resources/definitions/anycubic_kobra2.def.json @@ -42,7 +42,7 @@ "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 2 }, "machine_name": { "default_value": "Anycubic Kobra 2" }, - "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ; use absolute coordinates\nM82 ; use absolute distances for extrusion\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 ; home all axes\nM300 S1318 P266\nG1 Z5 F5000 ; lift nozzle\nG1 X5 Y0 F3000\nG1 Z0.3 ; set nozzle height\nG92 E0\nG1 X50 Y0 E20 F500 ; Extrude 20mm of filament in a 5cm line \nG92 E0 ; zero the extruded length again \nG1 E-4.5 F4800 ; Retract a little \nG92 E0\nG1 X120 F4000 ; Quickly wipe away from the filament line\nM117 ; Printing\u2026\nG5" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ; use absolute coordinates\nM82 ; use absolute distances for extrusion\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 ; home all axes\nM300 S1318 P266\nG1 Z5 F5000 ; lift nozzle\nG1 X5 Y0 F3000\nG1 Z0.3 ; set nozzle height\nG92 E0\nG1 X50 Y0 E20 F500 ; Extrude 20mm of filament in a 5cm line \nG92 E0 ; zero the extruded length again \nG1 E-4.5 F4800 ; Retract a little \nG92 E0\nG1 X120 F4000 ; Quickly wipe away from the filament line\nM117 ; Printing\u2026\nG5" }, "machine_width": { "default_value": 220 }, "material_bed_temperature": { "maximum_value_warning": 110 }, "material_bed_temperature_layer_0": { "maximum_value_warning": 110 }, diff --git a/resources/definitions/anycubic_kobra_go.def.json b/resources/definitions/anycubic_kobra_go.def.json index 8c546bdbb7..686734d962 100644 --- a/resources/definitions/anycubic_kobra_go.def.json +++ b/resources/definitions/anycubic_kobra_go.def.json @@ -23,7 +23,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Anycubic Kobra Go" }, - "machine_start_gcode": { "default_value": "M140 S[first_layer_bed_temperature]; Heat bed\nM104 S[first_layer_temperature\n ]; Heat extruder\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nM420 S1 ; Enable Bed Levelling Mesh\nM190 S[first_layer_bed_temperature\n ]; Wait for bed to get up to temperature\nM109 S[first_layer_temperature\n ]; Wait for extruder to get up to temperature\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X2 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X2 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X2.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X2.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 F2400 E-1\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_start_gcode": { "default_value": "M140 S{material_bed_temperature_layer_0}; Heat bed\nM104 S{material_print_temperature_layer_0}; Heat extruder\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nM420 S1 ; Enable Bed Levelling Mesh\nM190 S{material_bed_temperature_layer_0}; Wait for bed to get up to temperature\nM109 S{material_print_temperature_layer_0}; Wait for extruder to get up to temperature\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X2 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X2 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X2.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X2.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 F2400 E-1\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, "machine_width": { "default_value": 222 } } } \ No newline at end of file From cd9ce966af097a755b2f82714d5214978fae64b9 Mon Sep 17 00:00:00 2001 From: Nikita Chernukhin Date: Fri, 2 Feb 2024 20:46:14 +0100 Subject: [PATCH 05/11] Fix bed mesh offsets for Ratrig V-Core3 200mm and V-Minion --- resources/definitions/ratrig_vcore3_200.def.json | 2 +- resources/definitions/ratrig_vminion.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ratrig_vcore3_200.def.json b/resources/definitions/ratrig_vcore3_200.def.json index d16f15b476..143063b95f 100644 --- a/resources/definitions/ratrig_vcore3_200.def.json +++ b/resources/definitions/ratrig_vcore3_200.def.json @@ -8,7 +8,7 @@ "platform": "ratrig_vcore3_200.stl", "platform_offset": [ 0, - 5, + 0, 0 ], "weight": 16 diff --git a/resources/definitions/ratrig_vminion.def.json b/resources/definitions/ratrig_vminion.def.json index bdc8d0d8a1..daf0d4f302 100644 --- a/resources/definitions/ratrig_vminion.def.json +++ b/resources/definitions/ratrig_vminion.def.json @@ -11,7 +11,7 @@ "machine_extruder_trains": { "0": "ratrig_base_extruder_0" }, "platform_offset": [ 0, - 5, + 0, 0 ], "preferred_variant_name": "0.4mm Nozzle", From 853bd4cf929eb47f0a470e062b9079deae413b1a Mon Sep 17 00:00:00 2001 From: sheep007 <42427653+zanghao912@users.noreply.github.com> Date: Tue, 27 Feb 2024 10:48:29 +0800 Subject: [PATCH 06/11] Update creality_ender3v3se.def.json --- resources/definitions/creality_ender3v3se.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json index 12b863b506..8e32a44eb9 100644 --- a/resources/definitions/creality_ender3v3se.def.json +++ b/resources/definitions/creality_ender3v3se.def.json @@ -45,11 +45,11 @@ "machine_max_feedrate_y": { "value": 500 }, "machine_max_feedrate_z": { "value": 30 }, "machine_name": { "default_value": "Creality Ender-3 V3 SE" }, - "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Enable mesh leveling\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\nM109 S{material_print_temperature_layer_0}\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.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 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" }, + "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nM420 S1; Use saved mesh leveling data\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\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nM109 S{material_print_temperature_layer_0} ; Set hotend temperature and wait\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y145.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 E-1.0000 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0.0000 F1800 \n" }, "machine_width": { "default_value": 220 }, "retraction_amount": { "value": 0.8 }, "retraction_speed": { "default_value": 40 }, "speed_layer_0": { "value": 30 }, "speed_print": { "value": 180 } } -} \ No newline at end of file +} From b342574c1991552b545b9c63a98bd902b94957df Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 1 Mar 2024 09:17:37 +0100 Subject: [PATCH 07/11] Change slicing crash error message CURA-11445 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 66949eeaf5..c73dee2fb0 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -181,7 +181,10 @@ class CuraEngineBackend(QObject, Backend): application.getPreferences().preferenceChanged.connect(self._onPreferencesChanged) self._slicing_error_message = Message( - text = catalog.i18nc("@message", "Slicing failed with an unexpected error. Please consider reporting a bug on our issue tracker."), + text = catalog.i18nc("@message", "Oops! We encountered an unexpected error during your slicing process. " + "Rest assured, we've automatically received the crash logs for analysis, " + "if you have not disabled data sharing in your preferences. To assist us " + "further, consider sharing your project details on our issue tracker."), title = catalog.i18nc("@message:title", "Slicing failed"), message_type = Message.MessageType.ERROR ) From f51d97494a48c47e1c03e3bb25d8c0069f69f6df Mon Sep 17 00:00:00 2001 From: saumyaj3 Date: Fri, 1 Mar 2024 09:33:17 +0000 Subject: [PATCH 08/11] Applied printer-linter format --- resources/definitions/creality_ender5plus.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender5plus.def.json b/resources/definitions/creality_ender5plus.def.json index 24bf10cd0d..5ad71ee2df 100644 --- a/resources/definitions/creality_ender5plus.def.json +++ b/resources/definitions/creality_ender5plus.def.json @@ -27,4 +27,4 @@ "machine_width": { "default_value": 350 }, "speed_print": { "value": 80.0 } } -} +} \ No newline at end of file From af3308406091c27e92c929403273759856406043 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 1 Mar 2024 10:37:39 +0100 Subject: [PATCH 09/11] Fix prime tower positioning on elliptic build plates --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1db28b289c..2abdf0df01 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6871,7 +6871,7 @@ "unit": "mm", "enabled": "prime_tower_enable", "default_value": 200, - "value": "(resolveOrValue('machine_width') / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (resolveOrValue('machine_width') - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('machine_nozzle_offset_x')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (resolveOrValue('machine_width') / 2 if resolveOrValue('machine_center_is_zero') else 0)", + "value": "((resolveOrValue('machine_width') / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (resolveOrValue('machine_width') - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('machine_nozzle_offset_x')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1))) - (resolveOrValue('machine_width') / 2 if resolveOrValue('machine_center_is_zero') else 0)", "maximum_value": "(machine_width / 2 if machine_center_is_zero else machine_width) - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0)", "minimum_value": "resolveOrValue('prime_tower_size') + (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - (machine_width / 2 if machine_center_is_zero else 0)", "settable_per_mesh": false, From ea42e52b8f645fac3e02f300f4d6e4b15c2983c1 Mon Sep 17 00:00:00 2001 From: saumyaj3 Date: Fri, 1 Mar 2024 09:52:07 +0000 Subject: [PATCH 10/11] Applied printer-linter format --- resources/definitions/creality_ender3v3se.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json index 8e32a44eb9..86d6818166 100644 --- a/resources/definitions/creality_ender3v3se.def.json +++ b/resources/definitions/creality_ender3v3se.def.json @@ -52,4 +52,4 @@ "speed_layer_0": { "value": 30 }, "speed_print": { "value": 180 } } -} +} \ No newline at end of file From 9efef84e5c88323bc70aa1b1e6a813664d2133c0 Mon Sep 17 00:00:00 2001 From: saumyaj3 Date: Fri, 1 Mar 2024 10:18:21 +0000 Subject: [PATCH 11/11] Applied printer-linter format --- .../definitions/creality_ender3v2neo.def.json | 36 +++++++++++-------- .../creality_ender3v2neo_0.2.inst.cfg | 2 +- .../creality_ender3v2neo_0.3.inst.cfg | 1 + .../creality_ender3v2neo_0.4.inst.cfg | 1 + .../creality_ender3v2neo_0.5.inst.cfg | 2 +- .../creality_ender3v2neo_0.6.inst.cfg | 1 + .../creality_ender3v2neo_0.8.inst.cfg | 1 + .../creality_ender3v2neo_1.0.inst.cfg | 1 + 8 files changed, 28 insertions(+), 17 deletions(-) diff --git a/resources/definitions/creality_ender3v2neo.def.json b/resources/definitions/creality_ender3v2neo.def.json index 05998865e2..f3f1eede9d 100644 --- a/resources/definitions/creality_ender3v2neo.def.json +++ b/resources/definitions/creality_ender3v2neo.def.json @@ -1,34 +1,40 @@ { - "name": "Creality Ender-3 v2 Neo", "version": 2, + "name": "Creality Ender-3 v2 Neo", "inherits": "creality_base", - "metadata": { - "quality_definition": "creality_base", + "metadata": + { "visible": true, - "platform": "creality_ender3.3mf" + "platform": "creality_ender3.3mf", + "quality_definition": "creality_base" }, - "overrides": { - "machine_name": { "default_value": "Creality Ender-3 v2 Neo" }, - "machine_width": { "default_value": 230 }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 230 }, - "machine_height": { "default_value": 250 }, - "machine_head_polygon": { "default_value": [ + "machine_head_polygon": + { + "default_value": [ [-1, 1], [-1, -1], [1, -1], [1, 1] ] }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - "machine_start_gcode": { "default_value": "G92 E0 ;Reset Extruder\nG28 ;Home\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" }, - "retraction_amount": { "value": 4}, - "retraction_speed": { "value": 25}, - "gantry_height": { "value": 25 } + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Creality Ender-3 v2 Neo" }, + "machine_start_gcode": { "default_value": "G92 E0 ;Reset Extruder\nG28 ;Home\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" }, + "machine_width": { "default_value": 230 }, + "retraction_amount": { "value": 4 }, + "retraction_speed": { "value": 25 } } -} +} \ No newline at end of file diff --git a/resources/variants/creality/creality_ender3v2neo_0.2.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.2.inst.cfg index 0dda448bef..bed0bbe51f 100644 --- a/resources/variants/creality/creality_ender3v2neo_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender3v2neo_0.2.inst.cfg @@ -8,6 +8,6 @@ hardware_type = nozzle setting_version = 22 type = variant - [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality/creality_ender3v2neo_0.3.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.3.inst.cfg index fcb0dac3f3..fba4336839 100644 --- a/resources/variants/creality/creality_ender3v2neo_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender3v2neo_0.3.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality/creality_ender3v2neo_0.4.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.4.inst.cfg index aeeba41ff6..80a2f5cb71 100644 --- a/resources/variants/creality/creality_ender3v2neo_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender3v2neo_0.4.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality/creality_ender3v2neo_0.5.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.5.inst.cfg index 810acc8e74..d6071382f8 100644 --- a/resources/variants/creality/creality_ender3v2neo_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender3v2neo_0.5.inst.cfg @@ -8,6 +8,6 @@ hardware_type = nozzle setting_version = 22 type = variant - [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality/creality_ender3v2neo_0.6.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.6.inst.cfg index ad49249db3..4abca4f34e 100644 --- a/resources/variants/creality/creality_ender3v2neo_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender3v2neo_0.6.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality/creality_ender3v2neo_0.8.inst.cfg b/resources/variants/creality/creality_ender3v2neo_0.8.inst.cfg index bfb1bdf0fb..d5ef899ed6 100644 --- a/resources/variants/creality/creality_ender3v2neo_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender3v2neo_0.8.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality/creality_ender3v2neo_1.0.inst.cfg b/resources/variants/creality/creality_ender3v2neo_1.0.inst.cfg index eeb644d0f5..8dee589cd1 100644 --- a/resources/variants/creality/creality_ender3v2neo_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender3v2neo_1.0.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 1.0 +