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

This commit is contained in:
SoftFever
2025-09-11 17:50:53 +08:00
committed by GitHub
parent 5e9570c946
commit 4f50fdc94e
6026 changed files with 187121 additions and 169667 deletions

View File

@@ -1,11 +1,11 @@
{
"type": "filament",
"instantiation": "true",
"inherits": "fdm_filament_tpu",
"filament_id": "GFU99",
"setting_id": "GFSU99",
"name": "TwoTrees Generic 95A TPU @SK1",
"inherits": "fdm_filament_tpu",
"from": "system",
"setting_id": "GFSU99",
"filament_id": "GFU99",
"instantiation": "true",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,11 +1,11 @@
{
"type": "filament",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_id": "GFL100",
"setting_id": "GFSL100",
"name": "TwoTrees Generic HS PLA @SK1",
"inherits": "fdm_filament_pla",
"from": "system",
"setting_id": "GFSL100",
"filament_id": "GFL100",
"instantiation": "true",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "TwoTrees SK1 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"from": "system",
"setting_id": "GM001",
"instantiation": "true",
"printer_model": "TwoTrees SK1",
"nozzle_diameter": [
"0.4"
@@ -112,5 +112,5 @@
"300x300"
],
"thumbnails_format": "PNG",
"support_multi_bed_types": "1"
"support_multi_bed_types": "1"
}

View File

@@ -1,19 +1,19 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "TwoTrees SP-5 Klipper 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"printer_model": "TwoTrees SP-5 Klipper",
"nozzle_diameter": [
"0.4"
],
"printable_area": [
"0x0",
"310x0",
"310x310",
"0x310"
],
"printable_height": "350"
}
"type": "machine",
"name": "TwoTrees SP-5 Klipper 0.4 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"setting_id": "GM003",
"instantiation": "true",
"printer_model": "TwoTrees SP-5 Klipper",
"nozzle_diameter": [
"0.4"
],
"printable_area": [
"0x0",
"310x0",
"310x310",
"0x310"
],
"printable_height": "350"
}

View File

@@ -1,141 +1,141 @@
{
"type": "machine",
"name": "fdm_klipper_common",
"from": "system",
"instantiation": "false",
"inherits": "fdm_machine_common",
"gcode_flavor": "klipper",
"use_firmware_retraction": "0",
"machine_max_acceleration_e": [
"5000",
"5000"
],
"machine_max_acceleration_extruding": [
"20000",
"20000"
],
"machine_max_acceleration_retracting": [
"5000",
"5000"
],
"machine_max_acceleration_travel": [
"20000",
"20000"
],
"machine_max_acceleration_x": [
"9000",
"9000"
],
"machine_max_acceleration_y": [
"9000",
"9000"
],
"machine_max_acceleration_z": [
"500",
"200"
],
"machine_max_speed_e": [
"25",
"25"
],
"machine_max_speed_x": [
"500",
"200"
],
"machine_max_speed_y": [
"500",
"200"
],
"machine_max_speed_z": [
"12",
"12"
],
"machine_max_jerk_e": [
"2.5",
"2.5"
],
"machine_max_jerk_x": [
"9",
"9"
],
"machine_max_jerk_y": [
"9",
"9"
],
"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": "350",
"extruder_clearance_radius": "50",
"extruder_clearance_height_to_rod": "60",
"extruder_clearance_height_to_lid": "350",
"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"
],
"retract_restart_extra": [
"0"
],
"retract_restart_extra_toolchange": [
"0"
],
"retraction_speed": [
"30"
],
"deretraction_speed": [
"30"
],
"z_hop_types": "Normal Lift",
"silent_mode": "0",
"single_extruder_multi_material": "1",
"change_filament_gcode": "",
"machine_pause_gcode": "PAUSE\n",
"wipe": [
"1"
],
"default_filament_profile": [
"TwoTrees Generic PLA"
],
"bed_exclude_area": [
"0x0"
],
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\n",
"machine_end_gcode": "END_PRINT",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
"scan_first_layer": "0",
"nozzle_type": "undefine",
"auxiliary_fan": "0"
}
"type": "machine",
"name": "fdm_klipper_common",
"inherits": "fdm_machine_common",
"from": "system",
"instantiation": "false",
"gcode_flavor": "klipper",
"use_firmware_retraction": "0",
"machine_max_acceleration_e": [
"5000",
"5000"
],
"machine_max_acceleration_extruding": [
"20000",
"20000"
],
"machine_max_acceleration_retracting": [
"5000",
"5000"
],
"machine_max_acceleration_travel": [
"20000",
"20000"
],
"machine_max_acceleration_x": [
"9000",
"9000"
],
"machine_max_acceleration_y": [
"9000",
"9000"
],
"machine_max_acceleration_z": [
"500",
"200"
],
"machine_max_speed_e": [
"25",
"25"
],
"machine_max_speed_x": [
"500",
"200"
],
"machine_max_speed_y": [
"500",
"200"
],
"machine_max_speed_z": [
"12",
"12"
],
"machine_max_jerk_e": [
"2.5",
"2.5"
],
"machine_max_jerk_x": [
"9",
"9"
],
"machine_max_jerk_y": [
"9",
"9"
],
"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": "350",
"extruder_clearance_radius": "50",
"extruder_clearance_height_to_rod": "60",
"extruder_clearance_height_to_lid": "350",
"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"
],
"retract_restart_extra": [
"0"
],
"retract_restart_extra_toolchange": [
"0"
],
"retraction_speed": [
"30"
],
"deretraction_speed": [
"30"
],
"z_hop_types": "Normal Lift",
"silent_mode": "0",
"single_extruder_multi_material": "1",
"change_filament_gcode": "",
"machine_pause_gcode": "PAUSE\n",
"wipe": [
"1"
],
"default_filament_profile": [
"TwoTrees Generic PLA"
],
"bed_exclude_area": [
"0x0"
],
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\n",
"machine_end_gcode": "END_PRINT",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
"scan_first_layer": "0",
"nozzle_type": "undefine",
"auxiliary_fan": "0"
}

View File

@@ -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"
}
}

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "0.08mm Extra Fine @SK1",
"inherits": "fdm_process_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_common",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,11 +1,11 @@
{
"type": "process",
"setting_id": "GP001",
"name": "0.08mm Extra Fine @TwoTrees",
"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"
}
}

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "0.12mm Fine @SK1",
"inherits": "fdm_process_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_common",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,11 +1,11 @@
{
"type": "process",
"setting_id": "GP002",
"name": "0.12mm Fine @TwoTrees",
"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"
}
}

View File

@@ -1,11 +1,11 @@
{
"type": "process",
"setting_id": "GP003",
"name": "0.15mm Optimal @TwoTrees",
"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"
}
}

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "0.16mm Optimal @SK1",
"inherits": "fdm_process_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_common",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "0.20mm Quality @SK1",
"inherits": "fdm_process_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_common",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "0.20mm Standard @SK1",
"inherits": "fdm_process_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_common",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,11 +1,11 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.20mm Standard @TwoTrees",
"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"
}
}

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "0.24mm Draft @SK1",
"inherits": "fdm_process_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_common",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,12 +1,12 @@
{
"type": "process",
"setting_id": "GP005",
"name": "0.24mm Draft @TwoTrees",
"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"
}
}

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "0.24mm HSpeed @SK1",
"inherits": "fdm_process_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_common",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "0.28mm Extra Draft @SK1",
"inherits": "fdm_process_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_common",
"compatible_printers": [
"TwoTrees SK1 0.4 nozzle"
],

View File

@@ -1,12 +1,12 @@
{
"type": "process",
"setting_id": "GP006",
"name": "0.28mm Extra Draft @TwoTrees",
"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"
}
}

View File

@@ -1,9 +1,9 @@
{
"type": "process",
"name": "fdm_process_TwoTrees_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": [
"TwoTrees SP-5 0.4 nozzle"
"compatible_printers": [
"TwoTrees SP-5 0.4 nozzle"
]
}
}