From 464bc7e906752afd9b7ad11ec4f0fe44a3f4776b Mon Sep 17 00:00:00 2001 From: "wenjie.guo" Date: Tue, 22 Aug 2023 14:33:43 +0800 Subject: [PATCH] FIX: Different default Z hop upper boundary for different machines. Github: #77 Signed-off-by: wenjie.guo Change-Id: I8065a2ea57496b5f415e591225877ba773fdb9f6 (cherry picked from commit 6fb7e1084caf9006d504c24ce1f026e475bcb348) --- resources/profiles/Anker/machine/fdm_machine_common.json | 3 +++ .../Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json | 3 +++ .../Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json | 3 +++ .../Anycubic/machine/Anycubic Chiron 0.4 nozzle.json | 3 +++ .../Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json | 3 +++ .../Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json | 3 +++ .../profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json | 3 +++ .../Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json | 3 +++ resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json | 3 +++ .../Creality/machine/Creality CR-10 Max 0.4 nozzle.json | 5 ++++- .../Creality/machine/Creality CR-10 V2 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality CR-6 Max 0.2 nozzle.json | 3 +++ .../Creality/machine/Creality CR-6 Max 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality CR-6 Max 0.6 nozzle.json | 3 +++ .../Creality/machine/Creality CR-6 Max 0.8 nozzle.json | 3 +++ .../Creality/machine/Creality CR-6 SE 0.2 nozzle.json | 3 +++ .../Creality/machine/Creality CR-6 SE 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality CR-6 SE 0.6 nozzle.json | 3 +++ .../Creality/machine/Creality CR-6 SE 0.8 nozzle.json | 3 +++ .../Creality/machine/Creality Ender-3 S1 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality Ender-5 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality Ender-5 S1 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality Ender-5S 0.4 nozzle.json | 3 +++ .../Creality/machine/Creality Ender-6 0.4 nozzle.json | 3 +++ .../profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json | 3 +++ .../profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json | 3 +++ .../Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json | 3 +++ .../Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json | 3 +++ .../profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json | 3 +++ .../Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json | 3 +++ .../Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json | 3 +++ .../Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json | 3 +++ .../profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json | 3 +++ resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json | 3 +++ resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json | 3 +++ .../profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json | 3 +++ resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json | 3 +++ resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json | 3 +++ resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json | 3 +++ .../profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json | 3 +++ .../profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json | 3 +++ resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json | 3 +++ .../profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json | 5 ++++- .../profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json | 5 ++++- .../profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json | 5 ++++- .../profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json | 5 ++++- .../profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json | 5 ++++- .../profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json | 5 ++++- .../Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json | 3 +++ 51 files changed, 160 insertions(+), 7 deletions(-) diff --git a/resources/profiles/Anker/machine/fdm_machine_common.json b/resources/profiles/Anker/machine/fdm_machine_common.json index c9a58da69..652a7b2ea 100644 --- a/resources/profiles/Anker/machine/fdm_machine_common.json +++ b/resources/profiles/Anker/machine/fdm_machine_common.json @@ -74,6 +74,9 @@ "0.05" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json index 5e40d9e29..dbdb7ea7f 100644 --- a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json @@ -26,6 +26,9 @@ "Generic PLA @Anycubic" ], "printable_height": "200", + "retract_lift_below":[ + "199" + ], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n; You can use following code instead if your PRINT_START macro support Chamber and print area bedmesh\n; PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single] Chamber=[chamber_temperature] PRINT_MIN={first_layer_print_min[0]},{first_layer_print_min[1]} PRINT_MAX={first_layer_print_max[0]},{first_layer_print_max[1]}", "machine_end_gcode": "PRINT_END", "layer_change_gcode": "", diff --git a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json index 03217606e..b3eab0527 100644 --- a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json @@ -20,6 +20,9 @@ "0x210" ], "printable_height": "190", + "retract_lift_below":[ + "189" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json index 3f969ecba..219c32fe2 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json @@ -20,6 +20,9 @@ "0x400" ], "printable_height": "450", + "retract_lift_below":[ + "449" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_e": [ diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json index 28efe438b..11d41506b 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json index 414518515..86105538d 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json @@ -20,6 +20,9 @@ "0x400" ], "printable_height": "450", + "retract_lift_below":[ + "449" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_e": [ diff --git a/resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json index 153b93622..556ba80a4 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json @@ -20,6 +20,9 @@ "0x255" ], "printable_height": "265", + "retract_lift_below":[ + "264" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json index ba3394dc2..038b49ec2 100644 --- a/resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json @@ -20,6 +20,9 @@ "0x210" ], "printable_height": "205", + "retract_lift_below":[ + "204" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_e": [ diff --git a/resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json b/resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json index 08bfd2a0c..cb49e0878 100644 --- a/resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json +++ b/resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json @@ -107,6 +107,9 @@ "0.08" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "extruder_clearance_radius": "57", "extruder_clearance_max_radius": "68", "extruder_clearance_height_to_rod": "36", diff --git a/resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json index 79f572e03..2b3c80c7b 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json @@ -19,5 +19,8 @@ "450x450", "0x450" ], - "printable_height": "470" + "printable_height": "470", + "retract_lift_below":[ + "469" + ] } \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json index 083f7658c..a9a9dec45 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json @@ -20,6 +20,9 @@ "0x300" ], "printable_height": "400", + "retract_lift_below":[ + "399" + ], "machine_max_acceleration_travel": [ "1500", "1250" diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json index de5e4123b..fdc5184ff 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json @@ -21,6 +21,9 @@ "5x395" ], "printable_height": "400", + "retract_lift_below":[ + "399" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json index 33d7319b7..ebea00b0a 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json @@ -20,6 +20,9 @@ "5x395" ], "printable_height": "400", + "retract_lift_below":[ + "399" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json index 9d9d5f661..b52cfe2a0 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json @@ -21,6 +21,9 @@ "5x395" ], "printable_height": "400", + "retract_lift_below":[ + "399" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json index 576d5e970..e0aad8597 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json @@ -21,6 +21,9 @@ "5x395" ], "printable_height": "400", + "retract_lift_below":[ + "399" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json index 4d08da635..cd4668f0e 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json @@ -21,6 +21,9 @@ "5x235" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json index d28ea3ae4..3e4373a7d 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json @@ -20,6 +20,9 @@ "5x235" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json index 6780abad7..d280bf7c2 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json @@ -21,6 +21,9 @@ "5x235" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json index 06adbe86a..e4c481d1c 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json @@ -21,6 +21,9 @@ "5x235" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json index c35773e67..a7f01bd2b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "270", + "retract_lift_below":[ + "269" + ], "machine_max_acceleration_travel": [ "1500", "1250" diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json index fb32b280b..0d4073876 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "270", + "retract_lift_below":[ + "269" + ], "machine_max_acceleration_travel": [ "1000", "1000" diff --git a/resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json index 2accbdc17..f553ebbf4 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "300", + "retract_lift_below":[ + "299" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json index f8f42f708..1b5444eeb 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x350" ], "printable_height": "400", + "retract_lift_below":[ + "399" + ], "machine_max_acceleration_e": [ "1000" ], diff --git a/resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json index 1978290cc..4a2078706 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "300", + "retract_lift_below":[ + "299" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json index dba4c49d3..137ed8e0a 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "300", + "retract_lift_below":[ + "299" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json index 2059c8e22..733f7970b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json @@ -20,6 +20,9 @@ "0x250" ], "printable_height": "400", + "retract_lift_below":[ + "399" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json index c66f638ef..6e7d30558 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x210" ], "printable_height": "200", + "retract_lift_below":[ + "199" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json index d86500970..ec11e5ece 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json index 87d863748..7898cce42 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json @@ -26,6 +26,9 @@ "0x220" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json index 1805e5e51..6ddd43c07 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json index f278c7f4e..c7d4bf993 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "280", + "retract_lift_below":[ + "279" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json index 84f5594d2..515e22140 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x420" ], "printable_height": "500", + "retract_lift_below":[ + "499" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json index 2398849d1..8f5c20b01 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x320" ], "printable_height": "400", + "retract_lift_below":[ + "399" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json index b724e2b14..b31f2ebd4 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x225" ], "printable_height": "280", + "retract_lift_below":[ + "279" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json index 511e7f11d..2060f09b2 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x220" ], "printable_height": "300", + "retract_lift_below":[ + "299" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json index 63cf0c416..5d2b2ad14 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json @@ -75,6 +75,9 @@ "70" ], "printable_height": "180", + "retract_lift_below":[ + "179" +], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < 180}G1 Z{min(max_layer_z+2, 180)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < 180}G1 Z{min(max_layer_z+30, 180)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json index 6c6dcb56a..e0204b620 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json @@ -23,6 +23,9 @@ "0x210" ], "printable_height": "210", + "retract_lift_below":[ + "209" + ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow", "machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < 210}G1 Z{min(max_layer_z+2, 210)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < 210}G1 Z{min(max_layer_z+30, 210)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json index 96e3ca426..9a16c3425 100644 --- a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x250" ], "printable_height": "300", + "retract_lift_below":[ + "299" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json index f87d834ce..34102bf9e 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x250" ], "printable_height": "300", + "retract_lift_below":[ + "299" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json index 73653b40e..df16b9213 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json @@ -18,6 +18,9 @@ "0x325" ], "printable_height": "320", + "retract_lift_below":[ + "319" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "1", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json index 39bd0f9f1..5dcb9e20f 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x200" ], "printable_height": "200", + "retract_lift_below":[ + "199" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json index ba5a1aa45..3f9d2c5c4 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json @@ -18,6 +18,9 @@ "0x280" ], "printable_height": "270", + "retract_lift_below":[ + "269" + ], "nozzle_type": "hardened_steel", "max_layer_height": [ "0.3" diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json index 72a113c0c..0d6bceeb2 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json @@ -18,6 +18,9 @@ "0x180" ], "printable_height": "170", + "retract_lift_below":[ + "169" + ], "nozzle_type": "hardened_steel", "auxiliary_fan": "1", "max_layer_height": [ diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json index ce9ce8bc0..9fa76450c 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json @@ -17,6 +17,9 @@ "0x120" ], "printable_height": "120", + "retract_lift_below":[ + "119" + ], "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json index e77d2fc57..a1a60fb58 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json @@ -15,5 +15,8 @@ "250x250", "0x250" ], - "printable_height": "225" + "printable_height": "225", + "retract_lift_below":[ + "224" + ] } diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json index 9c7a4b270..b0ff7455d 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json @@ -15,5 +15,8 @@ "300x300", "0x300" ], - "printable_height": "275" + "printable_height": "275", + "retract_lift_below":[ + "274" + ] } diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json index 11c95366c..e58433638 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json @@ -15,5 +15,8 @@ "350x350", "0x350" ], - "printable_height": "325" + "printable_height": "325", + "retract_lift_below":[ + "324" + ] } diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json index a2fc11d9e..409f6c2a7 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json @@ -15,5 +15,8 @@ "250x250", "0x250" ], - "printable_height": "250" + "printable_height": "250", + "retract_lift_below":[ + "249" + ] } diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json index cfe55f8d1..fd201eea8 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json @@ -15,5 +15,8 @@ "300x300", "0x300" ], - "printable_height": "250" + "printable_height": "250", + "retract_lift_below":[ + "249" + ] } diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json index d334d0749..054dc449c 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json @@ -15,5 +15,8 @@ "350x350", "0x350" ], - "printable_height": "250" + "printable_height": "250", + "retract_lift_below":[ + "249" + ] } diff --git a/resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json b/resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json index faf9f6790..b00302492 100644 --- a/resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json +++ b/resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json @@ -20,6 +20,9 @@ "0x220" ], "printable_height": "250", + "retract_lift_below":[ + "249" + ], "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [