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

2026-05-19 19:33:47 +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/Tronxy/machine/Tronxy
+++ b/resources/profiles/Tronxy/machine/Tronxy
@@ -1,22 +1,22 @@
 {
-  "type": "machine",
-  "setting_id": "GM003",
-  "name": "Tronxy X5SA 400 0.4 nozzle",
-  "from": "system",
-  "instantiation": "true",
-  "inherits": "fdm_machine_common",
-  "printer_model": "Tronxy X5SA 400 Marlin Firmware",
-  "default_filament_profile": "Generic PLA @System",
-  "default_print_profile": "0.20mm Standard @Tronxy",
-  "nozzle_diameter": [
-    "0.4"
-  ],
-  "printable_area": [
-    "0x0",
-    "400x0",
-    "400x400",
-    "0x400"
-  ],
-  "printable_height": "400",
-  "machine_start_gcode": "M104 S[nozzle_temperature_initial_layer] ; start heat nozzle\nM140 S[bed_temperature_initial_layer] ; start heat bed\nG90 ; abs coords\nM83 ; extrude relative\nG28 ; home\nM190 S[bed_temperature_initial_layer] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp\nG1 X10.1 Y20 Z0.28 F5000.0 ; purge line\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15\nG1 X10.4 Y200.0 Z0.28 F5000.0\nG1 X10.4 Y20 Z0.28 F1500.0 E15\nG1 Z5.0 F3000 ; move Z up"
-}
+    "type": "machine",
+    "name": "Tronxy X5SA 400 0.4 nozzle",
+    "inherits": "fdm_machine_common",
+    "from": "system",
+    "setting_id": "GM003",
+    "instantiation": "true",
+    "printer_model": "Tronxy X5SA 400 Marlin Firmware",
+    "default_filament_profile": "Generic PLA @System",
+    "default_print_profile": "0.20mm Standard @Tronxy",
+    "nozzle_diameter": [
+        "0.4"
+    ],
+    "printable_area": [
+        "0x0",
+        "400x0",
+        "400x400",
+        "0x400"
+    ],
+    "printable_height": "400",
+    "machine_start_gcode": "M104 S[nozzle_temperature_initial_layer] ; start heat nozzle\nM140 S[bed_temperature_initial_layer] ; start heat bed\nG90 ; abs coords\nM83 ; extrude relative\nG28 ; home\nM190 S[bed_temperature_initial_layer] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp\nG1 X10.1 Y20 Z0.28 F5000.0 ; purge line\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15\nG1 X10.4 Y200.0 Z0.28 F5000.0\nG1 X10.4 Y20 Z0.28 F1500.0 E15\nG1 Z5.0 F3000 ; move Z up"
+}
--- a/resources/profiles/Tronxy/machine/fdm_machine_common.json
+++ b/resources/profiles/Tronxy/machine/fdm_machine_common.json
@@ -114,4 +114,4 @@
    "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
    "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
    "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end"
-}
+}
--- a/resources/profiles/Tronxy/process/0.08mm
+++ b/resources/profiles/Tronxy/process/0.08mm
@@ -1,11 +1,11 @@
 {
    "type": "process",
-    "setting_id": "GP001",
    "name": "0.08mm Extra Fine @Tronxy",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_common",
+    "from": "system",
+    "setting_id": "GP001",
+    "instantiation": "true",
    "layer_height": "0.08",
    "bottom_shell_layers": "7",
    "top_shell_layers": "9"
-}
+}
--- a/resources/profiles/Tronxy/process/0.12mm
+++ b/resources/profiles/Tronxy/process/0.12mm
@@ -1,11 +1,11 @@
 {
    "type": "process",
-    "setting_id": "GP002",
    "name": "0.12mm Fine @Tronxy",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_common",
+    "from": "system",
+    "setting_id": "GP002",
+    "instantiation": "true",
    "layer_height": "0.12",
    "bottom_shell_layers": "5",
    "top_shell_layers": "6"
-}
+}
--- a/resources/profiles/Tronxy/process/0.15mm
+++ b/resources/profiles/Tronxy/process/0.15mm
@@ -1,11 +1,11 @@
 {
    "type": "process",
-    "setting_id": "GP003",
    "name": "0.15mm Optimal @Tronxy",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_common",
+    "from": "system",
+    "setting_id": "GP003",
+    "instantiation": "true",
    "bottom_shell_layers": "4",
    "top_shell_layers": "5",
    "layer_height": "0.15"
-}
+}
--- a/resources/profiles/Tronxy/process/0.20mm
+++ b/resources/profiles/Tronxy/process/0.20mm
@@ -1,11 +1,11 @@
 {
    "type": "process",
-    "setting_id": "GP004",
    "name": "0.20mm Standard @Tronxy",
-    "from": "system",
    "inherits": "fdm_process_common",
+    "from": "system",
+    "setting_id": "GP004",
    "instantiation": "true",
    "layer_height": "0.2",
    "bottom_shell_layers": "3",
    "top_shell_layers": "4"
-}
+}
--- a/resources/profiles/Tronxy/process/0.24mm
+++ b/resources/profiles/Tronxy/process/0.24mm
@@ -1,12 +1,12 @@
 {
    "type": "process",
-    "setting_id": "GP005",
    "name": "0.24mm Draft @Tronxy",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_common",
+    "from": "system",
+    "setting_id": "GP005",
+    "instantiation": "true",
    "layer_height": "0.24",
    "top_surface_line_width": "0.45",
    "bottom_shell_layers": "3",
    "top_shell_layers": "4"
-}
+}
--- a/resources/profiles/Tronxy/process/0.28mm
+++ b/resources/profiles/Tronxy/process/0.28mm
@@ -1,12 +1,12 @@
 {
    "type": "process",
-    "setting_id": "GP006",
    "name": "0.28mm Extra Draft @Tronxy",
-    "from": "system",
-    "instantiation": "true",
    "inherits": "fdm_process_common",
+    "from": "system",
+    "setting_id": "GP006",
+    "instantiation": "true",
    "layer_height": "0.28",
    "top_surface_line_width": "0.45",
    "bottom_shell_layers": "3",
    "top_shell_layers": "4"
-}
+}
--- a/resources/profiles/Tronxy/process/fdm_process_common.json
+++ b/resources/profiles/Tronxy/process/fdm_process_common.json
@@ -97,7 +97,7 @@
    "prime_tower_width": "60",
    "xy_hole_compensation": "0",
    "xy_contour_compensation": "0",
-    "compatible_printers": [ 
-	"Tronxy X5SA 400 0.4 nozzle"
+    "compatible_printers": [
+        "Tronxy X5SA 400 0.4 nozzle"
    ]
-}
+}
--- a/resources/profiles/Tronxy/process/fdm_process_tronxy_common.json
+++ b/resources/profiles/Tronxy/process/fdm_process_tronxy_common.json
@@ -1,9 +1,9 @@
 {
    "type": "process",
    "name": "fdm_process_tronxy_common",
+    "inherits": "fdm_process_common",
    "from": "system",
    "instantiation": "false",
-    "inherits": "fdm_process_common",
    "adaptive_layer_height": "0",
    "reduce_crossing_wall": "0",
    "max_travel_detour_distance": "0",
@@ -98,7 +98,7 @@
    "prime_tower_width": "60",
    "xy_hole_compensation": "0",
    "xy_contour_compensation": "0",
-    "compatible_printers": [ 
-	"Tronxy X5SA 400 0.4 nozzle"
+    "compatible_printers": [
+        "Tronxy X5SA 400 0.4 nozzle"
    ]
-}
+}