juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM002",
"name": "MyKlipper 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"from": "system",
"setting_id": "GM002",
"instantiation": "true",
"printer_model": "Generic Klipper Printer",
"nozzle_diameter": [
"0.2"

6
resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "MyKlipper 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"from": "system",
"setting_id": "GM001",
"instantiation": "true",
"printer_model": "Generic Klipper Printer",
"nozzle_diameter": [
"0.4"

6
resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "MyKlipper 0.6 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"from": "system",
"setting_id": "GM003",
"instantiation": "true",
"printer_model": "Generic Klipper Printer",
"nozzle_diameter": [
"0.6"

6
resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM004",
"name": "MyKlipper 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"from": "system",
"setting_id": "GM004",
"instantiation": "true",
"printer_model": "Generic Klipper Printer",
"nozzle_diameter": [
"0.8"

2
resources/profiles/Custom/machine/MyKlipper.json
View File

@@ -9,4 +9,4 @@
"bed_texture": "orcaslicer_bed_texture.svg",
"hotend_model": "",
"default_materials": "Generic ABS @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"
}
}

7
resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "MyMarlin 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_machine_common",
"from": "system",
"setting_id": "GM001",
"instantiation": "true",
"printer_model": "Generic Marlin Printer",
"gcode_flavor": "marlin",
"machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-34.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y105 F3000 ; park print head\nM84 ; disable motors",
@@ -24,7 +24,6 @@
"deretraction_speed": [
"35"
],
"version": "1.5.1.2",
"wipe": [
"0"
],

2
resources/profiles/Custom/machine/MyMarlin.json
View File

@@ -9,4 +9,4 @@
"bed_texture": "orcaslicer_bed_texture.svg",
"hotend_model": "",
"default_materials": "Generic ABS @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"
}
}

36
resources/profiles/Custom/machine/MyRRF 0.4 nozzle.json
View File

@@ -1,19 +1,19 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "MyRRF 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_rrf_common",
"printer_model": "Generic RRF Printer",
"nozzle_diameter": [
"0.4"
],
"printable_area": [
"0x0",
"250x0",
"250x250",
"0x250"
],
"printable_height": "250"
}
"type": "machine",
"name": "MyRRF 0.4 nozzle",
"inherits": "fdm_rrf_common",
"from": "system",
"setting_id": "GM003",
"instantiation": "true",
"printer_model": "Generic RRF Printer",
"nozzle_diameter": [
"0.4"
],
"printable_area": [
"0x0",
"250x0",
"250x250",
"0x250"
],
"printable_height": "250"
}

6
resources/profiles/Custom/machine/MyToolChanger 0.2 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM_CUSTOM_001",
"name": "MyToolChanger 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_toolchanger_common",
"from": "system",
"setting_id": "GM_CUSTOM_001",
"instantiation": "true",
"printer_model": "Generic ToolChanger Printer",
"nozzle_diameter": [
"0.2",

6
resources/profiles/Custom/machine/MyToolChanger 0.4 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM_CUSTOM_002",
"name": "MyToolChanger 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_toolchanger_common",
"from": "system",
"setting_id": "GM_CUSTOM_002",
"instantiation": "true",
"printer_model": "Generic ToolChanger Printer",
"nozzle_diameter": [
"0.4",

6
resources/profiles/Custom/machine/MyToolChanger 0.6 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM_CUSTOM_003",
"name": "MyToolChanger 0.6 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_toolchanger_common",
"from": "system",
"setting_id": "GM_CUSTOM_003",
"instantiation": "true",
"printer_model": "Generic ToolChanger Printer",
"nozzle_diameter": [
"0.6",

6
resources/profiles/Custom/machine/MyToolChanger 0.8 nozzle.json
View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"setting_id": "GM_CUSTOM_004",
"name": "MyToolChanger 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_toolchanger_common",
"from": "system",
"setting_id": "GM_CUSTOM_004",
"instantiation": "true",
"printer_model": "Generic ToolChanger Printer",
"nozzle_diameter": [
"0.8",

2
resources/profiles/Custom/machine/MyToolChanger.json
View File

@@ -9,4 +9,4 @@
"bed_texture": "orcaslicer_bed_texture.svg",
"hotend_model": "",
"default_materials": "Generic PLA @MyToolChanger;Generic ABS @MyToolChanger;Generic PLA-CF @MyToolChanger;Generic PETG @MyToolChanger;Generic TPU @MyToolChanger;Generic ASA @MyToolChanger;Generic PC @MyToolChanger;Generic PVA @MyToolChanger;Generic PA @MyToolChanger;Generic PA-CF @MyToolChanger"
}
}

199
resources/profiles/Custom/machine/fdm_klipper_common.json
View File

@@ -1,60 +1,141 @@
{
"type": "machine",
"name": "fdm_klipper_common",
"from": "system",
"instantiation": "false",
"inherits": "fdm_machine_common",
"gcode_flavor": "klipper",
"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": ["20000", "20000"],
"machine_max_acceleration_y": ["20000", "20000"],
"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": "250",
"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": ["30"],
"deretraction_speed": ["30"],
"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 @MyKlipper",
"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_klipper_common",
"inherits": "fdm_machine_common",
"from": "system",
"instantiation": "false",
"gcode_flavor": "klipper",
"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": [
"20000",
"20000"
],
"machine_max_acceleration_y": [
"20000",
"20000"
],
"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": "250",
"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": [
"30"
],
"deretraction_speed": [
"30"
],
"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 @MyKlipper",
"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"
}

2
resources/profiles/Custom/machine/fdm_machine_common.json
View File

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

2
resources/profiles/Custom/machine/fdm_rrf_common.json
View File

@@ -1,9 +1,9 @@
{
"type": "machine",
"name": "fdm_rrf_common",
"inherits": "fdm_machine_common",
"from": "system",
"instantiation": "false",
"inherits": "fdm_machine_common",
"gcode_flavor": "reprapfirmware",
"machine_max_acceleration_e": [
"5000",

7
resources/profiles/Custom/machine/fdm_toolchanger_common.json
View File

File diff suppressed because one or more lines are too long