Fixed many profile issues and cleaned up some messes. (#10686)

2026-05-19 11:23:42 +00:00 · 2025-09-11 17:50:53 +08:00
parent 5e9570c946
commit 4f50fdc94e
6026 changed files with 187121 additions and 169667 deletions
--- a/resources/profiles/Positron3D/machine/The
+++ b/resources/profiles/Positron3D/machine/The
@@ -1,10 +1,10 @@
 {
    "type": "machine",
-    "setting_id": "GM002",
    "name": "The Positron 0.2 nozzle",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_common_the_positron",
+    "from": "system",
+    "setting_id": "GM002",
+    "instantiation": "true",
    "printer_model": "The Positron",
    "nozzle_diameter": [
        "0.2"
--- a/resources/profiles/Positron3D/machine/The
+++ b/resources/profiles/Positron3D/machine/The
@@ -1,10 +1,10 @@
 {
    "type": "machine",
-    "setting_id": "GM001",
    "name": "The Positron 0.4 nozzle",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_common_the_positron",
+    "from": "system",
+    "setting_id": "GM001",
+    "instantiation": "true",
    "printer_model": "The Positron",
    "nozzle_diameter": [
        "0.4"
--- a/resources/profiles/Positron3D/machine/The
+++ b/resources/profiles/Positron3D/machine/The
@@ -1,10 +1,10 @@
 {
    "type": "machine",
-    "setting_id": "GM003",
    "name": "The Positron 0.6 nozzle",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_common_the_positron",
+    "from": "system",
+    "setting_id": "GM003",
+    "instantiation": "true",
    "printer_model": "The Positron",
    "nozzle_diameter": [
        "0.6"
--- a/resources/profiles/Positron3D/machine/The
+++ b/resources/profiles/Positron3D/machine/The
@@ -1,10 +1,10 @@
 {
    "type": "machine",
-    "setting_id": "GM004",
    "name": "The Positron 0.8 nozzle",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_common_the_positron",
+    "from": "system",
+    "setting_id": "GM004",
+    "instantiation": "true",
    "printer_model": "The Positron",
    "nozzle_diameter": [
        "0.8"
--- a/resources/profiles/Positron3D/machine/The
+++ b/resources/profiles/Positron3D/machine/The
@@ -9,4 +9,4 @@
    "bed_texture": "ThePositron_bed_texture.svg",
    "hotend_model": "",
    "default_materials": "Generic PLA @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System"
-}
+}
--- a/resources/profiles/Positron3D/machine/fdm_common_the_positron.json
+++ b/resources/profiles/Positron3D/machine/fdm_common_the_positron.json
@@ -1,60 +1,141 @@
 {
-  "type": "machine",
-  "name": "fdm_common_the_positron",
-  "from": "system",
-  "instantiation": "false",
-  "inherits": "fdm_machine_common",
-  "gcode_flavor": "klipper",
-  "machine_max_acceleration_e": ["5000", "5000"],
-  "machine_max_acceleration_extruding": ["8000", "8000"],
-  "machine_max_acceleration_retracting": ["5000", "5000"],
-  "machine_max_acceleration_travel": ["8000", "8000"],
-  "machine_max_acceleration_x": ["8000", "8000"],
-  "machine_max_acceleration_y": ["8000", "8000"],
-  "machine_max_acceleration_z": ["500", "500"],
-  "machine_max_speed_e": ["25", "25"],
-  "machine_max_speed_x": ["420", "420"],
-  "machine_max_speed_y": ["420", "420"],
-  "machine_max_speed_z": ["12", "12"],
-  "machine_max_jerk_e": ["2.5", "2.5"],
-  "machine_max_jerk_x": ["12", "12"],
-  "machine_max_jerk_y": ["12", "12"],
-  "machine_max_jerk_z": ["0.2", "0.4"],
-  "machine_min_extruding_rate": ["0", "0"],
-  "machine_min_travel_rate": ["0", "0"],
-  "max_layer_height": ["0.32"],
-  "min_layer_height": ["0.08"],
-  "printable_height": "165",
-  "extruder_clearance_radius": "65",
-  "extruder_clearance_height_to_rod": "36",
-  "extruder_clearance_height_to_lid": "140",
-  "printer_settings_id": "",
-  "printer_technology": "FFF",
-  "printer_variant": "0.4",
-  "retraction_minimum_travel": ["1"],
-  "retract_before_wipe": ["70%"],
-  "retract_when_changing_layer": ["1"],
-  "retraction_length": ["0.8"],
-  "retract_length_toolchange": ["2"],
-  "z_hop": ["0.4"],
-  "retract_restart_extra": ["0"],
-  "retract_restart_extra_toolchange": ["0"],
-  "retraction_speed": ["50"],
-  "deretraction_speed": ["40"],
-  "z_hop_types": "Normal Lift",
-  "silent_mode": "0",
-  "single_extruder_multi_material": "1",
-  "change_filament_gcode": "",
-  "wipe": ["1"],
-  "default_filament_profile": ["Generic PLA @System"],
-  "default_print_profile": "0.20mm Standard @The Positron",
-  "bed_exclude_area": ["0x0"],
-  "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",
-  "machine_end_gcode": "PRINT_END",
-  "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
-  "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
-  "machine_pause_gcode": "PAUSE",
-  "scan_first_layer": "0",
-  "nozzle_type": "undefine",
-  "auxiliary_fan": "0"
-}
+    "type": "machine",
+    "name": "fdm_common_the_positron",
+    "inherits": "fdm_machine_common",
+    "from": "system",
+    "instantiation": "false",
+    "gcode_flavor": "klipper",
+    "machine_max_acceleration_e": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_extruding": [
+        "8000",
+        "8000"
+    ],
+    "machine_max_acceleration_retracting": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_travel": [
+        "8000",
+        "8000"
+    ],
+    "machine_max_acceleration_x": [
+        "8000",
+        "8000"
+    ],
+    "machine_max_acceleration_y": [
+        "8000",
+        "8000"
+    ],
+    "machine_max_acceleration_z": [
+        "500",
+        "500"
+    ],
+    "machine_max_speed_e": [
+        "25",
+        "25"
+    ],
+    "machine_max_speed_x": [
+        "420",
+        "420"
+    ],
+    "machine_max_speed_y": [
+        "420",
+        "420"
+    ],
+    "machine_max_speed_z": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_e": [
+        "2.5",
+        "2.5"
+    ],
+    "machine_max_jerk_x": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_y": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_z": [
+        "0.2",
+        "0.4"
+    ],
+    "machine_min_extruding_rate": [
+        "0",
+        "0"
+    ],
+    "machine_min_travel_rate": [
+        "0",
+        "0"
+    ],
+    "max_layer_height": [
+        "0.32"
+    ],
+    "min_layer_height": [
+        "0.08"
+    ],
+    "printable_height": "165",
+    "extruder_clearance_radius": "65",
+    "extruder_clearance_height_to_rod": "36",
+    "extruder_clearance_height_to_lid": "140",
+    "printer_settings_id": "",
+    "printer_technology": "FFF",
+    "printer_variant": "0.4",
+    "retraction_minimum_travel": [
+        "1"
+    ],
+    "retract_before_wipe": [
+        "70%"
+    ],
+    "retract_when_changing_layer": [
+        "1"
+    ],
+    "retraction_length": [
+        "0.8"
+    ],
+    "retract_length_toolchange": [
+        "2"
+    ],
+    "z_hop": [
+        "0.4"
+    ],
+    "retract_restart_extra": [
+        "0"
+    ],
+    "retract_restart_extra_toolchange": [
+        "0"
+    ],
+    "retraction_speed": [
+        "50"
+    ],
+    "deretraction_speed": [
+        "40"
+    ],
+    "z_hop_types": "Normal Lift",
+    "silent_mode": "0",
+    "single_extruder_multi_material": "1",
+    "change_filament_gcode": "",
+    "wipe": [
+        "1"
+    ],
+    "default_filament_profile": [
+        "Generic PLA @System"
+    ],
+    "default_print_profile": "0.20mm Standard @The Positron",
+    "bed_exclude_area": [
+        "0x0"
+    ],
+    "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",
+    "machine_end_gcode": "PRINT_END",
+    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
+    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
+    "machine_pause_gcode": "PAUSE",
+    "scan_first_layer": "0",
+    "nozzle_type": "undefine",
+    "auxiliary_fan": "0"
+}
--- a/resources/profiles/Positron3D/machine/fdm_machine_common.json
+++ b/resources/profiles/Positron3D/machine/fdm_machine_common.json
@@ -116,4 +116,4 @@
    "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
    "machine_pause_gcode": "M601"
-}
+}
--- a/resources/profiles/Positron3D/process/0.08mm
+++ b/resources/profiles/Positron3D/process/0.08mm
@@ -1,10 +1,10 @@
 {
    "type": "process",
-    "setting_id": "GP004",
    "name": "0.08mm Extra Fine @The Positron",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
+    "instantiation": "true",
    "layer_height": "0.08",
    "bottom_shell_layers": "7",
    "top_shell_layers": "9",
--- a/resources/profiles/Positron3D/process/0.12mm
+++ b/resources/profiles/Positron3D/process/0.12mm
@@ -1,10 +1,10 @@
 {
    "type": "process",
-    "setting_id": "GP004",
    "name": "0.12mm Fine @The Positron",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
+    "instantiation": "true",
    "layer_height": "0.12",
    "bottom_shell_layers": "5",
    "top_shell_layers": "6",
--- a/resources/profiles/Positron3D/process/0.16mm
+++ b/resources/profiles/Positron3D/process/0.16mm
@@ -1,10 +1,10 @@
 {
    "type": "process",
-    "setting_id": "GP004",
    "name": "0.16mm Optimal @The Positron",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
+    "instantiation": "true",
    "bottom_shell_layers": "4",
    "top_shell_layers": "5",
    "support_top_z_distance": "0.16",
--- a/resources/profiles/Positron3D/process/0.20mm
+++ b/resources/profiles/Positron3D/process/0.20mm
@@ -1,9 +1,9 @@
 {
    "type": "process",
-    "setting_id": "GP004",
    "name": "0.20mm Standard @The Positron",
-    "from": "system",
    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
    "instantiation": "true",
    "layer_height": "0.2",
    "compatible_printers": [
@@ -11,4 +11,4 @@
        "The Positron 0.6 nozzle",
        "The Positron 0.8 nozzle"
    ]
-}
+}
--- a/resources/profiles/Positron3D/process/0.24mm
+++ b/resources/profiles/Positron3D/process/0.24mm
@@ -1,10 +1,10 @@
 {
    "type": "process",
-    "setting_id": "GP004",
    "name": "0.24mm Draft @The Positron",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
+    "instantiation": "true",
    "support_top_z_distance": "0.2",
    "support_bottom_z_distance": "0.2",
    "layer_height": "0.24",
--- a/resources/profiles/Positron3D/process/0.28mm
+++ b/resources/profiles/Positron3D/process/0.28mm
@@ -1,10 +1,10 @@
 {
    "type": "process",
-    "setting_id": "GP004",
    "name": "0.28mm Extra Draft @The Positron",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
+    "instantiation": "true",
    "layer_height": "0.28",
    "initial_layer_print_height": "0.2",
    "compatible_printers": [
--- a/resources/profiles/Positron3D/process/0.32mm
+++ b/resources/profiles/Positron3D/process/0.32mm
@@ -1,14 +1,14 @@
 {
-  "type": "process",
-  "setting_id": "GP004",
-  "name": "0.32mm Standard @The Positron",
-  "from": "system",
-  "instantiation": "true",
-  "inherits": "fdm_process_the_positron_common",
-  "support_top_z_distance": "0.24",
-  "support_bottom_z_distance": "0.24",
-  "layer_height": "0.32",
-  "initial_layer_print_height": "0.2",
+    "type": "process",
+    "name": "0.32mm Standard @The Positron",
+    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
+    "instantiation": "true",
+    "support_top_z_distance": "0.24",
+    "support_bottom_z_distance": "0.24",
+    "layer_height": "0.32",
+    "initial_layer_print_height": "0.2",
    "compatible_printers": [
        "The Positron 0.4 nozzle",
        "The Positron 0.6 nozzle",
--- a/resources/profiles/Positron3D/process/0.40mm
+++ b/resources/profiles/Positron3D/process/0.40mm
@@ -1,14 +1,14 @@
 {
-  "type": "process",
-  "setting_id": "GP004",
-  "name": "0.40mm Standard @The Positron",
-  "from": "system",
-  "instantiation": "true",
-  "inherits": "fdm_process_the_positron_common",
-  "support_top_z_distance": "0.24",
-  "support_bottom_z_distance": "0.24",
-  "layer_height": "0.40",
-  "initial_layer_print_height": "0.2",
+    "type": "process",
+    "name": "0.40mm Standard @The Positron",
+    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
+    "instantiation": "true",
+    "support_top_z_distance": "0.24",
+    "support_bottom_z_distance": "0.24",
+    "layer_height": "0.40",
+    "initial_layer_print_height": "0.2",
    "compatible_printers": [
        "The Positron 0.6 nozzle",
        "The Positron 0.8 nozzle"
--- a/resources/profiles/Positron3D/process/0.56mm
+++ b/resources/profiles/Positron3D/process/0.56mm
@@ -1,10 +1,10 @@
 {
    "type": "process",
-    "setting_id": "GP004",
    "name": "0.56mm Standard @The Positron",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_the_positron_common",
+    "from": "system",
+    "setting_id": "GP004",
+    "instantiation": "true",
    "support_top_z_distance": "0.24",
    "support_bottom_z_distance": "0.24",
    "layer_height": "0.56",
--- a/resources/profiles/Positron3D/process/fdm_process_common.json
+++ b/resources/profiles/Positron3D/process/fdm_process_common.json
@@ -105,4 +105,4 @@
    "top_surface_speed": "50",
    "gap_infill_speed": "30",
    "travel_speed": "200"
-}
+}
--- a/resources/profiles/Positron3D/process/fdm_process_the_positron_common.json
+++ b/resources/profiles/Positron3D/process/fdm_process_the_positron_common.json
@@ -1,9 +1,9 @@
 {
    "type": "process",
    "name": "fdm_process_the_positron_common",
+    "inherits": "fdm_process_common",
    "from": "system",
    "instantiation": "false",
-    "inherits": "fdm_process_common",
    "default_acceleration": "5000",
    "top_surface_acceleration": "3000",
    "travel_acceleration": "7000",