diff --git a/resources/profiles/Anycubic/machine/fdm_machine_common.json b/resources/profiles/Anycubic/machine/fdm_machine_common.json index 235e52428..be153c7d2 100644 --- a/resources/profiles/Anycubic/machine/fdm_machine_common.json +++ b/resources/profiles/Anycubic/machine/fdm_machine_common.json @@ -87,7 +87,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ diff --git a/resources/profiles/BBL/machine/Bambu Lab A1 0.4 nozzle.json b/resources/profiles/BBL/machine/Bambu Lab A1 0.4 nozzle.json index 0e07fa64e..a897bd8aa 100644 --- a/resources/profiles/BBL/machine/Bambu Lab A1 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Bambu Lab A1 0.4 nozzle.json @@ -20,7 +20,7 @@ "extruder_clearance_height_to_lid": "256", "extruder_clearance_height_to_rod": "25", "extruder_clearance_max_radius": "73", - "extruder_clearance_radius": "73", + "extruder_clearance_dist_to_rod": "56.5", "head_wrap_detect_zone": [ "226x224", "256x224", diff --git a/resources/profiles/BBL/machine/Bambu Lab A1 mini 0.4 nozzle.json b/resources/profiles/BBL/machine/Bambu Lab A1 mini 0.4 nozzle.json index 9833cf02e..5319a77f8 100644 --- a/resources/profiles/BBL/machine/Bambu Lab A1 mini 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Bambu Lab A1 mini 0.4 nozzle.json @@ -21,7 +21,7 @@ "extruder_clearance_height_to_lid": "180", "extruder_clearance_height_to_rod": "25", "extruder_clearance_max_radius": "73", - "extruder_clearance_radius": "73", + "extruder_clearance_dist_to_rod": "56.5", "head_wrap_detect_zone": [ "156x152", "180x152", diff --git a/resources/profiles/BBL/machine/fdm_machine_common.json b/resources/profiles/BBL/machine/fdm_machine_common.json index c9426f5c6..e0968ac56 100644 --- a/resources/profiles/BBL/machine/fdm_machine_common.json +++ b/resources/profiles/BBL/machine/fdm_machine_common.json @@ -79,9 +79,10 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", "extruder_clearance_height_to_rod": "34", "extruder_clearance_height_to_lid": "140", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "printer_settings_id": "", "retraction_minimum_travel": [ "2" diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json index d8ea3e681..b575766fe 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json @@ -111,7 +111,8 @@ ], "extruder_clearance_height_to_lid": "250", "extruder_clearance_height_to_rod": "14", - "extruder_clearance_radius": "70", + "extruder_clearance_max_radius": "70", + "extruder_clearance_dist_to_rod": "35", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json index 963a288a5..006a9765f 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json @@ -111,7 +111,8 @@ ], "extruder_clearance_height_to_lid": "250", "extruder_clearance_height_to_rod": "14", - "extruder_clearance_radius": "70", + "extruder_clearance_max_radius": "70", + "extruder_clearance_dist_to_rod": "35", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json index 27afb2017..cba701af2 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json @@ -12,7 +12,7 @@ "default_print_profile": "0.20mm Standard @Creality Ender3V3KE", "extruder_clearance_height_to_rod": "47", "extruder_clearance_max_radius": "90", - "extruder_clearance_radius": "90", + "extruder_clearance_dist_to_rod": "90", "machine_load_filament_time": "11", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.4 nozzle.json index 577d9547e..2a385a01a 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.4 nozzle.json @@ -111,7 +111,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.12" ], diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.6 nozzle.json index f38570e8c..e53fccb83 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.6 nozzle.json @@ -111,7 +111,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.12" ], diff --git a/resources/profiles/Creality/machine/Creality K1 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K1 0.6 nozzle.json index 617e663cb..f2d54e861 100644 --- a/resources/profiles/Creality/machine/Creality K1 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 0.6 nozzle.json @@ -109,7 +109,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/Creality K1 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1 0.8 nozzle.json index 19cb4dad2..8a1d79fc1 100644 --- a/resources/profiles/Creality/machine/Creality K1 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 0.8 nozzle.json @@ -110,7 +110,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/Creality K1 Max 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K1 Max 0.6 nozzle.json index add041426..ac9bb0db7 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 Max 0.6 nozzle.json @@ -110,7 +110,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/Creality K1 Max 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1 Max 0.8 nozzle.json index 000ca4b37..172acbfd4 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 Max 0.8 nozzle.json @@ -110,7 +110,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json index b6efa2685..1f7c2b44a 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json @@ -110,7 +110,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json index c8a6ae9db..6f93eb746 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json @@ -110,7 +110,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json index 2858d717b..0d78d5427 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json @@ -110,7 +110,7 @@ ], "extruder_clearance_height_to_lid": "101", "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", + "extruder_clearance_dist_to_rod": "45", "z_hop": [ "0.2" ], diff --git a/resources/profiles/Creality/machine/fdm_creality_common.json b/resources/profiles/Creality/machine/fdm_creality_common.json index e5f7ecdc4..3d573ca8d 100644 --- a/resources/profiles/Creality/machine/fdm_creality_common.json +++ b/resources/profiles/Creality/machine/fdm_creality_common.json @@ -76,7 +76,7 @@ "max_layer_height": [ "0.32" ], - "extruder_clearance_radius": "47", + "extruder_clearance_dist_to_rod": "47", "extruder_clearance_height_to_rod": "34", "extruder_clearance_height_to_lid": "34", "retract_length_toolchange": [ diff --git a/resources/profiles/Creality/machine/fdm_machine_common.json b/resources/profiles/Creality/machine/fdm_machine_common.json index 2ca0db9e5..4d666b2fd 100644 --- a/resources/profiles/Creality/machine/fdm_machine_common.json +++ b/resources/profiles/Creality/machine/fdm_machine_common.json @@ -74,7 +74,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "printer_settings_id": "", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.2 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.2 nozzle.json index 3393ab3de..2d77d0809 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.2 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.2 nozzle.json @@ -38,7 +38,7 @@ "extra_loading_move": "-2", "extruder_clearance_height_to_lid": "34", "extruder_clearance_height_to_rod": "34", - "extruder_clearance_radius": "47", + "extruder_clearance_dist_to_rod": "47", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], "fan_kickstart": "0", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.4 nozzle.json index 52a873dcf..1aeca7078 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.4 nozzle.json @@ -30,7 +30,7 @@ "extra_loading_move": "-2", "extruder_clearance_height_to_lid": "34", "extruder_clearance_height_to_rod": "34", - "extruder_clearance_radius": "47", + "extruder_clearance_dist_to_rod": "47", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], "fan_kickstart": "0", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.6 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.6 nozzle.json index ffad331ee..def02ce80 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.6 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.6 nozzle.json @@ -38,7 +38,7 @@ "extra_loading_move": "-2", "extruder_clearance_height_to_lid": "34", "extruder_clearance_height_to_rod": "34", - "extruder_clearance_radius": "47", + "extruder_clearance_dist_to_rod": "47", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], "fan_kickstart": "0", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.8 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.8 nozzle.json index 9d4fe425c..9d78ef33f 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.8 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max 0.8 nozzle.json @@ -30,7 +30,7 @@ "extra_loading_move": "-2", "extruder_clearance_height_to_lid": "34", "extruder_clearance_height_to_rod": "34", - "extruder_clearance_radius": "47", + "extruder_clearance_dist_to_rod": "47", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], "fan_kickstart": "0", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.2 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.2 nozzle.json index 71fc51bdf..e0a708028 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.2 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.2 nozzle.json @@ -30,7 +30,7 @@ "extra_loading_move": "-2", "extruder_clearance_height_to_lid": "380", "extruder_clearance_height_to_rod": "10", - "extruder_clearance_radius": "60", + "extruder_clearance_dist_to_rod": "60", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], "fan_kickstart": "0", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.4 nozzle.json index 55f5dea2c..d8ad85fc3 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.4 nozzle.json @@ -30,7 +30,7 @@ "extra_loading_move": "-2", "extruder_clearance_height_to_lid": "380", "extruder_clearance_height_to_rod": "10", - "extruder_clearance_radius": "60", + "extruder_clearance_dist_to_rod": "60", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], "fan_kickstart": "0", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.6 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.6 nozzle.json index 2d5508823..8341e385f 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.6 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.6 nozzle.json @@ -30,7 +30,7 @@ "extra_loading_move": "-2", "extruder_clearance_height_to_lid": "380", "extruder_clearance_height_to_rod": "10", - "extruder_clearance_radius": "60", + "extruder_clearance_dist_to_rod": "60", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], "fan_kickstart": "0", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.8 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.8 nozzle.json index 3b54c487a..b1ac0f281 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.8 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus 0.8 nozzle.json @@ -30,7 +30,7 @@ "extra_loading_move": "-2", "extruder_clearance_height_to_lid": "380", "extruder_clearance_height_to_rod": "10", - "extruder_clearance_radius": "60", + "extruder_clearance_dist_to_rod": "60", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], "fan_kickstart": "0", diff --git a/resources/profiles/Elegoo/machine/fdm_elegoo_common.json b/resources/profiles/Elegoo/machine/fdm_elegoo_common.json index faf8c9593..85ab67b94 100644 --- a/resources/profiles/Elegoo/machine/fdm_elegoo_common.json +++ b/resources/profiles/Elegoo/machine/fdm_elegoo_common.json @@ -80,7 +80,7 @@ "0.08" ], "printable_height": "280", - "extruder_clearance_radius": "47", + "extruder_clearance_dist_to_rod": "47", "extruder_clearance_height_to_rod": "34", "extruder_clearance_height_to_lid": "34", "printer_settings_id": "", diff --git a/resources/profiles/Elegoo/machine/fdm_machine_common.json b/resources/profiles/Elegoo/machine/fdm_machine_common.json index a5e460ac0..dabf91264 100644 --- a/resources/profiles/Elegoo/machine/fdm_machine_common.json +++ b/resources/profiles/Elegoo/machine/fdm_machine_common.json @@ -70,7 +70,8 @@ "0.07" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ diff --git a/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json b/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json index a0e660865..7b9498783 100644 --- a/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json +++ b/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json @@ -80,7 +80,8 @@ "0.08" ], "printable_height": "280", - "extruder_clearance_radius": "47", + "extruder_clearance_max_radius": "47", + "extruder_clearance_dist_to_rod": "24", "extruder_clearance_height_to_rod": "34", "extruder_clearance_height_to_lid": "34", "printer_settings_id": "", diff --git a/resources/profiles/Geeetech/machine/fdm_geeetech_common.json b/resources/profiles/Geeetech/machine/fdm_geeetech_common.json index 840813efb..fadf44b54 100644 --- a/resources/profiles/Geeetech/machine/fdm_geeetech_common.json +++ b/resources/profiles/Geeetech/machine/fdm_geeetech_common.json @@ -80,7 +80,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "47", + "extruder_clearance_max_radius": "47", + "extruder_clearance_dist_to_rod": "24", "extruder_clearance_height_to_rod": "34", "extruder_clearance_height_to_lid": "34", "printer_settings_id": "", diff --git a/resources/profiles/Geeetech/machine/fdm_machine_common.json b/resources/profiles/Geeetech/machine/fdm_machine_common.json index 85543a550..fb4fff3f1 100644 --- a/resources/profiles/Geeetech/machine/fdm_machine_common.json +++ b/resources/profiles/Geeetech/machine/fdm_machine_common.json @@ -70,7 +70,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/fdm_machine_common.json b/resources/profiles/Prusa/machine/fdm_machine_common.json index b73df798a..b5794285f 100644 --- a/resources/profiles/Prusa/machine/fdm_machine_common.json +++ b/resources/profiles/Prusa/machine/fdm_machine_common.json @@ -87,7 +87,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ 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 907fb1297..e28b5ec5e 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 @@ -41,7 +41,8 @@ "retract_lift_below": [ "269" ], - "extruder_clearance_radius": "60", + "extruder_clearance_max_radius": "60", + "extruder_clearance_dist_to_rod": "30", "extruder_clearance_height_to_rod": "38", "extruder_clearance_height_to_lid": "110", "single_extruder_multi_material": "1", diff --git a/resources/profiles/Qidi/machine/fdm_machine_common.json b/resources/profiles/Qidi/machine/fdm_machine_common.json index 71198a0e9..520c25285 100644 --- a/resources/profiles/Qidi/machine/fdm_machine_common.json +++ b/resources/profiles/Qidi/machine/fdm_machine_common.json @@ -70,7 +70,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ diff --git a/resources/profiles/Qidi/machine/fdm_qidi_common.json b/resources/profiles/Qidi/machine/fdm_qidi_common.json index fc9e9e05d..506afe3b9 100644 --- a/resources/profiles/Qidi/machine/fdm_qidi_common.json +++ b/resources/profiles/Qidi/machine/fdm_qidi_common.json @@ -80,7 +80,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "47", + "extruder_clearance_max_radius": "47", + "extruder_clearance_dist_to_rod": "24", "extruder_clearance_height_to_rod": "34", "extruder_clearance_height_to_lid": "34", "printer_settings_id": "", diff --git a/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json b/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json index 2d795c42c..5f4d9711d 100644 --- a/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json +++ b/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json @@ -26,9 +26,10 @@ "retract_lift_below": [ "239" ], - "extruder_clearance_radius": "56", + "extruder_clearance_max_radius": "56", + "extruder_clearance_dist_to_rod": "28", "extruder_clearance_height_to_rod": "33", - "extruder_clearance_height_to_lid": "110", + "extruder_clearance_height_to_lid": "110", "support_air_filtration": "1", "machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[hot_plate_temp_initial_layer]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM191 S{overall_chamber_temperature}\nM109 S[nozzle_temperature_initial_layer]\nM106 P3 S255\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n", "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", diff --git a/resources/profiles/Tronxy/machine/fdm_machine_common.json b/resources/profiles/Tronxy/machine/fdm_machine_common.json index 5eaa07e52..5bb1bf4b5 100644 --- a/resources/profiles/Tronxy/machine/fdm_machine_common.json +++ b/resources/profiles/Tronxy/machine/fdm_machine_common.json @@ -70,7 +70,8 @@ "0.08" ], "printable_height": "400", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ diff --git a/resources/profiles/Vivedino/machine/fdm_klipper_common.json b/resources/profiles/Vivedino/machine/fdm_klipper_common.json index d7a84deba..0a83eeac9 100644 --- a/resources/profiles/Vivedino/machine/fdm_klipper_common.json +++ b/resources/profiles/Vivedino/machine/fdm_klipper_common.json @@ -80,7 +80,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "printer_settings_id": "", diff --git a/resources/profiles/Vivedino/machine/fdm_machine_common.json b/resources/profiles/Vivedino/machine/fdm_machine_common.json index 28ee8f30b..9ef80a36d 100644 --- a/resources/profiles/Vivedino/machine/fdm_machine_common.json +++ b/resources/profiles/Vivedino/machine/fdm_machine_common.json @@ -70,7 +70,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ diff --git a/resources/profiles/Vivedino/machine/fdm_rrf_common.json b/resources/profiles/Vivedino/machine/fdm_rrf_common.json index 740146688..505b1c08b 100644 --- a/resources/profiles/Vivedino/machine/fdm_rrf_common.json +++ b/resources/profiles/Vivedino/machine/fdm_rrf_common.json @@ -80,7 +80,8 @@ "0.08" ], "printable_height": "330", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "printer_settings_id": "", diff --git a/resources/profiles/Voron/machine/fdm_klipper_common.json b/resources/profiles/Voron/machine/fdm_klipper_common.json index 6a3b00a6b..8c47efd9a 100644 --- a/resources/profiles/Voron/machine/fdm_klipper_common.json +++ b/resources/profiles/Voron/machine/fdm_klipper_common.json @@ -80,7 +80,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "printer_settings_id": "", diff --git a/resources/profiles/Voron/machine/fdm_machine_common.json b/resources/profiles/Voron/machine/fdm_machine_common.json index a98129205..77d5f9653 100644 --- a/resources/profiles/Voron/machine/fdm_machine_common.json +++ b/resources/profiles/Voron/machine/fdm_machine_common.json @@ -70,7 +70,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ diff --git a/resources/profiles/Voxelab/machine/fdm_machine_common.json b/resources/profiles/Voxelab/machine/fdm_machine_common.json index 31fc61df8..9ab81f0b5 100644 --- a/resources/profiles/Voxelab/machine/fdm_machine_common.json +++ b/resources/profiles/Voxelab/machine/fdm_machine_common.json @@ -70,7 +70,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 32ceaddf9..fb695cb45 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -894,7 +894,7 @@ static std::vector s_Preset_printer_options { "printer_technology", "printable_area", "bed_exclude_area","bed_custom_texture", "bed_custom_model", "gcode_flavor", "single_extruder_multi_material", "machine_start_gcode", "machine_end_gcode","printing_by_object_gcode","before_layer_change_gcode", "layer_change_gcode", "time_lapse_gcode", "change_filament_gcode", - "printer_model", "printer_variant", "printable_height", "extruder_clearance_radius", "extruder_clearance_max_radius","extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod", + "printer_model", "printer_variant", "printable_height", "extruder_clearance_dist_to_rod", "extruder_clearance_max_radius","extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod", "nozzle_height", "default_print_profile", "inherits", "silent_mode", @@ -2519,7 +2519,7 @@ const std::string& PresetCollection::get_preset_name_by_alias(const std::string& it_preset->is_visible && (it_preset->is_compatible || size_t(it_preset - m_presets.begin()) == m_idx_selected)) return it_preset->name; } - + return alias; } diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index dcee07080..56c9e045a 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -101,7 +101,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n "post_process", "extruder_clearance_height_to_rod", "extruder_clearance_height_to_lid", - "extruder_clearance_radius", + "extruder_clearance_dist_to_rod", "nozzle_height", "extruder_clearance_max_radius", "extruder_colour", @@ -768,7 +768,7 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print { auto inst = print_instance_with_bounding_box[k].print_instance; // 只需要考虑喷嘴到滑杆的偏移量,这个比整个工具头的碰撞半径要小得多 - auto bbox = print_instance_with_bounding_box[k].bounding_box.inflated(-scale_(0.5 * print.config().extruder_clearance_max_radius.value)); + auto bbox = print_instance_with_bounding_box[k].bounding_box.inflated(-scale_(print_config.extruder_clearance_dist_to_rod.value - print_config.extruder_clearance_max_radius.value)); auto iy1 = bbox.min.y(); auto iy2 = bbox.max.y(); (const_cast(inst->model_instance))->arrange_order = k+1; @@ -1163,7 +1163,7 @@ StringObjectException Print::validate(StringObjectException *warning, Polygons* if (has_custom_layering) { std::vector> layer_z_series; layer_z_series.assign(m_objects.size(), std::vector()); - + for (size_t idx_object = 0; idx_object < m_objects.size(); ++idx_object) { layer_z_series[idx_object] = generate_object_layers(m_objects[idx_object]->slicing_parameters(), layer_height_profiles[idx_object], m_objects[idx_object]->config().precise_z_height.value); } @@ -1683,7 +1683,7 @@ void Print::process(std::unordered_map* slice_time, bool if (slice_time) { start_time = (long long)Slic3r::Utils::get_current_milliseconds_time_utc(); } - + for (PrintObject* obj : m_objects) { if (need_slicing_objects.count(obj) != 0) { diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 7e6ba6387..9eb8ed085 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1352,8 +1352,8 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(120)); - def = this->add("extruder_clearance_radius", coFloat); - def->label = L("Radius"); + def = this->add("extruder_clearance_dist_to_rod", coFloat); + def->label = L("Distance to rod"); def->tooltip = L("Clearance radius around extruder. Used for collision avoidance in by-object printing."); def->sidetext = L("mm"); def->min = 0; diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 057024b6a..f9155aa60 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1035,7 +1035,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionEnum, draft_shield)) ((ConfigOptionFloat, extruder_clearance_height_to_rod))//BBs ((ConfigOptionFloat, extruder_clearance_height_to_lid))//BBS - ((ConfigOptionFloat, extruder_clearance_radius)) + ((ConfigOptionFloat, extruder_clearance_dist_to_rod)) ((ConfigOptionFloat, nozzle_height)) ((ConfigOptionFloat, extruder_clearance_max_radius)) ((ConfigOptionStrings, extruder_colour)) diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index d2471bf98..1895fd75b 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -658,7 +658,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co toggle_line(el, has_ironing); // bool have_sequential_printing = (config->opt_enum("print_sequence") == PrintSequence::ByObject); - // for (auto el : { "extruder_clearance_radius", "extruder_clearance_height_to_rod", "extruder_clearance_height_to_lid" }) + // for (auto el : { "extruder_clearance_dist_to_rod", "extruder_clearance_height_to_rod", "extruder_clearance_height_to_lid" }) // toggle_field(el, have_sequential_printing); bool have_ooze_prevention = config->opt_bool("ooze_prevention"); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index f2b919f3f..323db5a76 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -5332,8 +5332,8 @@ void GLCanvas3D::update_sequential_clearance() Polygon hull_no_offset = model_object->convex_hull_2d(Geometry::assemble_transform({ 0.0, 0.0, model_instance0->get_offset().z() }, model_instance0->get_rotation(), model_instance0->get_scaling_factor(), model_instance0->get_mirror())); auto tmp = offset(hull_no_offset, - // Shrink the extruder_clearance_radius a tiny bit, so that if the object arrangement algorithm placed the objects - // exactly by satisfying the extruder_clearance_radius, this test will not trigger collision. + // Shrink the extruder_clearance_max_radius a tiny bit, so that if the object arrangement algorithm placed the objects + // exactly by satisfying the extruder_clearance_max_radius, this test will not trigger collision. shrink_factor, jtRound, mitter_limit); Polygon hull_2d = !tmp.empty() ? tmp.front() : hull_no_offset;// tmp may be empty due to clipper's bug, see STUDIO-2452 diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 15af6ddc1..e735290db 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2742,7 +2742,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) //BBS: add bed_exclude_area , config(Slic3r::DynamicPrintConfig::new_from_defaults_keys({ "printable_area", "bed_exclude_area", "bed_custom_texture", "bed_custom_model", "print_sequence", - "extruder_clearance_radius", "extruder_clearance_max_radius", + "extruder_clearance_dist_to_rod", "extruder_clearance_max_radius", "extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod", "nozzle_height", "skirt_loops", "skirt_distance", "brim_width", "brim_object_gap", "brim_type", "nozzle_diameter", "single_extruder_multi_material", diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 879471989..54194de4b 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3517,6 +3517,7 @@ void TabPrinter::build_fff() optgroup = page->new_optgroup(L("Extruder Clearance")); optgroup->append_single_option_line("extruder_clearance_max_radius"); + optgroup->append_single_option_line("extruder_clearance_dist_to_rod"); optgroup->append_single_option_line("extruder_clearance_height_to_rod"); optgroup->append_single_option_line("extruder_clearance_height_to_lid"); @@ -4126,7 +4127,7 @@ void TabPrinter::toggle_options() // Disable silent mode for non-marlin firmwares. toggle_option("silent_mode", is_marlin_flavor); //BBS: extruder clearance of BBL printer can't be edited. - for (auto el : { "extruder_clearance_max_radius", "extruder_clearance_height_to_rod", "extruder_clearance_height_to_lid" }) + for (auto el : {"extruder_clearance_max_radius", "extruder_clearance_dist_to_rod", "extruder_clearance_height_to_rod", "extruder_clearance_height_to_lid"}) toggle_option(el, !is_BBL_printer); }