GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-06-30 08:35:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix/improve Prusa XL & XL 5T profiles (#8833)

Browse Source 
* First set of fixes

* Add FLEX filament to PrintConfig.cpp

* Add new FLEX filament profiles to main Prusa json

* Comment out M104.1 code

* Revert "Comment out M104.1 code"

This reverts commit 831414adb75fa98b3d6aadda38a5936f04d6530c.
This commit is contained in:
cochcoder 2025-04-14 03:39:03 -04:00 committed by GitHub
parent 0e2582e0bb
commit b795708852
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 172 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/profiles/Prusa.json
View File

@ -893,6 +893,10 @@
"name": "fdm_filament_pa11cf",
"sub_path": "filament/fdm_filament_pa11cf.json"
},
{
"name": "fdm_filament_flex",
"sub_path": "filament/fdm_filament_flex.json"
},
{
"name": "Prusa Generic PLA",
"sub_path": "filament/Prusa Generic PLA.json"
@ -997,6 +1001,14 @@
"name": "Prusa Generic TPU @MINIIS",
"sub_path": "filament/Prusa Generic TPU @MINIIS.json"
},
{
"name": "Prusa Generic FLEX @XL",
"sub_path": "filament/Prusa Generic FLEX @XL.json"
},
{
"name": "Prusa Generic FLEX @XL 5T",
"sub_path": "filament/Prusa Generic FLEX @XL 5T.json"
},
{
"name": "Prusa Generic ASA",
"sub_path": "filament/Prusa Generic ASA.json"

18
resources/profiles/Prusa/Prusa XL.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

35
resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json Normal file
View File

@ -0,0 +1,35 @@
{
"type": "filament",
"setting_id": "GFSA04",
"name": "Prusa Generic FLEX @XL 5T",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_flex",
"filament_loading_speed_start": "3",
"filament_loading_speed": "28",
"filament_unloading_speed_start": "100",
"filament_unloading_speed": "90",
"filament_load_time": "0",
"filament_unload_time": "0",
"filament_cooling_moves": "4",
"filament_cooling_initial_speed": "2.2",
"filament_cooling_final_speed": "3.4",
"filament_retract_lift_below": "0.6",
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_volume": [
"40"
],
"filament_multitool_ramming_flow": [
"2.5"
],
"compatible_printers": [
"Prusa XL 5T 0.25 nozzle",
"Prusa XL 5T 0.3 nozzle",
"Prusa XL 5T 0.4 nozzle",
"Prusa XL 5T 0.5 nozzle",
"Prusa XL 5T 0.6 nozzle",
"Prusa XL 5T 0.8 nozzle"
]
}

35
resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json Normal file
View File

@ -0,0 +1,35 @@
{
"type": "filament",
"setting_id": "GFSA04",
"name": "Prusa Generic FLEX @XL",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_flex",
"filament_loading_speed_start": "3",
"filament_loading_speed": "28",
"filament_unloading_speed_start": "100",
"filament_unloading_speed": "90",
"filament_load_time": "0",
"filament_unload_time": "0",
"filament_cooling_moves": "4",
"filament_cooling_initial_speed": "2.2",
"filament_cooling_final_speed": "3.4",
"filament_retract_lift_below": "0.6",
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_volume": [
"40"
],
"filament_multitool_ramming_flow": [
"2.5"
],
"compatible_printers": [
"Prusa XL 0.25 nozzle",
"Prusa XL 0.3 nozzle",
"Prusa XL 0.4 nozzle",
"Prusa XL 0.5 nozzle",
"Prusa XL 0.6 nozzle",
"Prusa XL 0.8 nozzle"
]
}

76
resources/profiles/Prusa/filament/fdm_filament_flex.json Normal file
View File

@ -0,0 +1,76 @@
{
"type": "filament",
"name": "fdm_filament_flex",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_common",
"filament_id": "GFU99",
"hot_plate_temp_initial_layer" : [
"50"
],
"hot_plate_temp" : [
"50"
],
"fan_cooling_layer_time": [
"100"
],
"filament_max_volumetric_speed": [
"2.5"
],
"filament_type": [
"FLEX"
],
"filament_density": [
"1.22"
],
"filament_cost": [
"20"
],
"filament_retraction_length": [
"2.5"
],
"filament_retraction_speed": [
"60"
],
"filament_deretraction_speed": [
"20"
],
"filament_retraction_minimum_travel": [
"2"
],
"filament_wipe": "0",
"idle_temperature": "70",
"nozzle_temperature_initial_layer": [
"230"
],
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"30"
],
"overhang_fan_speed": [
"80"
],
"additional_cooling_fan_speed": [
"70"
],
"close_fan_the_first_x_layers": [
"3"
],
"nozzle_temperature": [
"230"
],
"filament_start_gcode": [
"M900 K0 ; Filament gcode\n\nM142 S36 ; set heatbreak target temp"
],
"filament_end_gcode": [
"; Filament-specific end gcode"
]
}

2
resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json
View File

@ -4,7 +4,7 @@
"name": "Prusa XL 0.3 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_machine_common",
"inherits": "fdm_machine_common_xl",
"gcode_flavor": "marlin2",
"printer_model": "Prusa XL",
"default_filament_profile": "Prusa Generic PLA @XL",

2
resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json
View File

@ -10,6 +10,8 @@
"default_filament_profile": "Prusa Generic PLA @XL 5T",
"default_print_profile": "0.15mm Speed @Prusa XL 5T 0.25",
"printer_variant": "0.25",
"max_layer_height": "0.15",
"min_layer_height": "0.05",
"nozzle_diameter": [
"0.25",
"0.25",

2
resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json
View File

@ -10,6 +10,8 @@
"default_filament_profile": "Prusa Generic PLA @XL 5T",
"default_print_profile": "0.20mm Speed @Prusa XL 5T 0.3",
"printer_variant": "0.3",
"max_layer_height": "0.22",
"min_layer_height": "0.05",
"nozzle_diameter": [
"0.3",
"0.3",

1
resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json
View File

@ -10,6 +10,7 @@
"default_filament_profile": "Prusa Generic PLA @XL 5T",
"default_print_profile": "0.25mm Speed @Prusa XL 5T 0.5",
"printer_variant": "0.5",
"max_layer_height": "0.32",
"nozzle_diameter": [
"0.5",
"0.5",

2
resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json
View File

@ -10,6 +10,8 @@
"default_filament_profile": "Prusa Generic PLA @XL 5T",
"default_print_profile": "0.32mm Speed @Prusa XL 5T 0.6",
"printer_variant": "0.6",
"max_layer_height": "0.4",
"min_layer_height": "0.15",
"nozzle_diameter": [
"0.6",
"0.6",

2
resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json
View File

@ -10,6 +10,8 @@
"default_filament_profile": "Prusa Generic PLA @XL 5T",
"default_print_profile": "0.40mm Quality @Prusa XL 5T 0.8",
"printer_variant": "0.8",
"max_layer_height": "0.6",
"min_layer_height": "0.2",
"nozzle_diameter": [
"0.8",
"0.8",

2
resources/profiles/Prusa/machine/Prusa XL 5T.json
View File

@ -8,5 +8,5 @@
"bed_model": "Prusa XL_bed.stl",
"bed_texture": "Prusa XL.svg",
"hotend_model": "",
"default_materials": "Prusa Generic PLA @XL 5T;Prusament PLA @XL 5T;Prusament rPLA @XL 5T;Prusa Generic PETG @XL 5T;Prusament PETG @XL 5T;Prusa Generic ABS @XL 5T;Prusament ASA @XL 5T;Prusament PC Blend @XL 5T;Prusament PC-CF @XL 5T;Prusament PVB @XL 5T;Prusament PA-CF @XL 5T"
"default_materials": "Prusa Generic PLA @XL 5T;Prusament PLA @XL 5T;Prusament rPLA @XL 5T;Prusa Generic PETG @XL 5T;Prusament PETG @XL 5T;Prusa Generic ABS @XL 5T;Prusament ASA @XL 5T;Prusament PC Blend @XL 5T;Prusament PC-CF @XL 5T;Prusament PVB @XL 5T;Prusament PA-CF @XL 5T;Prusa Generic FLEX @XL 5T"
}

2
resources/profiles/Prusa/machine/Prusa XL.json
View File

@ -8,5 +8,5 @@
"bed_model": "Prusa XL_bed.stl",
"bed_texture": "Prusa XL.svg",
"hotend_model": "",
"default_materials": "Prusa Generic PLA @XL;Prusament PLA @XL;Prusament rPLA @XL;Prusa Generic PETG @XL;Prusament PETG @XL;Prusa Generic ABS @XL;Prusament ASA @XL;Prusament PC Blend @XL;Prusament PC-CF @XL;Prusament PVB @XL;Prusament PA-CF @XL"
"default_materials": "Prusa Generic PLA @XL;Prusament PLA @XL;Prusament rPLA @XL;Prusa Generic PETG @XL;Prusament PETG @XL;Prusa Generic ABS @XL;Prusament ASA @XL;Prusament PC Blend @XL;Prusament PC-CF @XL;Prusament PVB @XL;Prusament PA-CF @XL;Prusa Generic FLEX @XL"
}

1
src/libslic3r/PrintConfig.cpp
View File

@ -2223,6 +2223,7 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("BVOH");
def->enum_values.push_back("PCTG");
def->enum_values.push_back("EVA");
def->enum_values.push_back("FLEX");
def->enum_values.push_back("HIPS");
def->enum_values.push_back("PA");
def->enum_values.push_back("PA-CF");