Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Prusa XL Input Shaper (only one head will print) & add PC-CF, PA11-CF, & PVB filament types #5511

Merged
merged 65 commits into from
Jun 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
b5c0021
Add Prusa XL & speed profile
cochcoder May 30, 2024
f6e2ee6
Merge branch 'main' into prusa-xl
cochcoder May 30, 2024
afdc04a
Wrong name
cochcoder May 30, 2024
1595434
Fix cover image sizing
cochcoder May 31, 2024
90ca5ef
Change infill pattern & density to whats in PrusaSlicer
cochcoder May 31, 2024
5aeb61b
Fix filament start G-Code & Add additional info in printer notes
cochcoder May 31, 2024
838b674
Add PETG profile
cochcoder Jun 1, 2024
3796930
Link PETG profile
cochcoder Jun 1, 2024
827d384
Add ABS & add bed temps
cochcoder Jun 1, 2024
d852b3f
Add Prusament PLA & attempt at removing ramming limits
cochcoder Jun 1, 2024
b86f9a8
Allow user to change ramming time & volume
cochcoder Jun 1, 2024
b4afd35
Revert changing identifier
cochcoder Jun 2, 2024
7ad4b0b
Remove invalid ramming variables
cochcoder Jun 2, 2024
5b2151a
Add Prusament PETG
cochcoder Jun 2, 2024
ddecbf6
Merge branch 'main' into prusa-xl
cochcoder Jun 2, 2024
c622895
Try this
cochcoder Jun 2, 2024
2e8c45e
Revert "Try this"
cochcoder Jun 3, 2024
f23d9a9
Revert ramming changes
cochcoder Jun 3, 2024
d1ef07e
Add rPLA, PLA+, PC-CF, PA11-CF, and PVB
cochcoder Jun 3, 2024
7efe8e9
Add PVB profile and other minor improvements
cochcoder Jun 3, 2024
0dfbc39
Merge branch 'main' into prusa-xl
cochcoder Jun 3, 2024
773e3b6
Add image formats
cochcoder Jun 3, 2024
53be360
Add rPLA profile & remove rPLA & PLA+ from printConfig
cochcoder Jun 3, 2024
0eb6d09
Add Prusament PC-CF & small bug fixes
cochcoder Jun 3, 2024
fbc29d0
Add Prusament ASA, PA-CF, PC, & pa11cf common file
cochcoder Jun 3, 2024
6e5ffcd
Minor improvements to common and speed profiles
cochcoder Jun 3, 2024
cd01849
Add 0.20mm Quality profile
cochcoder Jun 3, 2024
f728e89
Add .3mm Draft process & link .2mm Quality
cochcoder Jun 3, 2024
796cbbc
Add 0.15mm Quality process
cochcoder Jun 3, 2024
9d6dc00
Add 0.10mm Detail process
cochcoder Jun 3, 2024
0dd678c
Add 0.07mm UltraDetail profile
cochcoder Jun 3, 2024
615e847
Add 0.5mm nozzle size & related processes
cochcoder Jun 3, 2024
cf2f601
Set default print profile
cochcoder Jun 3, 2024
86fb993
Fix incorrect bridge flow ratio
cochcoder Jun 4, 2024
3b53ab2
Fix incorrect support z distance
cochcoder Jun 4, 2024
1cf1a59
Correct skirt values if enabled
cochcoder Jun 4, 2024
4c3d6a3
Merge branch 'main' into prusa-xl
cochcoder Jun 4, 2024
90792ad
Add 0.6 & 0.8 nozzles & respective profiles as well as some fixes
cochcoder Jun 4, 2024
f1bae45
Set default profile for 0.8
cochcoder Jun 4, 2024
d05f605
Add 0.25, 0.3, & respective profiles
cochcoder Jun 4, 2024
ba61f61
Merge branch 'main' into prusa-xl
cochcoder Jun 6, 2024
6b4752a
Adapt filename format
cochcoder Jun 6, 2024
b4d221e
Remove unneeded values
cochcoder Jun 6, 2024
4cf467b
Add Input Shaper
cochcoder Jun 6, 2024
95ed7ad
Fix raft contact distance
cochcoder Jun 6, 2024
fc2bff5
Add Input Shaper profiles to filaments
cochcoder Jun 7, 2024
2675501
List default profiles
cochcoder Jun 7, 2024
de1dd3b
Add printer variant variable
cochcoder Jun 7, 2024
980ffc0
Change cover sizes & optimize svg
cochcoder Jun 7, 2024
27f3bb0
Fix small filament bug
cochcoder Jun 7, 2024
553b486
Add comment for symmetry
cochcoder Jun 7, 2024
90e7777
Merge branch 'main' into prusa-xl
cochcoder Jun 7, 2024
37ea168
Add Prusa before XL & XLIS
cochcoder Jun 7, 2024
16475d7
Fix failing check
cochcoder Jun 7, 2024
b645aad
Fix failing check part 2
cochcoder Jun 7, 2024
90cd701
Some small changes
cochcoder Jun 7, 2024
d85b6dc
I've been overthinking this haven't I?
cochcoder Jun 7, 2024
34ad719
Could it be this?
cochcoder Jun 7, 2024
e4ad121
Revert this change
cochcoder Jun 7, 2024
0ccfd23
Try one last thing
cochcoder Jun 7, 2024
119376f
Change naming for XLIS & covers
cochcoder Jun 7, 2024
3a3a560
Try removing non-IS profiles
cochcoder Jun 7, 2024
287abfa
Change IS models
cochcoder Jun 7, 2024
94e96d6
Remove remnants of non-IS profiles
cochcoder Jun 7, 2024
40387ee
Change naming for better consistency
cochcoder Jun 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
245 changes: 216 additions & 29 deletions resources/profiles/Prusa.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions resources/profiles/Prusa/Pursa XL Input Shaper.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"type": "filament",
"filament_id": "GFB99_1",
"setting_id": "GFSA04",
"name": "Prusa Generic ABS @XL",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_abs",
"nozzle_temperature_intial_layer": "255",
"nozzle_temperature": "255",
"hot_plate_temp_initial_layer": "100",
"hot_plate_temp": "105",
"slow_down_min_speed": "15",
"filament_flow_ratio": [
"1"
],
"filament_max_volumetric_speed": [
"12"
],
"slow_down_layer_time": [
"20"
],
"fan_max_speed": [
"15"
],
"fan_min_speed": [
"15"
],
"overhang_fan_speed": [
"25"
],
"close_fan_the_first_x_layers": [
"4"
],
"filament_loading_speed_start": "19",
"filament_loading_speed": "14",
"filament_unloading_speed_start": "100",
"filament_unloading_speed": "20",
"filament_load_time": "15",
"filament_unload_time": "12",
"filament_cooling_moves": "5",
"filament_cooling_initial_speed": "10",
"filament_cooling_final_speed": "50",
"filament_retract_lift_below": "1.5",
"filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.04{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp",
"compatible_printers": [
"Prusa XLIS 0.25 nozzle",
"Pursa XLIS 0.3 nozzle",
"Prusa XLIS 0.4 nozzle",
"Prusa XLIS 0.5 nozzle",
"Prusa XLIS 0.6 nozzle",
"Prusa XLIS 0.8 nozzle"
]
}
57 changes: 57 additions & 0 deletions resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"type": "filament",
"filament_id": "GFL99_1",
"setting_id": "GFSA04",
"name": "Prusa Generic PETG @XL",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"nozzle_temperature_intial_layer": "230",
"nozzle_temperature": "240",
"hot_plate_temp_initial_layer": "80",
"hot_plate_temp": "80",
"full_fan_speed_layer": "5",
"slow_down_min_speed": "15",
"filament_flow_ratio": [
"1"
],
"filament_max_volumetric_speed": [
"9"
],
"slow_down_layer_time": [
"9"
],
"fan_max_speed": [
"50"
],
"fan_min_speed": [
"30"
],
"overhang_fan_speed": [
"50"
],
"close_fan_the_first_x_layers": [
"3"
],
"filament_loading_speed_start": "50",
"filament_loading_speed": "10",
"filament_unloading_speed_start": "100",
"filament_unloading_speed": "100",
"filament_load_time": "10.5",
"filament_unload_time": "8.5",
"filament_cooling_moves": "3",
"filament_cooling_initial_speed": "5",
"filament_cooling_final_speed": "2.5",
"filament_retract_lift_below": "1.5",
"filament_wipe": "1",
"filament_retract_before_wipe": "20%",
"filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.07{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.053{elsif nozzle_diameter[0]==0.5}0.042{elsif nozzle_diameter[0]==0.6}0.032{elsif nozzle_diameter[0]==0.8}0.018{elsif nozzle_diameter[0]==0.25}0.18{elsif nozzle_diameter[0]==0.3}0.1{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp",
"compatible_printers": [
"Prusa XLIS 0.25 nozzle",
"Pursa XLIS 0.3 nozzle",
"Prusa XLIS 0.4 nozzle",
"Prusa XLIS 0.5 nozzle",
"Prusa XLIS 0.6 nozzle",
"Prusa XLIS 0.8 nozzle"
]
}
52 changes: 52 additions & 0 deletions resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"type": "filament",
"filament_id": "GFL99_1",
"setting_id": "GFSA04",
"name": "Prusa Generic PLA @XL",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"nozzle_temperature_intial_layer": "215",
"nozzle_temperature": "210",
"hot_plate_temp_initial_layer": "60",
"hot_plate_temp": "60",
"full_fan_speed_layer": "3",
"slow_down_min_speed": "15",
"filament_flow_ratio": [
"1"
],
"filament_max_volumetric_speed": [
"15"
],
"slow_down_layer_time": [
"10"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"100"
],
"overhang_fan_speed": [
"100"
],
"filament_loading_speed_start": "50",
"filament_loading_speed": "10",
"filament_unloading_speed_start": "100",
"filament_unloading_speed": "100",
"filament_load_time": "10.5",
"filament_unload_time": "8.5",
"filament_cooling_moves": "2",
"filament_cooling_initial_speed": "10",
"filament_cooling_final_speed": "3.5",
"filament_retract_lift_below": "0.6",
"filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.025{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.014{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp",
"compatible_printers": [
"Prusa XLIS 0.25 nozzle",
"Pursa XLIS 0.3 nozzle",
"Prusa XLIS 0.4 nozzle",
"Prusa XLIS 0.5 nozzle",
"Prusa XLIS 0.6 nozzle",
"Prusa XLIS 0.8 nozzle"
]
}
56 changes: 56 additions & 0 deletions resources/profiles/Prusa/filament/Prusament ASA @XL.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"type": "filament",
"filament_id": "GFB98",
"setting_id": "GFSA04",
"name": "Prusament ASA @XL",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_asa",
"nozzle_temperature_intial_layer": "260",
"nozzle_temperature": "260",
"hot_plate_temp_initial_layer": "100",
"hot_plate_temp": "105",
"filament_flow_ratio": [
"1"
],
"fan_max_speed": [
"10"
],
"fan_min_speed": [
"10"
],
"overhang_fan_speed": [
"30"
],
"close_fan_the_first_x_layers": [
"4"
],
"slow_down_min_speed": [
"15"
],
"slow_down_layer_time": [
"15"
],
"filament_max_volumetric_speed": [
"12"
],
"filament_loading_speed_start": "19",
"filament_loading_speed": "14",
"filament_unloading_speed_start": "100",
"filament_unloading_speed": "20",
"filament_load_time": "15",
"filament_unload_time": "12",
"filament_cooling_moves": "5",
"filament_cooling_initial_speed": "10",
"filament_cooling_final_speed": "50",
"filament_retract_lift_below": "1.5",
"filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.04{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp",
"compatible_printers": [
"Prusa XLIS 0.25 nozzle",
"Pursa XLIS 0.3 nozzle",
"Prusa XLIS 0.4 nozzle",
"Prusa XLIS 0.5 nozzle",
"Prusa XLIS 0.6 nozzle",
"Prusa XLIS 0.8 nozzle"
]
}
56 changes: 56 additions & 0 deletions resources/profiles/Prusa/filament/Prusament PA-CF @XL.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"type": "filament",
"filament_id": "GFN98",
"setting_id": "GFSA04",
"name": "Prusament PA-CF @XL",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pa11cf",
"nozzle_temperature_intial_layer": "275",
"nozzle_temperature": "285",
"hot_plate_temp_initial_layer": "100",
"hot_plate_temp": "105",
"filament_flow_ratio": [
"1.05"
],
"fan_max_speed": [
"20"
],
"fan_min_speed": [
"20"
],
"overhang_fan_speed": [
"30"
],
"close_fan_the_first_x_layers": [
"4"
],
"slow_down_min_speed": [
"15"
],
"slow_down_layer_time": [
"20"
],
"filament_max_volumetric_speed": [
"6.5"
],
"filament_loading_speed_start": "19",
"filament_loading_speed": "14",
"filament_unloading_speed_start": "100",
"filament_unloading_speed": "20",
"filament_load_time": "15",
"filament_unload_time": "12",
"filament_cooling_moves": "5",
"filament_cooling_initial_speed": "10",
"filament_cooling_final_speed": "50",
"filament_retract_lift_below": "1.5",
"filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.07{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.6}0.025{elsif nozzle_diameter[0]==0.8}0.016{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.09{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S45 ; set heatbreak target temp",
"compatible_printers": [
"Prusa XLIS 0.25 nozzle",
"Pursa XLIS 0.3 nozzle",
"Prusa XLIS 0.4 nozzle",
"Prusa XLIS 0.5 nozzle",
"Prusa XLIS 0.6 nozzle",
"Prusa XLIS 0.8 nozzle"
]
}
56 changes: 56 additions & 0 deletions resources/profiles/Prusa/filament/Prusament PC Blend @XL.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"type": "filament",
"filament_id": "GFL99_1",
"setting_id": "GFSA04",
"name": "Prusament PC Blend @XL",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pc",
"nozzle_temperature_intial_layer": "275",
"nozzle_temperature": "275",
"hot_plate_temp_initial_layer": "100",
"hot_plate_temp": "105",
"filament_flow_ratio": [
"1"
],
"fan_max_speed": [
"10"
],
"fan_min_speed": [
"10"
],
"overhang_fan_speed": [
"30"
],
"close_fan_the_first_x_layers": [
"4"
],
"slow_down_min_speed": [
"15"
],
"slow_down_layer_time": [
"20"
],
"filament_max_volumetric_speed": [
"9"
],
"filament_loading_speed_start": "19",
"filament_loading_speed": "14",
"filament_unloading_speed_start": "100",
"filament_unloading_speed": "20",
"filament_load_time": "15",
"filament_unload_time": "12",
"filament_cooling_moves": "5",
"filament_cooling_initial_speed": "10",
"filament_cooling_final_speed": "50",
"filament_retract_lift_below": "1.5",
"filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.07{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.6}0.025{elsif nozzle_diameter[0]==0.8}0.016{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.09{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S45 ; set heatbreak target temp",
"compatible_printers": [
"Prusa XLIS 0.25 nozzle",
"Pursa XLIS 0.3 nozzle",
"Prusa XLIS 0.4 nozzle",
"Prusa XLIS 0.5 nozzle",
"Prusa XLIS 0.6 nozzle",
"Prusa XLIS 0.8 nozzle"
]
}
Loading
Loading