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/CoLiDo/machine/CoLiDo 160 V2 0.4 nozzle.json
View File

@@ -1,8 +1,8 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "CoLiDo 160 V2 0.4 nozzle",
"from": "system",
"setting_id": "GM001",
"instantiation": "true",
"printer_model": "CoLiDo 160 V2",
"adaptive_bed_mesh_margin": "0",
@@ -50,7 +50,6 @@
"head_wrap_detect_zone": [],
"high_current_on_filament_swap": "0",
"host_type": "mks",
"is_custom_defined": "0",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"long_retractions_when_cut": [
"0"
@@ -206,7 +205,6 @@
"upward_compatible_machine": [],
"use_firmware_retraction": "0",
"use_relative_e_distances": "1",
"version": "2.1.1.0",
"wipe": [
"0"
],
@@ -220,4 +218,4 @@
"Auto Lift"
],
"z_offset": "0"
}
}

2
resources/profiles/CoLiDo/machine/CoLiDo 160 V2.json
View File

@@ -9,4 +9,4 @@
"bed_texture": "",
"hotend_model": "",
"default_materials": "CoLiDo Generic PLA @CoLiDo X16;CoLiDo Generic ABS @CoLiDo X16;CoLiDo Generic PETG @CoLiDo X16;CoLiDo Generic TPU @CoLiDo X16"
}
}

6
resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0 0.4 nozzle.json
View File

@@ -1,8 +1,8 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "CoLiDo DIY 4.0 0.4 nozzle",
"from": "system",
"setting_id": "GM001",
"instantiation": "true",
"printer_model": "CoLiDo DIY 4.0",
"adaptive_bed_mesh_margin": "0",
@@ -50,7 +50,6 @@
"head_wrap_detect_zone": [],
"high_current_on_filament_swap": "0",
"host_type": "octoprint",
"is_custom_defined": "0",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\n",
"long_retractions_when_cut": [
"0"
@@ -217,7 +216,6 @@
"upward_compatible_machine": [],
"use_firmware_retraction": "0",
"use_relative_e_distances": "1",
"version": "2.1.1.0",
"wipe": [
"1"
],
@@ -231,4 +229,4 @@
"Auto Lift"
],
"z_offset": "0"
}
}

8
resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0 V2 0.4 nozzle.json
View File

@@ -1,8 +1,9 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "CoLiDo DIY 4.0 V2 0.4 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"setting_id": "GM003",
"instantiation": "true",
"printer_model": "CoLiDo DIY 4.0 V2",
"default_filament_profile": [
@@ -17,8 +18,6 @@
"deretraction_speed": [
"50"
],
"inherits": "fdm_klipper_common",
"is_custom_defined": "0",
"print_host": "192.168.0.30",
"printer_variant": "0.4",
"printable_area": [
@@ -31,8 +30,7 @@
"retraction_length": [
"0.4"
],
"version": "2.1.1.0",
"z_hop_types": [
"Auto Lift"
]
}
}

2
resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0 V2.json
View File

@@ -9,4 +9,4 @@
"bed_texture": "",
"hotend_model": "",
"default_materials": "CoLiDo PLA+ @CoLiDo DIY 4.0 V2"
}
}

2
resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0.json
View File

@@ -9,4 +9,4 @@
"bed_texture": "",
"hotend_model": "",
"default_materials": "CoLiDo Generic PLA @CoLiDo DIY 4.0;CoLiDo Generic ABS @CoLiDo DIY 4.0;CoLiDo Generic PETG @CoLiDo DIY 4.0;CoLiDo Generic TPU @CoLiDo DIY 4.0"
}
}

8
resources/profiles/CoLiDo/machine/CoLiDo SR1 0.4 nozzle.json
View File

@@ -1,8 +1,9 @@
{
"type": "machine",
"setting_id": "GM002",
"name": "CoLiDo SR1 0.4 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"setting_id": "GM002",
"instantiation": "true",
"printer_model": "CoLiDo SR1",
"default_filament_profile": [
@@ -17,8 +18,6 @@
"deretraction_speed": [
"50"
],
"inherits": "fdm_klipper_common",
"is_custom_defined": "0",
"print_host": "192.168.1.224",
"printer_variant": "0.4",
"printable_area": [
@@ -31,8 +30,7 @@
"retraction_length": [
"0.4"
],
"version": "2.1.1.0",
"z_hop_types": [
"Auto Lift"
]
}
}

2
resources/profiles/CoLiDo/machine/CoLiDo SR1.json
View File

@@ -9,4 +9,4 @@
"bed_texture": "",
"hotend_model": "",
"default_materials": "CoLiDo PLA @CoLiDo SR1;CoLiDo ABS @CoLiDo SR1;CoLiDo PETG @CoLiDo SR1;CoLiDo PLA Silk @CoLiDo SR1"
}
}

6
resources/profiles/CoLiDo/machine/CoLiDo X16 0.4 nozzle.json
View File

@@ -1,8 +1,8 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "CoLiDo X16 0.4 nozzle",
"from": "system",
"setting_id": "GM001",
"instantiation": "true",
"printer_model": "CoLiDo X16",
"adaptive_bed_mesh_margin": "0",
@@ -50,7 +50,6 @@
"head_wrap_detect_zone": [],
"high_current_on_filament_swap": "0",
"host_type": "mks",
"is_custom_defined": "0",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"long_retractions_when_cut": [
"0"
@@ -206,7 +205,6 @@
"upward_compatible_machine": [],
"use_firmware_retraction": "0",
"use_relative_e_distances": "1",
"version": "2.1.1.0",
"wipe": [
"0"
],
@@ -220,4 +218,4 @@
"Auto Lift"
],
"z_offset": "0"
}
}

2
resources/profiles/CoLiDo/machine/CoLiDo X16.json
View File

@@ -9,4 +9,4 @@
"bed_texture": "",
"hotend_model": "",
"default_materials": "CoLiDo Generic PLA @CoLiDo X16;CoLiDo Generic ABS @CoLiDo X16;CoLiDo Generic PETG @CoLiDo X16;CoLiDo Generic TPU @CoLiDo X16"
}
}

199
resources/profiles/CoLiDo/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": ["My Generic ABS"],
"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": [
"My Generic ABS"
],
"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/CoLiDo/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"
}
}