Skip to content

Commit

Permalink
Add support for Prusa XL Input Shaper (only one head will print) & ad…
Browse files Browse the repository at this point in the history
…d PC-CF, PA11-CF, & PVB filament types (#5511)

* Add Prusa XL & speed profile

* Wrong name

* Fix cover image sizing

* Change infill pattern & density to whats in PrusaSlicer

* Fix filament start G-Code & Add additional info in printer notes

* Add PETG profile

* Link PETG profile

* Add ABS & add bed temps

* Add Prusament PLA & attempt at removing ramming limits

* Allow user to change ramming time & volume

* Revert changing identifier

* Remove invalid ramming variables

* Add Prusament PETG

* Try this

* Revert "Try this"

This reverts commit c622895.

* Revert ramming changes

* Add rPLA, PLA+, PC-CF, PA11-CF, and PVB

* Add PVB profile and other minor improvements

* Add image formats

* Add rPLA profile & remove rPLA & PLA+ from printConfig

* Add Prusament PC-CF & small bug fixes

* Add Prusament ASA, PA-CF, PC, & pa11cf common file

* Minor improvements to common and speed profiles

* Add 0.20mm Quality profile

* Add .3mm Draft process & link .2mm Quality

* Add 0.15mm Quality process

* Add 0.10mm Detail process

* Add 0.07mm UltraDetail profile

* Add 0.5mm nozzle size & related processes

* Set default print profile

* Fix incorrect bridge flow ratio

* Fix incorrect support z distance

* Correct skirt values if enabled

* Add 0.6 & 0.8 nozzles & respective profiles as well as some fixes

* Set default profile for 0.8

* Add 0.25, 0.3, & respective profiles

This also adds all the nozzle sizes to the filament profiles

* Adapt filename format

* Remove unneeded values

* Add Input Shaper

* Fix raft contact distance

* Add Input Shaper profiles to filaments

* List default profiles

* Add printer variant variable

* Change cover sizes & optimize svg

* Fix small filament bug

* Add comment for symmetry

* Add Prusa before XL & XLIS

* Fix failing check

* Fix failing check part 2

* Some small changes

* I've been overthinking this haven't I?

* Could it be this?

* Revert this change

* Try one last thing

* Change naming for XLIS & covers

* Try removing non-IS profiles

* Change IS models

* Remove remnants of non-IS profiles

* Change naming for better consistency
  • Loading branch information
cochcoder authored Jun 8, 2024
1 parent d49c891 commit 467691d
Show file tree
Hide file tree
Showing 61 changed files with 4,080 additions and 33 deletions.
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

0 comments on commit 467691d

Please sign in to comment.