Treat extruder_clearance_max_radius as extruder_clearance_radius, and raise error if both options are present

2026-05-17 10:32:20 +00:00 · 2025-10-11 16:17:14 +08:00
parent 6ea106f754
commit 2fa386cbdb
31 changed files with 77 additions and 29 deletions
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -21,7 +21,6 @@
    "default_print_profile": "0.10mm Standard 0.2mm nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -21,7 +21,6 @@
    "default_print_profile": "0.10mm Standard 0.25mm nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -18,7 +18,6 @@
    "default_print_profile": "0.20mm Standard @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -24,7 +24,6 @@
    "default_print_profile": "0.30mm Standard 0.6 nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -21,7 +21,6 @@
    "default_print_profile": "0.10mm Standard 0.2mm nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -21,7 +21,6 @@
    "default_print_profile": "0.10mm Standard 0.25mm nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -18,7 +18,6 @@
    "default_print_profile": "0.20mm Standard @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -24,7 +24,6 @@
    "default_print_profile": "0.30mm Standard 0.6 nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -21,7 +21,6 @@
    "default_print_profile": "0.10mm Standard 0.2mm nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -21,7 +21,6 @@
    "default_print_profile": "0.10mm Standard 0.25mm nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -18,7 +18,6 @@
    "default_print_profile": "0.20mm Standard @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/Anker/machine/Anker
+++ b/resources/profiles/Anker/machine/Anker
@@ -24,7 +24,6 @@
    "default_print_profile": "0.30mm Standard 0.6 nozzle @Anker",
    "extruder_clearance_height_to_lid": "250",
    "extruder_clearance_height_to_rod": "30",
-    "extruder_clearance_max_radius": "45",
    "extruder_clearance_radius": "45",
    "printer_structure": "i3",
    "nozzle_type": "brass",
--- a/resources/profiles/BBL/machine/Bambu
+++ b/resources/profiles/BBL/machine/Bambu
@@ -19,7 +19,6 @@
    "extruder_clearance_height_to_lid": "201",
    "extruder_clearance_height_to_rod": "47.4",
    "extruder_clearance_max_radius": "96",
-    "extruder_clearance_radius": "49",
    "extruder_printable_area": [
        "0x0,325x0,325x320,0x320",
        "25x0,350x0,350x320,25x320"
--- a/resources/profiles/BBL/machine/Bambu
+++ b/resources/profiles/BBL/machine/Bambu
@@ -23,7 +23,6 @@
    "extruder_clearance_height_to_lid": "201",
    "extruder_clearance_height_to_rod": "47.4",
    "extruder_clearance_max_radius": "96",
-    "extruder_clearance_radius": "49",
    "extruder_printable_area": [
        "0x0,325x0,325x320,0x320",
        "25x0,350x0,350x320,25x320"
--- a/resources/profiles/BBL/machine/Bambu
+++ b/resources/profiles/BBL/machine/Bambu
@@ -27,7 +27,6 @@
    "extruder_clearance_height_to_lid": "187",
    "extruder_clearance_height_to_rod": "33",
    "extruder_clearance_max_radius": "81",
-    "extruder_clearance_radius": "30",
    "fan_direction": "left",
    "hotend_cooling_rate": [
        "2",
--- a/resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
+++ b/resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
@@ -33,7 +33,6 @@
    ],
    "extruder_clearance_height_to_lid": "90",
    "extruder_clearance_max_radius": "68",
-    "extruder_clearance_radius": "57",
    "extruder_colour": [
        "#018001"
    ],
--- a/resources/profiles/BBL/machine/fdm_bbl_3dp_002_common.json
+++ b/resources/profiles/BBL/machine/fdm_bbl_3dp_002_common.json
@@ -32,7 +32,6 @@
    "extruder_clearance_height_to_lid": "90",
    "extruder_clearance_height_to_rod": "38.70",
    "extruder_clearance_max_radius": "92",
-    "extruder_clearance_radius": "13",
    "extruder_colour": [
        "#018001",
        "#018001"
--- a/resources/profiles/BBL/machine/fdm_machine_common.json
+++ b/resources/profiles/BBL/machine/fdm_machine_common.json
@@ -17,7 +17,7 @@
    ],
    "extruder_clearance_height_to_lid": "140",
    "extruder_clearance_height_to_rod": "34",
-    "extruder_clearance_radius": "65",
+    "extruder_clearance_max_radius": "65",
    "extruder_clearance_dist_to_rod": "33",
    "extruder_colour": [
        "#FCE94F"
--- a/resources/profiles/Creality/machine/Creality
+++ b/resources/profiles/Creality/machine/Creality
@@ -11,7 +11,6 @@
    "printer_structure": "i3",
    "default_print_profile": "0.20mm Standard @Creality Ender3V3KE",
    "extruder_clearance_height_to_rod": "47",
-    "extruder_clearance_max_radius": "90",
    "extruder_clearance_radius": "90",
    "machine_load_filament_time": "11",
    "nozzle_diameter": [
--- a/resources/profiles/Creality/machine/Creality
+++ b/resources/profiles/Creality/machine/Creality
@@ -11,7 +11,6 @@
    "printer_structure": "i3",
    "default_print_profile": "0.20mm Standard @Creality Ender3V3KE",
    "extruder_clearance_height_to_rod": "47",
-    "extruder_clearance_max_radius": "90",
    "extruder_clearance_radius": "90",
    "machine_load_filament_time": "11",
    "nozzle_diameter": [
--- a/resources/profiles/Creality/machine/Creality
+++ b/resources/profiles/Creality/machine/Creality
@@ -11,7 +11,6 @@
    "printer_structure": "i3",
    "default_print_profile": "0.20mm Standard @Creality Ender3V3KE",
    "extruder_clearance_height_to_rod": "47",
-    "extruder_clearance_max_radius": "90",
    "extruder_clearance_radius": "90",
    "machine_load_filament_time": "11",
    "nozzle_diameter": [
--- a/resources/profiles/Creality/machine/Creality
+++ b/resources/profiles/Creality/machine/Creality
@@ -11,7 +11,6 @@
    "printer_structure": "i3",
    "default_print_profile": "0.20mm Standard @Creality Ender3V3KE",
    "extruder_clearance_height_to_rod": "47",
-    "extruder_clearance_max_radius": "90",
    "extruder_clearance_radius": "90",
    "machine_load_filament_time": "11",
    "nozzle_diameter": [
--- a/resources/profiles/Creality/machine/Creality
+++ b/resources/profiles/Creality/machine/Creality
@@ -12,7 +12,6 @@
    "printer_structure": "i3",
    "default_print_profile": "0.20mm Standard @Creality Ender3V3SE 0.2",
    "extruder_clearance_height_to_rod": "47",
-    "extruder_clearance_max_radius": "90",
    "extruder_clearance_radius": "90",
    "machine_load_filament_time": "11",
    "nozzle_diameter": [
--- a/resources/profiles/Creality/machine/Creality
+++ b/resources/profiles/Creality/machine/Creality
@@ -12,7 +12,6 @@
    "printer_structure": "i3",
    "default_print_profile": "0.20mm Standard @Creality Ender3V3SE 0.4",
    "extruder_clearance_height_to_rod": "47",
-    "extruder_clearance_max_radius": "90",
    "extruder_clearance_radius": "90",
    "machine_load_filament_time": "11",
    "nozzle_diameter": [
--- a/resources/profiles/Creality/machine/Creality
+++ b/resources/profiles/Creality/machine/Creality
@@ -12,7 +12,6 @@
    "printer_structure": "i3",
    "default_print_profile": "0.20mm Standard @Creality Ender3V3SE 0.6",
    "extruder_clearance_height_to_rod": "47",
-    "extruder_clearance_max_radius": "90",
    "extruder_clearance_radius": "90",
    "machine_load_filament_time": "11",
    "nozzle_diameter": [
--- a/resources/profiles/Creality/machine/Creality
+++ b/resources/profiles/Creality/machine/Creality
@@ -12,7 +12,6 @@
    "printer_structure": "i3",
    "default_print_profile": "0.20mm Standard @Creality Ender3V3SE 0.8",
    "extruder_clearance_height_to_rod": "47",
-    "extruder_clearance_max_radius": "90",
    "extruder_clearance_radius": "90",
    "machine_load_filament_time": "11",
    "nozzle_diameter": [
--- a/resources/profiles/Elegoo/machine/ECC/fdm_machine_ecc.json
+++ b/resources/profiles/Elegoo/machine/ECC/fdm_machine_ecc.json
@@ -96,7 +96,6 @@
    "retract_lift_below": [
        "249"
    ],
-    "extruder_clearance_radius": "57",
    "extruder_clearance_max_radius": "68",
    "extruder_clearance_height_to_lid": "90",
    "nozzle_volume": "107",
--- a/resources/profiles/Elegoo/machine/fdm_elegoo_3dp_001_common.json
+++ b/resources/profiles/Elegoo/machine/fdm_elegoo_3dp_001_common.json
@@ -95,7 +95,6 @@
    "retract_lift_below": [
        "249"
    ],
-    "extruder_clearance_radius": "57",
    "extruder_clearance_max_radius": "68",
    "extruder_clearance_height_to_lid": "90",
    "nozzle_volume": "107",