diff --git a/README.md b/README.md index b0402a70068..97c6127e87f 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,78 @@ +# Bambu Studio - SoftFever A modified version of Bambu Studio. It has following changes: -- Support third-party machines: +- ## Support third-party printers: - Voron 2.4 - Voron Trident - Voron 0.1 - Prusa MK3S -- Export to to .gcode file. - -Video: https://youtu.be/zCc7mVwu2xQ +- ## Export to to .gcode file. + ![image](./SoftFever_doc/export_gcode.png) + +- ## Send gcode file to printer + 1. Setup connection + + 2. Send to print + +- ## Support single wall mode on first layer + ![image](./SoftFever_doc/single_wall_first_layer.png) +- ## Support Chamber temperature. This setting can be use in machine start G-Gcode + ![image](./SoftFever_doc/chamber_temperature.png) + +- ## Thumbview is supported + +Demo video: https://youtu.be/vSNE9iGj2II -![image](https://user-images.githubusercontent.com/103989404/179447873-b7b2a200-7a00-409d-b9d5-b0522f5f2ec8.png) -![image](https://user-images.githubusercontent.com/103989404/179447890-a124bd43-dab2-46b7-b0da-ef6c67783d9c.png) -![image](https://user-images.githubusercontent.com/103989404/179396355-fc07135a-fd08-430c-aa8d-dc1060ae94d1.png) -![image](https://user-images.githubusercontent.com/103989404/179447933-7752235a-a6eb-468c-a304-6eb0875c4c95.png) -![image](https://user-images.githubusercontent.com/103989404/179396363-d9868dfc-f8d5-4227-ad19-a439dfc31ce5.png) -![image](https://user-images.githubusercontent.com/103989404/179398283-f71ea1bd-18a8-4526-9678-a3c63bc36964.png) +# NOTE: +## - If you have troubles to run the build, you might need to install following runtimes: +- [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe) +- [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe) + +## - BambuStudio use G2/G3 commands by default. You need to turn on ARC support in your printer's firmware use with this slicer. +- For Voron and any Klipper based printers: +You can enable gcode_arcs(G2/G3) support by adding following section into you printer.cfg file: +``` +[gcode_arcs] +resolution: 0.1 + +[gcode_macro M205] +gcode: + {% set x_jerk = params.X|default(5)|float %} + {% set y_jerk = params.Y|default(5)|float %} + SET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY={x_jerk} + +``` + +It's also recommended to add followinging dummy macros to make Klipper happy +``` +# Make BambuStudio happy +[gcode_macro G17] +gcode: + +[gcode_macro M981] +gcode: + +[gcode_macro M1003] +gcode: +``` + +- For Prusa MK3S: +ARC movement are supported by default. + + +# Gallery +![image](./SoftFever_doc/printers1.png) +![image](./SoftFever_doc/printers2.png) +![image](./SoftFever_doc/printers3.png) +![image](./SoftFever_doc/printers4.png) +![image](./SoftFever_doc/voron.png) + + Image credits: - 1. Voron 2.4: vorondesign.com - 2. Voron bed texture: VoronUsers/bryansj + 1. Voron 2.4 and Trident: vorondesign.com 3. Voron 0.1: myself 4. Prusa MK3S: Prusa3d diff --git a/SoftFever_doc/chamber_temperature.png b/SoftFever_doc/chamber_temperature.png new file mode 100644 index 00000000000..c41932d0c8f Binary files /dev/null and b/SoftFever_doc/chamber_temperature.png differ diff --git a/SoftFever_doc/chamber_temperature_custom_gcode.png b/SoftFever_doc/chamber_temperature_custom_gcode.png new file mode 100644 index 00000000000..d6b1c39ee6e Binary files /dev/null and b/SoftFever_doc/chamber_temperature_custom_gcode.png differ diff --git a/SoftFever_doc/export_gcode.png b/SoftFever_doc/export_gcode.png new file mode 100644 index 00000000000..ac6f64fd7e4 Binary files /dev/null and b/SoftFever_doc/export_gcode.png differ diff --git a/SoftFever_doc/print_host.png b/SoftFever_doc/print_host.png new file mode 100644 index 00000000000..7c7bde717ed Binary files /dev/null and b/SoftFever_doc/print_host.png differ diff --git a/SoftFever_doc/printers1.png b/SoftFever_doc/printers1.png new file mode 100644 index 00000000000..3f9d99e194a Binary files /dev/null and b/SoftFever_doc/printers1.png differ diff --git a/SoftFever_doc/printers2.png b/SoftFever_doc/printers2.png new file mode 100644 index 00000000000..876efced92f Binary files /dev/null and b/SoftFever_doc/printers2.png differ diff --git a/SoftFever_doc/printers3.png b/SoftFever_doc/printers3.png new file mode 100644 index 00000000000..0ab6eaf4794 Binary files /dev/null and b/SoftFever_doc/printers3.png differ diff --git a/SoftFever_doc/printers4.png b/SoftFever_doc/printers4.png new file mode 100644 index 00000000000..b431e3bf126 Binary files /dev/null and b/SoftFever_doc/printers4.png differ diff --git a/SoftFever_doc/send_to_print.png b/SoftFever_doc/send_to_print.png new file mode 100644 index 00000000000..68144974c60 Binary files /dev/null and b/SoftFever_doc/send_to_print.png differ diff --git a/SoftFever_doc/single_wall_first_layer.png b/SoftFever_doc/single_wall_first_layer.png new file mode 100644 index 00000000000..1ae304e24cc Binary files /dev/null and b/SoftFever_doc/single_wall_first_layer.png differ diff --git a/SoftFever_doc/voron.png b/SoftFever_doc/voron.png new file mode 100644 index 00000000000..e1fbc688774 Binary files /dev/null and b/SoftFever_doc/voron.png differ diff --git a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po index de8200ad3a1..5767801a214 100644 --- a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po +++ b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po @@ -4660,14 +4660,22 @@ msgid "" "material for bridge, to improve sag" msgstr "稍微减小这个数值（比如0.9）可以减小桥接的材料量，来改善下垂。" -msgid "Only one wall on top surfaces" -msgstr "顶面单层墙" +msgid "Only one wall on first layer" +msgstr "首层单层墙" msgid "" "Use only one wall on flat top surface, to give more space to the top infill " "pattern" msgstr "顶面只使用单层墙，从而更多的空间能够使用顶部填充图案" +msgid "Only one wall on top surfaces" +msgstr "顶面单层墙" + +msgid "" +"Use only one wall on first layer, to give more space to the bottom infill pattern " +"pattern" +msgstr "首层只使用单层墙，从而更多的空间能够使用底部填充图案" + msgid "Slow down for overhang" msgstr "悬垂降速" @@ -5866,6 +5874,9 @@ msgstr "除首层外的其它层的喷嘴温度" msgid "Nozzle temperature" msgstr "喷嘴温度" +msgid "Chamber temperature" +msgstr "机箱温度" + msgid "Bed temperature difference" msgstr "热床温差" diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 26d8eef7593..a826d16e80b 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -12,30 +12,6 @@ { "name": "Bambu Lab X1", "sub_path": "machine/Bambu Lab X1.json" - }, - { - "name": "Voron 2.4 250", - "sub_path": "machine/Voron 2.4 250.json" - }, - { - "name": "Voron 2.4 300", - "sub_path": "machine/Voron 2.4 300.json" - }, - { - "name": "Voron 2.4 350", - "sub_path": "machine/Voron 2.4 350.json" - }, - { - "name": "Voron 0.1", - "sub_path": "machine/Voron 0.1.json" - }, - { - "name": "Prusa MK3S", - "sub_path": "machine/Prusa MK3S.json" - }, - { - "name": "Anycubic 4Max Pro", - "sub_path": "machine/Anycubic 4Max Pro.json" } ], "process_list": [ @@ -118,42 +94,6 @@ { "name": "0.40mm Standard @BBL X1C 0.8 nozzle", "sub_path": "process/0.40mm Standard @BBL X1C 0.8 nozzle.json" - }, - { - "name": "fdm_process_voron_common", - "sub_path": "process/fdm_process_voron_common.json" - }, - { - "name": "0.08mm Extra Fine @Voron", - "sub_path": "process/0.08mm Extra Fine @Voron.json" - }, - { - "name": "0.12mm Fine @Voron", - "sub_path": "process/0.12mm Fine @Voron.json" - }, - { - "name": "0.15mm Optimal @Voron", - "sub_path": "process/0.15mm Optimal @Voron.json" - }, - { - "name": "0.20mm Standard @Voron", - "sub_path": "process/0.20mm Standard @Voron.json" - }, - { - "name": "0.24mm Draft @Voron", - "sub_path": "process/0.24mm Draft @Voron.json" - }, - { - "name": "0.28mm Extra Draft @Voron", - "sub_path": "process/0.28mm Extra Draft @Voron.json" - }, - { - "name": "0.20mm Standard @MK3S", - "sub_path": "process/0.20mm Standard @MK3S.json" - }, - { - "name": "0.20mm Standard @A4MaxPro", - "sub_path": "process/0.20mm Standard @A4MaxPro.json" } ], "filament_list": [ @@ -406,34 +346,6 @@ { "name": "Bambu Lab X1 Carbon 0.8 nozzle", "sub_path": "machine/Bambu Lab X1 Carbon 0.8 nozzle.json" - }, - { - "name": "fdm_klipper_common", - "sub_path": "machine/fdm_klipper_common.json" - }, - { - "name": "Voron 2.4 250 0.4 nozzle", - "sub_path": "machine/Voron 2.4 250 0.4 nozzle.json" - }, - { - "name": "Voron 2.4 300 0.4 nozzle", - "sub_path": "machine/Voron 2.4 300 0.4 nozzle.json" - }, - { - "name": "Voron 2.4 350 0.4 nozzle", - "sub_path": "machine/Voron 2.4 350 0.4 nozzle.json" - }, - { - "name": "Voron 0.1 0.4 nozzle", - "sub_path": "machine/Voron 0.1 0.4 nozzle.json" - }, - { - "name": "Prusa MK3S 0.4 nozzle", - "sub_path": "machine/Prusa MK3S 0.4 nozzle.json" - }, - { - "name": "Anycubic 4Max Pro 0.4 nozzle", - "sub_path": "machine/Anycubic 4Max Pro 0.4 nozzle.json" } ] } diff --git a/resources/profiles/BBL/filament/Bambu ABS @BBL X1C.json b/resources/profiles/BBL/filament/Bambu ABS @BBL X1C.json index ff98d17e45a..e1fc9845e5e 100644 --- a/resources/profiles/BBL/filament/Bambu ABS @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu ABS @BBL X1C.json @@ -10,12 +10,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle", "Bambu Lab X1 Carbon 0.6 nozzle" ] diff --git a/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json index ded53ea25c4..b5e5767a53a 100644 --- a/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json @@ -9,9 +9,6 @@ "8" ], "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu PC @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PC @BBL X1C.json index 3091d2f718b..6daa0d99543 100644 --- a/resources/profiles/BBL/filament/Bambu PC @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PC @BBL X1C.json @@ -7,12 +7,6 @@ "inherits": "Bambu PC @base", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle", "Bambu Lab X1 Carbon 0.6 nozzle" ] diff --git a/resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json index e476cafe432..cee8aaa10df 100644 --- a/resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json @@ -22,12 +22,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu PLA Basic @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PLA Basic @BBL X1C.json index 5f43d9b5b59..1e323ba2e49 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Basic @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PLA Basic @BBL X1C.json @@ -10,12 +10,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 Carbon 0.6 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu PLA Impact @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PLA Impact @BBL X1C.json index 5f392cd5d82..fe317c0bad1 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Impact @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PLA Impact @BBL X1C.json @@ -10,12 +10,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu PLA Matte @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PLA Matte @BBL X1C.json index d5ee8a8af00..5c560c33807 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Matte @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PLA Matte @BBL X1C.json @@ -10,12 +10,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 Carbon 0.6 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu PLA Metal @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PLA Metal @BBL X1C.json index 26eb46e2a09..186b47e7ab8 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Metal @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PLA Metal @BBL X1C.json @@ -10,12 +10,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json b/resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json index 2f34ac8816e..36eddbed402 100644 --- a/resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json @@ -6,9 +6,6 @@ "instantiation": "true", "inherits": "Bambu Support G @base", "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json b/resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json index 7953eb2a1f7..82bd6d15da0 100644 --- a/resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json @@ -6,9 +6,6 @@ "instantiation": "true", "inherits": "Bambu Support W @base", "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json b/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json index 5660907e342..35c33226052 100644 --- a/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json @@ -10,9 +10,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", "Bambu Lab X1 Carbon 0.6 nozzle", "Bambu Lab X1 Carbon 0.8 nozzle" ] diff --git a/resources/profiles/BBL/filament/Generic ABS.json b/resources/profiles/BBL/filament/Generic ABS.json index de69fc305c9..9df6f94e65b 100644 --- a/resources/profiles/BBL/filament/Generic ABS.json +++ b/resources/profiles/BBL/filament/Generic ABS.json @@ -14,12 +14,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic ASA.json b/resources/profiles/BBL/filament/Generic ASA.json index edb4e58666e..0459e85ad40 100644 --- a/resources/profiles/BBL/filament/Generic ASA.json +++ b/resources/profiles/BBL/filament/Generic ASA.json @@ -14,12 +14,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic PA-CF.json b/resources/profiles/BBL/filament/Generic PA-CF.json index 86383ed2d5d..e99b4ce59db 100644 --- a/resources/profiles/BBL/filament/Generic PA-CF.json +++ b/resources/profiles/BBL/filament/Generic PA-CF.json @@ -19,9 +19,6 @@ "8" ], "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic PA.json b/resources/profiles/BBL/filament/Generic PA.json index 43be83d5e48..401f1278a1f 100644 --- a/resources/profiles/BBL/filament/Generic PA.json +++ b/resources/profiles/BBL/filament/Generic PA.json @@ -16,9 +16,6 @@ "16" ], "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic PC.json b/resources/profiles/BBL/filament/Generic PC.json index f457c5b6239..70bd718c243 100644 --- a/resources/profiles/BBL/filament/Generic PC.json +++ b/resources/profiles/BBL/filament/Generic PC.json @@ -13,9 +13,6 @@ "0.94" ], "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic PETG.json b/resources/profiles/BBL/filament/Generic PETG.json index d337efdd9c1..6bc8c202593 100644 --- a/resources/profiles/BBL/filament/Generic PETG.json +++ b/resources/profiles/BBL/filament/Generic PETG.json @@ -44,12 +44,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic PLA-CF.json b/resources/profiles/BBL/filament/Generic PLA-CF.json index 95e603370ea..c1ae7e46585 100644 --- a/resources/profiles/BBL/filament/Generic PLA-CF.json +++ b/resources/profiles/BBL/filament/Generic PLA-CF.json @@ -19,9 +19,6 @@ "7" ], "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic PLA.json b/resources/profiles/BBL/filament/Generic PLA.json index e7ec4a8a935..cf52396cf4c 100644 --- a/resources/profiles/BBL/filament/Generic PLA.json +++ b/resources/profiles/BBL/filament/Generic PLA.json @@ -17,12 +17,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic PVA.json b/resources/profiles/BBL/filament/Generic PVA.json index b45a1f9522e..f592862e7ca 100644 --- a/resources/profiles/BBL/filament/Generic PVA.json +++ b/resources/profiles/BBL/filament/Generic PVA.json @@ -20,12 +20,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Generic TPU.json b/resources/profiles/BBL/filament/Generic TPU.json index 145bea7eb00..17e393dad96 100644 --- a/resources/profiles/BBL/filament/Generic TPU.json +++ b/resources/profiles/BBL/filament/Generic TPU.json @@ -11,12 +11,6 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle", - "Prusa MK3S 0.4 nozzle", - "Anycubic 4Max Pro 0.4 nozzle", "Bambu Lab X1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json b/resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json index d77c1bf262c..292239380f3 100644 --- a/resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json +++ b/resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json @@ -9,9 +9,6 @@ "15" ], "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json b/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json index 6e15cba1856..365b8826310 100644 --- a/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json +++ b/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json @@ -9,9 +9,6 @@ "22" ], "compatible_printers": [ - "Bambu Lab X1 Carbon 0.4 nozzle", - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Bambu Lab X1 Carbon 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json b/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json deleted file mode 100644 index 22571a0fb42..00000000000 --- a/resources/profiles/BBL/machine/Anycubic 4Max Pro 0.4 nozzle.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM003", - "name": "Anycubic 4Max Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Anycubic 4Max Pro", - "printable_area": [ - "0x0", - "270x0", - "270x205", - "0x205" - ], - "printable_height": "200" - } - \ No newline at end of file diff --git a/resources/profiles/BBL/machine/Anycubic 4Max Pro.json b/resources/profiles/BBL/machine/Anycubic 4Max Pro.json deleted file mode 100644 index 73bcbf7e4ec..00000000000 --- a/resources/profiles/BBL/machine/Anycubic 4Max Pro.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "machine_model", - "name": "Anycubic 4Max Pro", - "model_id": "BL-P002", - "url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1.json", - "nozzle_diameter": "0.4", - "machine_tech": "FFF", - "family": "BBL-3DP", - "bed_model": "", - "bed_texture": "", - "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Generic PLA;Bambu PLA Matte @BBL X1;Bambu PLA Basic @BBL X1;Bambu ABS @BBL X1C;Bambu PC @BBL X1C;Bambu Support W @BBL X1;Bambu TPU 95A @BBL X1;PolyTerra PLA @BBL X1;PolyLite PLA @BBL X1;" -} diff --git a/resources/profiles/BBL/machine/Prusa MK3S.json b/resources/profiles/BBL/machine/Prusa MK3S.json deleted file mode 100644 index 0198638770d..00000000000 --- a/resources/profiles/BBL/machine/Prusa MK3S.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "machine_model", - "name": "Prusa MK3S", - "model_id": "BL-P002", - "url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1.json", - "nozzle_diameter": "0.4", - "machine_tech": "FFF", - "family": "BBL-3DP", - "bed_model": "mk3_bed.stl", - "bed_texture": "mk3.svg", - "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Generic PLA;Bambu PLA Matte @BBL X1;Bambu PLA Basic @BBL X1;Bambu ABS @BBL X1C;Bambu PC @BBL X1C;Bambu Support W @BBL X1;Bambu TPU 95A @BBL X1;PolyTerra PLA @BBL X1;PolyLite PLA @BBL X1;" -} diff --git a/resources/profiles/BBL/machine/Voron 0.1 0.4 nozzle.json b/resources/profiles/BBL/machine/Voron 0.1 0.4 nozzle.json deleted file mode 100644 index 031c9248ae1..00000000000 --- a/resources/profiles/BBL/machine/Voron 0.1 0.4 nozzle.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM003", - "name": "Voron 0.1 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", - "printer_model": "Voron 0.1", - "default_filament_profile": [ - "Bambu PLA Basic @BBL X1" - ], - "default_print_profile": "0.20mm Standard @Voron", - "nozzle_diameter": [ - "0.4" - ], - "bed_exclude_area": [ - "0x0" - ], - "printable_area": [ - "0x0", - "120x0", - "120x120", - "0x120" - ], - "printable_height": "120", - "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "PRINT_END", - "scan_first_layer": "0", - "machine_load_filament_time": "17", - "machine_unload_filament_time": "16", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" -} diff --git a/resources/profiles/BBL/machine/Voron 0.1.json b/resources/profiles/BBL/machine/Voron 0.1.json deleted file mode 100644 index b0aec827283..00000000000 --- a/resources/profiles/BBL/machine/Voron 0.1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "machine_model", - "name": "Voron 2.4 250", - "model_id": "BL-P002", - "url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1.json", - "nozzle_diameter": "0.4", - "machine_tech": "FFF", - "family": "BBL-3DP", - "bed_model": "", - "bed_texture": "voron_textured.png", - "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Generic PLA;Bambu PLA Matte @BBL X1;Bambu PLA Basic @BBL X1;Bambu ABS @BBL X1C;Bambu PC @BBL X1C;Bambu Support W @BBL X1;Bambu TPU 95A @BBL X1;PolyTerra PLA @BBL X1;PolyLite PLA @BBL X1;" -} diff --git a/resources/profiles/BBL/machine/Voron 2.4 250.json b/resources/profiles/BBL/machine/Voron 2.4 250.json deleted file mode 100644 index b0aec827283..00000000000 --- a/resources/profiles/BBL/machine/Voron 2.4 250.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "machine_model", - "name": "Voron 2.4 250", - "model_id": "BL-P002", - "url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1.json", - "nozzle_diameter": "0.4", - "machine_tech": "FFF", - "family": "BBL-3DP", - "bed_model": "", - "bed_texture": "voron_textured.png", - "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Generic PLA;Bambu PLA Matte @BBL X1;Bambu PLA Basic @BBL X1;Bambu ABS @BBL X1C;Bambu PC @BBL X1C;Bambu Support W @BBL X1;Bambu TPU 95A @BBL X1;PolyTerra PLA @BBL X1;PolyLite PLA @BBL X1;" -} diff --git a/resources/profiles/BBL/machine/Voron 2.4 300.json b/resources/profiles/BBL/machine/Voron 2.4 300.json deleted file mode 100644 index baa175853bd..00000000000 --- a/resources/profiles/BBL/machine/Voron 2.4 300.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "machine_model", - "name": "Voron 2.4 300", - "model_id": "BL-P002", - "url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1.json", - "nozzle_diameter": "0.4", - "machine_tech": "FFF", - "family": "BBL-3DP", - "bed_model": "", - "bed_texture": "voron_textured.png", - "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Generic PLA;Bambu PLA Matte @BBL X1;Bambu PLA Basic @BBL X1;Bambu ABS @BBL X1C;Bambu PC @BBL X1C;Bambu Support W @BBL X1;Bambu TPU 95A @BBL X1;PolyTerra PLA @BBL X1;PolyLite PLA @BBL X1;" -} diff --git a/resources/profiles/BBL/machine/Voron 2.4 350.json b/resources/profiles/BBL/machine/Voron 2.4 350.json deleted file mode 100644 index 1c8a1b46f1e..00000000000 --- a/resources/profiles/BBL/machine/Voron 2.4 350.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "machine_model", - "name": "Voron 2.4 350", - "model_id": "BL-P002", - "url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1.json", - "nozzle_diameter": "0.4", - "machine_tech": "FFF", - "family": "BBL-3DP", - "bed_model": "", - "bed_texture": "voron_textured.png", - "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Generic PLA;Bambu PLA Matte @BBL X1;Bambu PLA Basic @BBL X1;Bambu ABS @BBL X1C;Bambu PC @BBL X1C;Bambu Support W @BBL X1;Bambu TPU 95A @BBL X1;PolyTerra PLA @BBL X1;PolyLite PLA @BBL X1;" -} diff --git a/resources/profiles/BBL/machine/fdm_klipper_common.json b/resources/profiles/BBL/machine/fdm_klipper_common.json deleted file mode 100644 index 6c99fb3bbe7..00000000000 --- a/resources/profiles/BBL/machine/fdm_klipper_common.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "machine", - "name": "fdm_klipper_common", - "from": "system", - "instantiation": "false", - "inherits": "fdm_bbl_3dp_001_common", - "default_filament_profile": [ - "Bambu PLA Basic @BBL X1C" - ], - "default_print_profile": "0.20mm Standard @Voron", - "nozzle_diameter": [ - "0.4" - ], - "bed_exclude_area": [ - "0x0" - ], - "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "PRINT_END", - "layer_change_gcode": "", - "scan_first_layer": "0", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" - } - \ No newline at end of file diff --git a/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json b/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json deleted file mode 100644 index d4684fc16be..00000000000 --- a/resources/profiles/BBL/process/0.20mm Standard @A4MaxPro.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @A4MaxPro", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.20", - "initial_layer_speed": "45", - "initial_layer_infill_speed": "60", - "outer_wall_speed": "50", - "inner_wall_speed": "80", - "sparse_infill_speed": "80", - "internal_solid_infill_speed": "80", - "top_surface_speed": "50", - "gap_infill_speed": "40", - "travel_speed": "200", - "brim_type": "no_brim", - "default_acceleration": "1900", - "enable_prime_tower": "0", - "enable_support": "0", - "initial_layer_acceleration": "1900", - "top_surface_acceleration": "1900", - "compatible_printers": [ - "Anycubic 4Max Pro 0.4 nozzle" - ] -} diff --git a/resources/profiles/BBL/process/0.20mm Standard @MK3S.json b/resources/profiles/BBL/process/0.20mm Standard @MK3S.json deleted file mode 100644 index db29c571e74..00000000000 --- a/resources/profiles/BBL/process/0.20mm Standard @MK3S.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @MK3S", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.20", - "initial_layer_speed": "20", - "initial_layer_infill_speed": "25", - "outer_wall_speed": "35", - "inner_wall_speed": "60", - "sparse_infill_speed": "200", - "internal_solid_infill_speed": "200", - "top_surface_speed": "50", - "gap_infill_speed": "40", - "travel_speed": "180", - "compatible_printers": [ - "Prusa MK3S 0.4 nozzle" - ] -} diff --git a/resources/profiles/BBL/voron_textured.png b/resources/profiles/BBL/voron_textured.png deleted file mode 100644 index 08d5a9e2b20..00000000000 Binary files a/resources/profiles/BBL/voron_textured.png and /dev/null differ diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json new file mode 100644 index 00000000000..b023b865b08 --- /dev/null +++ b/resources/profiles/Prusa.json @@ -0,0 +1,110 @@ +{ + "name": "Voron", + "version": "01.01.01.02", + "force_update": "0", + "description": "Prusa configurations", + "machine_model_list": [ + { + "name": "Prusa MK3S", + "sub_path": "machine/Prusa MK3S.json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "0.20mm Standard @MK3S", + "sub_path": "process/0.20mm Standard @MK3S.json" + } + ], + "filament_list": [ + { + "name": "fdm_filament_common", + "sub_path": "filament/fdm_filament_common.json" + }, + { + "name": "fdm_filament_pla", + "sub_path": "filament/fdm_filament_pla.json" + }, + { + "name": "fdm_filament_tpu", + "sub_path": "filament/fdm_filament_tpu.json" + }, + { + "name": "fdm_filament_pet", + "sub_path": "filament/fdm_filament_pet.json" + }, + { + "name": "fdm_filament_abs", + "sub_path": "filament/fdm_filament_abs.json" + }, + { + "name": "fdm_filament_pc", + "sub_path": "filament/fdm_filament_pc.json" + }, + { + "name": "fdm_filament_asa", + "sub_path": "filament/fdm_filament_asa.json" + }, + { + "name": "fdm_filament_pva", + "sub_path": "filament/fdm_filament_pva.json" + }, + { + "name": "fdm_filament_pa", + "sub_path": "filament/fdm_filament_pa.json" + }, + { + "name": "Prusa Generic PLA", + "sub_path": "filament/Prusa Generic PLA.json" + }, + { + "name": "Prusa Generic PLA-CF", + "sub_path": "filament/Prusa Generic PLA-CF.json" + }, + { + "name": "Prusa Generic PETG", + "sub_path": "filament/Prusa Generic PETG.json" + }, + { + "name": "Prusa Generic ABS", + "sub_path": "filament/Prusa Generic ABS.json" + }, + { + "name": "Prusa Generic TPU", + "sub_path": "filament/Prusa Generic TPU.json" + }, + { + "name": "Prusa Generic ASA", + "sub_path": "filament/Prusa Generic ASA.json" + }, + { + "name": "Prusa Generic PC", + "sub_path": "filament/Prusa Generic PC.json" + }, + { + "name": "Prusa Generic PVA", + "sub_path": "filament/Prusa Generic PVA.json" + }, + { + "name": "Prusa Generic PA", + "sub_path": "filament/Prusa Generic PA.json" + }, + { + "name": "Prusa Generic PA-CF", + "sub_path": "filament/Prusa Generic PA-CF.json" + } + ], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "Prusa MK3S 0.4 nozzle", + "sub_path": "machine/Prusa MK3S 0.4 nozzle.json" + } + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS.json b/resources/profiles/Prusa/filament/Prusa Generic ABS.json new file mode 100644 index 00000000000..d0e38994315 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSB99", + "name": "Prusa Generic ABS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.926" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA.json b/resources/profiles/Prusa/filament/Prusa Generic ASA.json new file mode 100644 index 00000000000..616b01bee91 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "filament_id": "GFB98", + "setting_id": "GFSB98", + "name": "Prusa Generic ASA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_asa", + "filament_flow_ratio": [ + "0.93" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json new file mode 100644 index 00000000000..0583ff3478c --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFN98", + "setting_id": "GFSN99", + "name": "Prusa Generic PA-CF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pa", + "filament_type": [ + "PA-CF" + ], + "nozzle_temperature_initial_layer": [ + "280" + ], + "nozzle_temperature": [ + "280" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA.json b/resources/profiles/Prusa/filament/Prusa Generic PA.json new file mode 100644 index 00000000000..8088e2375aa --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PA.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "filament_id": "GFN99", + "setting_id": "GFSN98", + "name": "Prusa Generic PA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pa", + "nozzle_temperature_initial_layer": [ + "280" + ], + "nozzle_temperature": [ + "280" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC.json b/resources/profiles/Prusa/filament/Prusa Generic PC.json new file mode 100644 index 00000000000..7d7fa4f4de1 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PC.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "filament_id": "GFC99", + "setting_id": "GFSC99", + "name": "Prusa Generic PC", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pc", + "filament_max_volumetric_speed": [ + "12" + ], + "filament_flow_ratio": [ + "0.94" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG.json b/resources/profiles/Prusa/filament/Prusa Generic PETG.json new file mode 100644 index 00000000000..ebf9ce32558 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "filament_id": "GFG99", + "setting_id": "GFSG99", + "name": "Prusa Generic PETG", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_cooling_layer_time": [ + "30" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "40" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S255\n{endif};Prevent PETG from jamming" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json new file mode 100644 index 00000000000..68990c5bc35 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFL98", + "setting_id": "GFSL98", + "name": "Prusa Generic PLA-CF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.95" + ], + "filament_type": [ + "PLA-CF" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "7" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA.json b/resources/profiles/Prusa/filament/Prusa Generic PLA.json new file mode 100644 index 00000000000..36aa0004ed7 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSL99", + "name": "Prusa Generic PLA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA.json b/resources/profiles/Prusa/filament/Prusa Generic PVA.json new file mode 100644 index 00000000000..6daa2dd06a5 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFS99", + "setting_id": "GFSS99", + "name": "Prusa Generic PVA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pva", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "7" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU.json b/resources/profiles/Prusa/filament/Prusa Generic TPU.json new file mode 100644 index 00000000000..ada6cec7a50 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "filament_id": "GFU99", + "setting_id": "GFSR99", + "name": "Prusa Generic TPU", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_tpu", + "filament_max_volumetric_speed": [ + "3.2" + ], + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_abs.json b/resources/profiles/Prusa/filament/fdm_filament_abs.json new file mode 100644 index 00000000000..1aaa31323a3 --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_abs.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_abs", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "105" + ], + "eng_plate_temp" : [ + "105" + ], + "hot_plate_temp" : [ + "105" + ], + "cool_plate_temp_initial_layer" : [ + "105" + ], + "eng_plate_temp_initial_layer" : [ + "105" + ], + "hot_plate_temp_initial_layer" : [ + "105" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "30" + ], + "filament_max_volumetric_speed": [ + "28.6" + ], + "filament_type": [ + "ABS" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "80" + ], + "nozzle_temperature": [ + "260" + ], + "temperature_vitrification": [ + "110" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "3" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_asa.json b/resources/profiles/Prusa/filament/fdm_filament_asa.json new file mode 100644 index 00000000000..c8de040b7f5 --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_asa.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_asa", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "105" + ], + "eng_plate_temp" : [ + "105" + ], + "hot_plate_temp" : [ + "105" + ], + "cool_plate_temp_initial_layer" : [ + "105" + ], + "eng_plate_temp_initial_layer" : [ + "105" + ], + "hot_plate_temp_initial_layer" : [ + "105" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "35" + ], + "filament_max_volumetric_speed": [ + "28.6" + ], + "filament_type": [ + "ASA" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "80" + ], + "nozzle_temperature": [ + "260" + ], + "temperature_vitrification": [ + "110" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "3" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_common.json b/resources/profiles/Prusa/filament/fdm_filament_common.json new file mode 100644 index 00000000000..f8dc0a70ca2 --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_common.json @@ -0,0 +1,135 @@ +{ + "type": "filament", + "name": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "cool_plate_temp" : [ + "60" + ], + "eng_plate_temp" : [ + "60" + ], + "hot_plate_temp" : [ + "60" + ], + "cool_plate_temp_initial_layer" : [ + "60" + ], + "eng_plate_temp_initial_layer" : [ + "60" + ], + "hot_plate_temp_initial_layer" : [ + "60" + ], + "overhang_fan_threshold": [ + "95%" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "filament_end_gcode": [ + "; filament end gcode \n;M106 P3 S0\n" + ], + "filament_flow_ratio": [ + "1" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "fan_cooling_layer_time": [ + "60" + ], + "filament_cost": [ + "0" + ], + "filament_density": [ + "0" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "0" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_settings_id": [ + "" + ], + "filament_soluble": [ + "0" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Generic" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "nil" + ], + "bed_type": [ + "Cool Plate" + ], + "nozzle_temperature_initial_layer": [ + "200" + ], + "full_fan_speed_layer": [ + "0" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "35" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "200" + ], + "temperature_vitrification": [ + "100" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_pa.json b/resources/profiles/Prusa/filament/fdm_filament_pa.json new file mode 100644 index 00000000000..67c8ff050fb --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_pa.json @@ -0,0 +1,79 @@ +{ + "type": "filament", + "name": "fdm_filament_pa", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "100" + ], + "hot_plate_temp" : [ + "100" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "100" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "4" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_type": [ + "PA" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "290" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "0" + ], + "overhang_fan_speed": [ + "30" + ], + "nozzle_temperature": [ + "290" + ], + "temperature_vitrification": [ + "108" + ], + "nozzle_temperature_range_low": [ + "270" + ], + "nozzle_temperature_range_high": [ + "300" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "2" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_pc.json b/resources/profiles/Prusa/filament/fdm_filament_pc.json new file mode 100644 index 00000000000..9174d535309 --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_pc.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_pc", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "110" + ], + "hot_plate_temp" : [ + "110" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "110" + ], + "hot_plate_temp_initial_layer" : [ + "110" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "30" + ], + "filament_max_volumetric_speed": [ + "23.2" + ], + "filament_type": [ + "PC" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "60" + ], + "nozzle_temperature": [ + "280" + ], + "temperature_vitrification": [ + "140" + ], + "nozzle_temperature_range_low": [ + "260" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "2" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_pet.json b/resources/profiles/Prusa/filament/fdm_filament_pet.json new file mode 100644 index 00000000000..b7f725968ab --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_pet.json @@ -0,0 +1,76 @@ +{ + "type": "filament", + "name": "fdm_filament_pet", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "60" + ], + "eng_plate_temp" : [ + "0" + ], + "hot_plate_temp" : [ + "80" + ], + "cool_plate_temp_initial_layer" : [ + "60" + ], + "eng_plate_temp_initial_layer" : [ + "0" + ], + "hot_plate_temp_initial_layer" : [ + "80" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "20" + ], + "filament_max_volumetric_speed": [ + "25" + ], + "filament_type": [ + "PETG" + ], + "filament_density": [ + "1.27" + ], + "filament_cost": [ + "30" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "20" + ], + "overhang_fan_speed": [ + "100" + ], + "nozzle_temperature": [ + "255" + ], + "temperature_vitrification": [ + "80" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "nozzle_temperature_range_high": [ + "260" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_pla.json b/resources/profiles/Prusa/filament/fdm_filament_pla.json new file mode 100644 index 00000000000..6761525611a --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_pla.json @@ -0,0 +1,88 @@ +{ + "type": "filament", + "name": "fdm_filament_pla", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_type": [ + "PLA" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "cool_plate_temp" : [ + "35" + ], + "eng_plate_temp" : [ + "0" + ], + "hot_plate_temp" : [ + "45" + ], + "cool_plate_temp_initial_layer" : [ + "35" + ], + "eng_plate_temp_initial_layer" : [ + "0" + ], + "hot_plate_temp_initial_layer" : [ + "45" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "60" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{endif};Prevent PLA from jamming" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_pva.json b/resources/profiles/Prusa/filament/fdm_filament_pva.json new file mode 100644 index 00000000000..36b7b7b1231 --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_pva.json @@ -0,0 +1,94 @@ +{ + "type": "filament", + "name": "fdm_filament_pva", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "35" + ], + "eng_plate_temp" : [ + "0" + ], + "hot_plate_temp" : [ + "45" + ], + "cool_plate_temp_initial_layer" : [ + "35" + ], + "eng_plate_temp_initial_layer" : [ + "0" + ], + "hot_plate_temp_initial_layer" : [ + "45" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_soluble": [ + "1" + ], + "filament_is_support": [ + "1" + ], + "filament_type": [ + "PVA" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "50" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "slow_down_min_speed": [ + "50" + ], + "slow_down_layer_time": [ + "4" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_tpu.json b/resources/profiles/Prusa/filament/fdm_filament_tpu.json new file mode 100644 index 00000000000..39597c7a56b --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_tpu.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_tpu", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "30" + ], + "eng_plate_temp" : [ + "30" + ], + "hot_plate_temp" : [ + "35" + ], + "cool_plate_temp_initial_layer" : [ + "30" + ], + "eng_plate_temp_initial_layer" : [ + "30" + ], + "hot_plate_temp_initial_layer" : [ + "35" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_type": [ + "TPU" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "filament_retraction_length": [ + "0.4" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "240" + ], + "temperature_vitrification": [ + "60" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder]>30)}M106 P3 S255\n{endif};Prevent TPU from jamming" + ] +} diff --git a/resources/profiles/BBL/machine/Prusa MK3S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json similarity index 96% rename from resources/profiles/BBL/machine/Prusa MK3S 0.4 nozzle.json rename to resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json index 27e79b7f24b..f1f52683f66 100644 --- a/resources/profiles/BBL/machine/Prusa MK3S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json @@ -4,10 +4,10 @@ "name": "Prusa MK3S 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", + "inherits": "fdm_machine_common", "printer_model": "Prusa MK3S", "default_filament_profile": [ - "Bambu PLA Basic @BBL X1" + "Prusa Generic PLA" ], "default_print_profile": "0.20mm Standard @MK3S", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK3S.json b/resources/profiles/Prusa/machine/Prusa MK3S.json new file mode 100644 index 00000000000..d279367a2f9 --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa MK3S.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Prusa MK3S", + "model_id": "MK3S", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Prusa", + "bed_model": "mk3_bed.stl", + "bed_texture": "mk3.svg", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Prusa Generic ABS;Prusa Generic PLA;Prusa Generic PLA-CF;Prusa Generic PETG;Prusa Generic TPU;Prusa Generic ASA;Prusa Generic PC;Prusa Generic PVA;Prusa Generic PA;Prusa Generic PA-CF" +} diff --git a/resources/profiles/Prusa/machine/fdm_machine_common.json b/resources/profiles/Prusa/machine/fdm_machine_common.json new file mode 100644 index 00000000000..a6f78e6f0c5 --- /dev/null +++ b/resources/profiles/Prusa/machine/fdm_machine_common.json @@ -0,0 +1,137 @@ +{ + "type": "machine", + "name": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "gcode_flavor": "marlin", + "machine_start_gcode": "", + "machine_end_gcode": "", + "extruder_colour": [ + "#018001" + ], + "extruder_offset": [ + "0x0" + ], + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "2000", + "2000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "3000", + "3000" + ], + "machine_max_acceleration_x": [ + "2000", + "2000" + ], + "machine_max_acceleration_y": [ + "2000", + "2000" + ], + "machine_max_acceleration_z": [ + "300", + "200" + ], + "machine_max_speed_e": [ + "25", + "25" + ], + "machine_max_speed_x": [ + "300", + "200" + ], + "machine_max_speed_y": [ + "300", + "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.3" + ], + "min_layer_height": [ + "0.08" + ], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "nozzle_diameter": [ + "0.4" + ], + "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" + ], + "silent_mode": "0", + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "layer_change_gcode": "", + "machine_pause_gcode": "M400 U1\n", + "wipe": [ + "1" + ] +} diff --git a/resources/profiles/BBL/mk3.svg b/resources/profiles/Prusa/mk3.svg similarity index 100% rename from resources/profiles/BBL/mk3.svg rename to resources/profiles/Prusa/mk3.svg diff --git a/resources/profiles/BBL/mk3_bed.stl b/resources/profiles/Prusa/mk3_bed.stl similarity index 100% rename from resources/profiles/BBL/mk3_bed.stl rename to resources/profiles/Prusa/mk3_bed.stl diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json new file mode 100644 index 00000000000..6376487ed3e --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json @@ -0,0 +1,20 @@ +{ + "type": "process", + "setting_id": "MK3S-2", + "name": "0.20mm Standard @MK3S", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "initial_layer_speed": "20", + "initial_layer_infill_speed": "25", + "outer_wall_speed": "35", + "inner_wall_speed": "60", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "top_surface_speed": "50", + "gap_infill_speed": "40", + "travel_speed": "180", + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/fdm_process_common.json b/resources/profiles/Prusa/process/fdm_process_common.json new file mode 100644 index 00000000000..e056c5a6094 --- /dev/null +++ b/resources/profiles/Prusa/process/fdm_process_common.json @@ -0,0 +1,102 @@ +{ + "type": "process", + "name": "fdm_process_common", + "from": "system", + "instantiation": "false", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_thickness": "0", + "bridge_speed": "50", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers": [], + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "1000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "800", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.4", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.2", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "25%", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[0]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.4", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_interface_speed": "80", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_angle": "30", + "tree_support_wall_count": "0", + "tree_support_with_infill": "0", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_thickness": "0.8", + "enable_prime_tower": "1", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "35", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "layer_height": "0.2", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "bridge_flow": "1", + "initial_layer_speed": "45", + "initial_layer_infill_speed": "45", + "outer_wall_speed": "45", + "inner_wall_speed": "80", + "sparse_infill_speed": "150", + "internal_solid_infill_speed": "150", + "top_surface_speed": "50", + "gap_infill_speed": "30", + "travel_speed": "200" +} diff --git a/resources/profiles/Voron.json b/resources/profiles/Voron.json new file mode 100644 index 00000000000..0dbd4f96049 --- /dev/null +++ b/resources/profiles/Voron.json @@ -0,0 +1,186 @@ +{ + "name": "Voron", + "version": "01.01.01.02", + "force_update": "0", + "description": "Voron configurations", + "machine_model_list": [ + { + "name": "Voron 2.4 250", + "sub_path": "machine/Voron 2.4 250.json" + }, + { + "name": "Voron 2.4 300", + "sub_path": "machine/Voron 2.4 300.json" + }, + { + "name": "Voron 2.4 350", + "sub_path": "machine/Voron 2.4 350.json" + }, + { + "name": "Voron Trident 250", + "sub_path": "machine/Voron Trident 250.json" + }, + { + "name": "Voron Trident 300", + "sub_path": "machine/Voron Trident 300.json" + }, + { + "name": "Voron Trident 350", + "sub_path": "machine/Voron Trident 350.json" + }, + { + "name": "Voron 0.1", + "sub_path": "machine/Voron 0.1.json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "fdm_process_voron_common", + "sub_path": "process/fdm_process_voron_common.json" + }, + { + "name": "0.08mm Extra Fine @Voron", + "sub_path": "process/0.08mm Extra Fine @Voron.json" + }, + { + "name": "0.12mm Fine @Voron", + "sub_path": "process/0.12mm Fine @Voron.json" + }, + { + "name": "0.15mm Optimal @Voron", + "sub_path": "process/0.15mm Optimal @Voron.json" + }, + { + "name": "0.20mm Standard @Voron", + "sub_path": "process/0.20mm Standard @Voron.json" + }, + { + "name": "0.24mm Draft @Voron", + "sub_path": "process/0.24mm Draft @Voron.json" + }, + { + "name": "0.28mm Extra Draft @Voron", + "sub_path": "process/0.28mm Extra Draft @Voron.json" + } + ], + "filament_list": [ + { + "name": "fdm_filament_common", + "sub_path": "filament/fdm_filament_common.json" + }, + { + "name": "fdm_filament_pla", + "sub_path": "filament/fdm_filament_pla.json" + }, + { + "name": "fdm_filament_tpu", + "sub_path": "filament/fdm_filament_tpu.json" + }, + { + "name": "fdm_filament_pet", + "sub_path": "filament/fdm_filament_pet.json" + }, + { + "name": "fdm_filament_abs", + "sub_path": "filament/fdm_filament_abs.json" + }, + { + "name": "fdm_filament_pc", + "sub_path": "filament/fdm_filament_pc.json" + }, + { + "name": "fdm_filament_asa", + "sub_path": "filament/fdm_filament_asa.json" + }, + { + "name": "fdm_filament_pva", + "sub_path": "filament/fdm_filament_pva.json" + }, + { + "name": "fdm_filament_pa", + "sub_path": "filament/fdm_filament_pa.json" + }, + { + "name": "Voron Generic PLA", + "sub_path": "filament/Voron Generic PLA.json" + }, + { + "name": "Voron Generic PLA-CF", + "sub_path": "filament/Voron Generic PLA-CF.json" + }, + { + "name": "Voron Generic PETG", + "sub_path": "filament/Voron Generic PETG.json" + }, + { + "name": "Voron Generic ABS", + "sub_path": "filament/Voron Generic ABS.json" + }, + { + "name": "Voron Generic TPU", + "sub_path": "filament/Voron Generic TPU.json" + }, + { + "name": "Voron Generic ASA", + "sub_path": "filament/Voron Generic ASA.json" + }, + { + "name": "Voron Generic PC", + "sub_path": "filament/Voron Generic PC.json" + }, + { + "name": "Voron Generic PVA", + "sub_path": "filament/Voron Generic PVA.json" + }, + { + "name": "Voron Generic PA", + "sub_path": "filament/Voron Generic PA.json" + }, + { + "name": "Voron Generic PA-CF", + "sub_path": "filament/Voron Generic PA-CF.json" + } + ], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "fdm_klipper_common", + "sub_path": "machine/fdm_klipper_common.json" + }, + { + "name": "Voron 2.4 250 0.4 nozzle", + "sub_path": "machine/Voron 2.4 250 0.4 nozzle.json" + }, + { + "name": "Voron 2.4 300 0.4 nozzle", + "sub_path": "machine/Voron 2.4 300 0.4 nozzle.json" + }, + { + "name": "Voron 2.4 350 0.4 nozzle", + "sub_path": "machine/Voron 2.4 350 0.4 nozzle.json" + }, + { + "name": "Voron Trident 250 0.4 nozzle", + "sub_path": "machine/Voron Trident 250 0.4 nozzle.json" + }, + { + "name": "Voron Trident 300 0.4 nozzle", + "sub_path": "machine/Voron Trident 300 0.4 nozzle.json" + }, + { + "name": "Voron Trident 350 0.4 nozzle", + "sub_path": "machine/Voron Trident 350 0.4 nozzle.json" + }, + { + "name": "Voron 0.1 0.4 nozzle", + "sub_path": "machine/Voron 0.1 0.4 nozzle.json" + } + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Voron Generic ABS.json new file mode 100644 index 00000000000..a32e5f62af0 --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic ABS.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSB99", + "name": "Voron Generic ABS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.926" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Voron Generic ASA.json new file mode 100644 index 00000000000..d0875ab367c --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic ASA.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFB98", + "setting_id": "GFSB98", + "name": "Voron Generic ASA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_asa", + "filament_flow_ratio": [ + "0.93" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json new file mode 100644 index 00000000000..bae64a95a76 --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic PA-CF.json @@ -0,0 +1,30 @@ +{ + "type": "filament", + "filament_id": "GFN98", + "setting_id": "GFSN99", + "name": "Voron Generic PA-CF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pa", + "filament_type": [ + "PA-CF" + ], + "nozzle_temperature_initial_layer": [ + "280" + ], + "nozzle_temperature": [ + "280" + ], + "filament_max_volumetric_speed": [ + "8" + ], +"compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Voron Generic PA.json new file mode 100644 index 00000000000..51bddeab236 --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic PA.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "filament_id": "GFN99", + "setting_id": "GFSN98", + "name": "Voron Generic PA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pa", + "nozzle_temperature_initial_layer": [ + "280" + ], + "nozzle_temperature": [ + "280" + ], + "filament_max_volumetric_speed": [ + "12" + ], +"compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json new file mode 100644 index 00000000000..798d28c2f30 --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic PC.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFC99", + "setting_id": "GFSC99", + "name": "Voron Generic PC", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pc", + "filament_max_volumetric_speed": [ + "12" + ], + "filament_flow_ratio": [ + "0.94" + ], +"compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json new file mode 100644 index 00000000000..cf7ccb23a34 --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic PETG.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "filament_id": "GFG99", + "setting_id": "GFSG99", + "name": "Voron Generic PETG", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_cooling_layer_time": [ + "30" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "40" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S255\n{endif};Prevent PETG from jamming" + ], + "compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json new file mode 100644 index 00000000000..be4304d0513 --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json @@ -0,0 +1,30 @@ +{ + "type": "filament", + "filament_id": "GFL98", + "setting_id": "GFSL98", + "name": "Voron Generic PLA-CF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.95" + ], + "filament_type": [ + "PLA-CF" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "7" + ], +"compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json new file mode 100644 index 00000000000..9655890e698 --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic PLA.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSL99", + "name": "Voron Generic PLA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Voron Generic PVA.json new file mode 100644 index 00000000000..5ed8fd05caf --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic PVA.json @@ -0,0 +1,30 @@ +{ + "type": "filament", + "filament_id": "GFS99", + "setting_id": "GFSS99", + "name": "Voron Generic PVA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pva", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "7" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json new file mode 100644 index 00000000000..2d96fd00651 --- /dev/null +++ b/resources/profiles/Voron/filament/Voron Generic TPU.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "filament_id": "GFU99", + "setting_id": "GFSR99", + "name": "Voron Generic TPU", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_tpu", + "filament_max_volumetric_speed": [ + "3.2" + ], + "compatible_printers": [ + "Voron 2.4 250 0.4 nozzle", + "Voron 2.4 300 0.4 nozzle", + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_abs.json b/resources/profiles/Voron/filament/fdm_filament_abs.json new file mode 100644 index 00000000000..1aaa31323a3 --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_abs.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_abs", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "105" + ], + "eng_plate_temp" : [ + "105" + ], + "hot_plate_temp" : [ + "105" + ], + "cool_plate_temp_initial_layer" : [ + "105" + ], + "eng_plate_temp_initial_layer" : [ + "105" + ], + "hot_plate_temp_initial_layer" : [ + "105" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "30" + ], + "filament_max_volumetric_speed": [ + "28.6" + ], + "filament_type": [ + "ABS" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "80" + ], + "nozzle_temperature": [ + "260" + ], + "temperature_vitrification": [ + "110" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "3" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_asa.json b/resources/profiles/Voron/filament/fdm_filament_asa.json new file mode 100644 index 00000000000..c8de040b7f5 --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_asa.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_asa", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "105" + ], + "eng_plate_temp" : [ + "105" + ], + "hot_plate_temp" : [ + "105" + ], + "cool_plate_temp_initial_layer" : [ + "105" + ], + "eng_plate_temp_initial_layer" : [ + "105" + ], + "hot_plate_temp_initial_layer" : [ + "105" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "35" + ], + "filament_max_volumetric_speed": [ + "28.6" + ], + "filament_type": [ + "ASA" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "80" + ], + "nozzle_temperature": [ + "260" + ], + "temperature_vitrification": [ + "110" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "3" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_common.json b/resources/profiles/Voron/filament/fdm_filament_common.json new file mode 100644 index 00000000000..f8dc0a70ca2 --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_common.json @@ -0,0 +1,135 @@ +{ + "type": "filament", + "name": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "cool_plate_temp" : [ + "60" + ], + "eng_plate_temp" : [ + "60" + ], + "hot_plate_temp" : [ + "60" + ], + "cool_plate_temp_initial_layer" : [ + "60" + ], + "eng_plate_temp_initial_layer" : [ + "60" + ], + "hot_plate_temp_initial_layer" : [ + "60" + ], + "overhang_fan_threshold": [ + "95%" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "filament_end_gcode": [ + "; filament end gcode \n;M106 P3 S0\n" + ], + "filament_flow_ratio": [ + "1" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "fan_cooling_layer_time": [ + "60" + ], + "filament_cost": [ + "0" + ], + "filament_density": [ + "0" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "0" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_settings_id": [ + "" + ], + "filament_soluble": [ + "0" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Generic" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "nil" + ], + "bed_type": [ + "Cool Plate" + ], + "nozzle_temperature_initial_layer": [ + "200" + ], + "full_fan_speed_layer": [ + "0" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "35" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "200" + ], + "temperature_vitrification": [ + "100" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_pa.json b/resources/profiles/Voron/filament/fdm_filament_pa.json new file mode 100644 index 00000000000..67c8ff050fb --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_pa.json @@ -0,0 +1,79 @@ +{ + "type": "filament", + "name": "fdm_filament_pa", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "100" + ], + "hot_plate_temp" : [ + "100" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "100" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "4" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_type": [ + "PA" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "290" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "0" + ], + "overhang_fan_speed": [ + "30" + ], + "nozzle_temperature": [ + "290" + ], + "temperature_vitrification": [ + "108" + ], + "nozzle_temperature_range_low": [ + "270" + ], + "nozzle_temperature_range_high": [ + "300" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "2" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_pc.json b/resources/profiles/Voron/filament/fdm_filament_pc.json new file mode 100644 index 00000000000..9174d535309 --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_pc.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_pc", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "110" + ], + "hot_plate_temp" : [ + "110" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "110" + ], + "hot_plate_temp_initial_layer" : [ + "110" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "30" + ], + "filament_max_volumetric_speed": [ + "23.2" + ], + "filament_type": [ + "PC" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "60" + ], + "nozzle_temperature": [ + "280" + ], + "temperature_vitrification": [ + "140" + ], + "nozzle_temperature_range_low": [ + "260" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "2" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_pet.json b/resources/profiles/Voron/filament/fdm_filament_pet.json new file mode 100644 index 00000000000..b7f725968ab --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_pet.json @@ -0,0 +1,76 @@ +{ + "type": "filament", + "name": "fdm_filament_pet", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "60" + ], + "eng_plate_temp" : [ + "0" + ], + "hot_plate_temp" : [ + "80" + ], + "cool_plate_temp_initial_layer" : [ + "60" + ], + "eng_plate_temp_initial_layer" : [ + "0" + ], + "hot_plate_temp_initial_layer" : [ + "80" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "20" + ], + "filament_max_volumetric_speed": [ + "25" + ], + "filament_type": [ + "PETG" + ], + "filament_density": [ + "1.27" + ], + "filament_cost": [ + "30" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "20" + ], + "overhang_fan_speed": [ + "100" + ], + "nozzle_temperature": [ + "255" + ], + "temperature_vitrification": [ + "80" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "nozzle_temperature_range_high": [ + "260" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_pla.json b/resources/profiles/Voron/filament/fdm_filament_pla.json new file mode 100644 index 00000000000..abfd98ada85 --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_pla.json @@ -0,0 +1,88 @@ +{ + "type": "filament", + "name": "fdm_filament_pla", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_type": [ + "PLA" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "cool_plate_temp" : [ + "60" + ], + "eng_plate_temp" : [ + "60" + ], + "hot_plate_temp" : [ + "60" + ], + "cool_plate_temp_initial_layer" : [ + "60" + ], + "eng_plate_temp_initial_layer" : [ + "60" + ], + "hot_plate_temp_initial_layer" : [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "60" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "4" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{endif};Prevent PLA from jamming" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_pva.json b/resources/profiles/Voron/filament/fdm_filament_pva.json new file mode 100644 index 00000000000..36b7b7b1231 --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_pva.json @@ -0,0 +1,94 @@ +{ + "type": "filament", + "name": "fdm_filament_pva", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "35" + ], + "eng_plate_temp" : [ + "0" + ], + "hot_plate_temp" : [ + "45" + ], + "cool_plate_temp_initial_layer" : [ + "35" + ], + "eng_plate_temp_initial_layer" : [ + "0" + ], + "hot_plate_temp_initial_layer" : [ + "45" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_soluble": [ + "1" + ], + "filament_is_support": [ + "1" + ], + "filament_type": [ + "PVA" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "50" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "slow_down_min_speed": [ + "50" + ], + "slow_down_layer_time": [ + "4" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming" + ] +} diff --git a/resources/profiles/Voron/filament/fdm_filament_tpu.json b/resources/profiles/Voron/filament/fdm_filament_tpu.json new file mode 100644 index 00000000000..39597c7a56b --- /dev/null +++ b/resources/profiles/Voron/filament/fdm_filament_tpu.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_tpu", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "30" + ], + "eng_plate_temp" : [ + "30" + ], + "hot_plate_temp" : [ + "35" + ], + "cool_plate_temp_initial_layer" : [ + "30" + ], + "eng_plate_temp_initial_layer" : [ + "30" + ], + "hot_plate_temp_initial_layer" : [ + "35" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_type": [ + "TPU" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "filament_retraction_length": [ + "0.4" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "240" + ], + "temperature_vitrification": [ + "60" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder]>30)}M106 P3 S255\n{endif};Prevent TPU from jamming" + ] +} diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json new file mode 100644 index 00000000000..765e736a44f --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "machine", + "setting_id": "VORON-001", + "name": "Voron 0.1 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.20mm Standard @Voron", + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1.json b/resources/profiles/Voron/machine/Voron 0.1.json new file mode 100644 index 00000000000..95c5a89ffea --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron 2.4 250", + "model_id": "Voron0", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_v0_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" +} diff --git a/resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json similarity index 90% rename from resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json rename to resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json index ad09c744678..dbab4383427 100644 --- a/resources/profiles/BBL/machine/Voron 2.4 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM003", + "setting_id": "VORON-002", "name": "Voron 2.4 250 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 250.json b/resources/profiles/Voron/machine/Voron 2.4 250.json new file mode 100644 index 00000000000..bbbc9a12920 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 250.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron 2.4 250", + "model_id": "Voron2-250", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" +} diff --git a/resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json similarity index 90% rename from resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json rename to resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json index 630da11a0d3..3c87e6834d6 100644 --- a/resources/profiles/BBL/machine/Voron 2.4 300 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM003", + "setting_id": "VORON-003", "name": "Voron 2.4 300 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 300.json b/resources/profiles/Voron/machine/Voron 2.4 300.json new file mode 100644 index 00000000000..da803292c57 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 300.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron 2.4 300", + "model_id": "Voron2-300", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" +} diff --git a/resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json similarity index 90% rename from resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json rename to resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json index 30dffc5dbfc..ab01c08745c 100644 --- a/resources/profiles/BBL/machine/Voron 2.4 350 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM003", + "setting_id": "VORON-004", "name": "Voron 2.4 350 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 350.json b/resources/profiles/Voron/machine/Voron 2.4 350.json new file mode 100644 index 00000000000..02bbcf85a52 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 350.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron 2.4 350", + "model_id": "Voron2-350", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json new file mode 100644 index 00000000000..882ce42b1f5 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "machine", + "setting_id": "VORON-005", + "name": "Voron Trident 250 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "225" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250.json b/resources/profiles/Voron/machine/Voron Trident 250.json new file mode 100644 index 00000000000..e0aee7b30ea --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron Trident 250", + "model_id": "Voron2Trident-250", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json new file mode 100644 index 00000000000..f23f1e4decc --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "machine", + "setting_id": "VORON-006", + "name": "Voron Trident 300 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "275" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300.json b/resources/profiles/Voron/machine/Voron Trident 300.json new file mode 100644 index 00000000000..b6120c70f93 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron Trident 300", + "model_id": "Voron2Trident-300", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json new file mode 100644 index 00000000000..fe77fcb8cf1 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "machine", + "setting_id": "VORON-007", + "name": "Voron Trident 350 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "325" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350.json b/resources/profiles/Voron/machine/Voron Trident 350.json new file mode 100644 index 00000000000..4cc8c0097f5 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron Trident 350", + "model_id": "Voron2Trident-350", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF" +} diff --git a/resources/profiles/Voron/machine/fdm_klipper_common.json b/resources/profiles/Voron/machine/fdm_klipper_common.json new file mode 100644 index 00000000000..e6d5bc21259 --- /dev/null +++ b/resources/profiles/Voron/machine/fdm_klipper_common.json @@ -0,0 +1,142 @@ +{ + "type": "machine", + "name": "fdm_klipper_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_machine_common", + "gcode_flavor": "marlin", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "9000", + "9000" + ], + "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.28" + ], + "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" + ], + "silent_mode": "0", + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "machine_pause_gcode": "PAUSE\n", + "wipe": [ + "1" + ], + "default_filament_profile": [ + "Voron Generic ABS" + ], + "default_print_profile": "0.20mm Standard @Voron", + "nozzle_diameter": [ + "0.4" + ], + "bed_exclude_area": [ + "0x0" + ], + "machine_start_gcode": "M190 S0\nM104 S0\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n; You can use following code instead if your PRINT_START macro support Chamber and print area bedmesh\n; PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single] Chamber=[chamber_temperature] PRINT_MIN={first_layer_print_min[0]},{first_layer_print_min[1]} PRINT_MAX={first_layer_print_max[0]},{first_layer_print_max[1]}", + "machine_end_gcode": "PRINT_END", + "layer_change_gcode": "", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/machine/fdm_machine_common.json b/resources/profiles/Voron/machine/fdm_machine_common.json new file mode 100644 index 00000000000..37891fb1a55 --- /dev/null +++ b/resources/profiles/Voron/machine/fdm_machine_common.json @@ -0,0 +1,116 @@ +{ + "type": "machine", + "name": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "printer_technology": "FFF", + "deretraction_speed": [ + "40" + ], + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "gcode_flavor": "marlin", + "silent_mode": "0", + "machine_max_acceleration_e": [ + "5000" + ], + "machine_max_acceleration_extruding": [ + "10000" + ], + "machine_max_acceleration_retracting": [ + "1000" + ], + "machine_max_acceleration_x": [ + "10000" + ], + "machine_max_acceleration_y": [ + "10000" + ], + "machine_max_acceleration_z": [ + "100" + ], + "machine_max_speed_e": [ + "60" + ], + "machine_max_speed_x": [ + "500" + ], + "machine_max_speed_y": [ + "500" + ], + "machine_max_speed_z": [ + "10" + ], + "machine_max_jerk_e": [ + "5" + ], + "machine_max_jerk_x": [ + "8" + ], + "machine_max_jerk_y": [ + "8" + ], + "machine_max_jerk_z": [ + "0.4" + ], + "machine_min_extruding_rate": [ + "0" + ], + "machine_min_travel_rate": [ + "0" + ], + "max_layer_height": [ + "0.28" + ], + "min_layer_height": [ + "0.08" + ], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "nozzle_diameter": [ + "0.4" + ], + "printer_settings_id": "", + "printer_variant": "0.4", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "70%" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_length": [ + "5" + ], + "retract_length_toolchange": [ + "1" + ], + "z_hop": [ + "0" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retraction_speed": [ + "60" + ], + "single_extruder_multi_material": "0", + "change_filament_gcode": "", + "wipe": [ + "1" + ], + "default_print_profile": "0.16mm Optimal @Bambu Lab X1 Carbon 0.4 nozzle", + "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up", + "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end" +} diff --git a/resources/profiles/BBL/process/0.08mm Extra Fine @Voron.json b/resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json similarity index 100% rename from resources/profiles/BBL/process/0.08mm Extra Fine @Voron.json rename to resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json diff --git a/resources/profiles/BBL/process/0.12mm Fine @Voron.json b/resources/profiles/Voron/process/0.12mm Fine @Voron.json similarity index 100% rename from resources/profiles/BBL/process/0.12mm Fine @Voron.json rename to resources/profiles/Voron/process/0.12mm Fine @Voron.json diff --git a/resources/profiles/BBL/process/0.15mm Optimal @Voron.json b/resources/profiles/Voron/process/0.15mm Optimal @Voron.json similarity index 100% rename from resources/profiles/BBL/process/0.15mm Optimal @Voron.json rename to resources/profiles/Voron/process/0.15mm Optimal @Voron.json diff --git a/resources/profiles/BBL/process/0.20mm Bambu Support W @Voron.json b/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json similarity index 89% rename from resources/profiles/BBL/process/0.20mm Bambu Support W @Voron.json rename to resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json index 6269c2334c7..b456342d935 100644 --- a/resources/profiles/BBL/process/0.20mm Bambu Support W @Voron.json +++ b/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json @@ -27,6 +27,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/BBL/process/0.20mm Standard @Voron.json b/resources/profiles/Voron/process/0.20mm Standard @Voron.json similarity index 100% rename from resources/profiles/BBL/process/0.20mm Standard @Voron.json rename to resources/profiles/Voron/process/0.20mm Standard @Voron.json diff --git a/resources/profiles/BBL/process/0.24mm Draft @Voron.json b/resources/profiles/Voron/process/0.24mm Draft @Voron.json similarity index 100% rename from resources/profiles/BBL/process/0.24mm Draft @Voron.json rename to resources/profiles/Voron/process/0.24mm Draft @Voron.json diff --git a/resources/profiles/BBL/process/0.28mm Extra Draft @Voron.json b/resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json similarity index 100% rename from resources/profiles/BBL/process/0.28mm Extra Draft @Voron.json rename to resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json diff --git a/resources/profiles/Voron/process/fdm_process_common.json b/resources/profiles/Voron/process/fdm_process_common.json new file mode 100644 index 00000000000..2f46423f617 --- /dev/null +++ b/resources/profiles/Voron/process/fdm_process_common.json @@ -0,0 +1,71 @@ +{ + "type": "process", + "name": "fdm_process_common", + "from": "system", + "instantiation": "false", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "bridge_flow": "0.95", + "bridge_speed": "25", + "brim_width": "5", + "compatible_printers": [], + "print_sequence": "by layer", + "default_acceleration": "10000", + "bridge_no_support": "0", + "elefant_foot_compensation": "0.1", + "outer_wall_line_width": "0.4", + "outer_wall_speed": "120", + "line_width": "0.45", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "initial_layer_line_width": "0.42", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "20", + "gap_infill_speed": "30", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "25%", + "sparse_infill_speed": "50", + "interface_shells": "0", + "detect_overhang_wall": "0", + "reduce_infill_retraction": "0", + "filename_format": "{input_filename_base}.gcode", + "wall_loops": "2", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "40", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "nearest", + "skirt_distance": "2", + "skirt_height": "2", + "minimum_sparse_infill_area": "0", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "40", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "support_filament": "0", + "support_line_width": "0.42", + "support_interface_filament": "0", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.15", + "support_interface_loop_pattern": "0", + "support_interface_top_layers": "2", + "support_interface_spacing": "0", + "support_interface_speed": "80", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2", + "support_speed": "40", + "support_threshold_angle": "40", + "support_object_xy_distance": "0.5", + "tree_support_with_infill": "1", + "detect_thin_wall": "0", + "top_surface_line_width": "0.4", + "top_surface_speed": "30", + "travel_speed": "400", + "enable_prime_tower": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0" +} diff --git a/resources/profiles/BBL/process/fdm_process_voron_common.json b/resources/profiles/Voron/process/fdm_process_voron_common.json similarity index 96% rename from resources/profiles/BBL/process/fdm_process_voron_common.json rename to resources/profiles/Voron/process/fdm_process_voron_common.json index cd27ff5b5d6..47de08ca08e 100644 --- a/resources/profiles/BBL/process/fdm_process_voron_common.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common.json @@ -103,6 +103,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/voron_logo.png b/resources/profiles/Voron/voron_logo.png new file mode 100644 index 00000000000..8743146a80e Binary files /dev/null and b/resources/profiles/Voron/voron_logo.png differ diff --git a/resources/profiles/Voron/voron_v0_logo.png b/resources/profiles/Voron/voron_v0_logo.png new file mode 100644 index 00000000000..bca8bb378fb Binary files /dev/null and b/resources/profiles/Voron/voron_v0_logo.png differ diff --git a/resources/web/image/printer/Voron Trident 250_cover.png b/resources/web/image/printer/Voron Trident 250_cover.png new file mode 100644 index 00000000000..8357a65a135 Binary files /dev/null and b/resources/web/image/printer/Voron Trident 250_cover.png differ diff --git a/resources/web/image/printer/Voron Trident 300_cover.png b/resources/web/image/printer/Voron Trident 300_cover.png new file mode 100644 index 00000000000..8357a65a135 Binary files /dev/null and b/resources/web/image/printer/Voron Trident 300_cover.png differ diff --git a/resources/web/image/printer/Voron Trident 350_cover.png b/resources/web/image/printer/Voron Trident 350_cover.png new file mode 100644 index 00000000000..8357a65a135 Binary files /dev/null and b/resources/web/image/printer/Voron Trident 350_cover.png differ diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 006b644e8ad..2c2c7d57fae 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1510,6 +1510,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato m_placeholder_parser.set("bed_temperature", new ConfigOptionInts(*bed_temp_opt)); m_placeholder_parser.set("bed_temperature_initial_layer_single", new ConfigOptionInt(first_bed_temp_opt->get_at(initial_extruder_id))); m_placeholder_parser.set("bed_temperature_initial_layer_vector", new ConfigOptionString("")); + m_placeholder_parser.set("chamber_temperature",new ConfigOptionInt(m_config.chamber_temperature)); //BBS: calculate the volumetric speed of outer wall. Ignore pre-object setting and multi-filament, and just use the default setting { diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp index 7a495edab8a..ec600650986 100644 --- a/src/libslic3r/PerimeterGenerator.cpp +++ b/src/libslic3r/PerimeterGenerator.cpp @@ -394,7 +394,10 @@ void PerimeterGenerator::process() for (const Surface &surface : this->slices->surfaces) { // detect how many perimeters must be generated for this island int loop_number = this->config->wall_loops + surface.extra_perimeters - 1; // 0-indexed loops - //BBS: force the topmost layer to be one wall + if (this->layer_id == 0 && this->config->only_one_wall_first_layer) + loop_number = 0; + + // BBS: force the topmost layer to be one wall if (loop_number > 0 && this->upper_slices == nullptr) loop_number = 0; diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index ce10743df1d..21a8ceee6b7 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -682,14 +682,14 @@ static std::vector s_Preset_print_options { "detect_narrow_internal_solid_infill", "gcode_add_line_number", "enable_arc_fitting", "infill_combination", "adaptive_layer_height", "support_bottom_interface_spacing", "enable_overhang_speed", "overhang_1_4_speed", "overhang_2_4_speed", "overhang_3_4_speed", "overhang_4_4_speed", - "initial_layer_infill_speed", "only_one_wall_top", + "initial_layer_infill_speed", "only_one_wall_top", "only_one_wall_first_layer", "timelapse_no_toolhead" }; static std::vector s_Preset_filament_options { /*"filament_colour", */"filament_diameter", "filament_type", "filament_soluble", "filament_is_support", "filament_max_volumetric_speed", "filament_flow_ratio", "filament_density", "filament_cost", "filament_minimal_purge_on_wipe_tower", - "nozzle_temperature", "nozzle_temperature_initial_layer", + "chamber_temperature", "nozzle_temperature", "nozzle_temperature_initial_layer", // BBS "cool_plate_temp", "eng_plate_temp", "hot_plate_temp", "cool_plate_temp_initial_layer", "eng_plate_temp_initial_layer", "hot_plate_temp_initial_layer", // "bed_type", @@ -726,7 +726,7 @@ static std::vector s_Preset_printer_options { "scan_first_layer", "machine_load_filament_time", "machine_unload_filament_time", "machine_pause_gcode", "nozzle_type", "auxiliary_fan", "nozzle_volume", //SoftFever - "connection_moonraker_url","connection_port", "host_type", "print_host", "printhost_apikey", + "host_type", "print_host", "printhost_apikey", "printhost_cafile","printhost_port","printhost_authorization_type", "printhost_user", "printhost_password", diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 394a3fa65da..669149697fb 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -2788,7 +2788,7 @@ std::pair PresetBundle::load_vendor_configs_ //parse error std::string subfile_path = path + "/" + vendor_name + "/" + subfile.second; BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", got error when parse process setting from %1%") % subfile_path; - throw ConfigurationError((boost::format("Failed loading configuration file %1%\nSuggest cleaning the directory %2% firstly") % subfile_path %vendor_system_path).str()); + throw ConfigurationError((boost::format("Failed loading configuration file %1%\nSuggest cleaning the directory %2% firstly.\nReason: %3%") % subfile_path %vendor_system_path %reason).str()); } } diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 710c74b18d1..3473b83cec2 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -126,7 +126,8 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n // BBS "wipe_distance", "curr_bed_type", - "nozzle_volume" + "nozzle_volume", + "chamber_temperature" }; static std::unordered_set steps_ignore; @@ -163,6 +164,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n } else if ( opt_key == "print_sequence" || opt_key == "filament_type" + || opt_key == "chamber_temperature" || opt_key == "nozzle_temperature_initial_layer" || opt_key == "filament_minimal_purge_on_wipe_tower" || opt_key == "filament_max_volumetric_speed" diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 5a3da2a51f7..61297fe5678 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -322,21 +322,6 @@ void PrintConfigDef::init_common_params() def->mode = comDevelop; def->set_default_value(new ConfigOptionStrings()); - //SoftFever - def = this->add("connection_moonraker_url", coString); - def->label = L("Moonraker URL"); - //def->tooltip = L("Names of presets related to the physical printer"); - def->mode = comAdvanced; - def->set_default_value(new ConfigOptionString("http://")); - - def = this->add("connection_port", coString); - def->label = L("Connection port"); - //def->tooltip = L("Names of presets related to the physical printer"); - def->mode = comAdvanced; - def->set_default_value(new ConfigOptionString("7125")); - - - def = this->add("print_host", coString); def->label = L("Hostname, IP or URL"); def->tooltip = L("Slic3r can upload G-code files to a printer host. This field should contain " @@ -602,6 +587,12 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Use only one wall on flat top surface, to give more space to the top infill pattern"); def->set_default_value(new ConfigOptionBool(true)); + def = this->add("only_one_wall_first_layer", coBool); + def->label = L("Only one wall on first layer"); + def->category = L("Quality"); + def->tooltip = L("Use only one wall on first layer, to give more space to the bottom infill pattern"); + def->set_default_value(new ConfigOptionBool(false)); + def = this->add("enable_overhang_speed", coBool); def->label = L("Slow down for overhang"); def->category = L("Speed"); @@ -2476,6 +2467,15 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionBool(false)); + def = this->add("chamber_temperature", coInt); + def->label = L("Chamber temperature"); + def->tooltip = L("Target chamber temperature"); + def->sidetext = L("°C"); + def->full_label = L("Chamber temperature"); + def->min = 0; + def->max = max_temp; + def->set_default_value(new ConfigOptionInt(0)); + def = this->add("nozzle_temperature", coInts); def->label = L("Other layers"); def->tooltip = L("Nozzle temperature for layers after the initial one"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 05d35fe0635..c67ae6f3342 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -682,6 +682,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionFloat, overhang_3_4_speed)) ((ConfigOptionFloat, overhang_4_4_speed)) ((ConfigOptionBool, only_one_wall_top)) + ((ConfigOptionBool, only_one_wall_first_layer)) ) PRINT_CONFIG_CLASS_DEFINE( @@ -766,10 +767,6 @@ PRINT_CONFIG_CLASS_DEFINE( //BBS ((ConfigOptionEnum, nozzle_type)) ((ConfigOptionBool, auxiliary_fan)) - //SoftFever - ((ConfigOptionString, connection_moonraker_url)) - ((ConfigOptionString, connection_port)) - ) // This object is mapped to Perl as Slic3r::Config::Print. @@ -839,6 +836,7 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE( ((ConfigOptionBool, spiral_mode)) ((ConfigOptionInt, standby_temperature_delta)) ((ConfigOptionInts, nozzle_temperature)) + ((ConfigOptionInt , chamber_temperature)) ((ConfigOptionBools, wipe)) // BBS ((ConfigOptionInts, bed_temperature_difference)) diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 00e6dd98155..823fe34967b 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -630,6 +630,7 @@ bool PrintObject::invalidate_state_by_config_options( } else if ( opt_key == "wall_loops" || opt_key == "only_one_wall_top" + || opt_key == "only_one_wall_first_layer" || opt_key == "initial_layer_line_width" || opt_key == "inner_wall_line_width" || opt_key == "infill_wall_overlap") { diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index c726e729a3d..a75f4e7d283 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1115,7 +1115,7 @@ bool MainFrame::can_send_gcode() const { if (m_plater && !m_plater->model().objects.empty()) { - auto cfg = wxGetApp().preset_bundle->printers.get_selected_preset().config; + auto cfg = wxGetApp().preset_bundle->printers.get_edited_preset().config; if (const auto *print_host_opt = cfg.option("print_host"); print_host_opt) return !print_host_opt->value.empty(); } @@ -1309,6 +1309,18 @@ wxBoxSizer* MainFrame::create_side_tools() p->Dismiss(); }); + SideButton* send_gcode_btn = new SideButton(p, _L("Send"), ""); + send_gcode_btn->SetCornerRadius(0); + send_gcode_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { + m_print_btn->SetLabel(_L("Send to print")); + m_print_select = eSendGcode; + if (m_print_enable) + m_print_enable = get_enable_print_status() && can_send_gcode(); + m_print_btn->Enable(m_print_enable); + this->Layout(); + p->Dismiss(); + }); + SideButton* export_sliced_file_3mf_btn = new SideButton(p, _L("Export sliced file (.3mf)"), ""); export_sliced_file_3mf_btn->SetCornerRadius(0); export_sliced_file_3mf_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { @@ -1332,25 +1344,14 @@ wxBoxSizer* MainFrame::create_side_tools() this->Layout(); p->Dismiss(); }); - SideButton* send_gcode_btn = new SideButton(p, _L("Send sliced file (.gcode)"), ""); - send_gcode_btn->SetCornerRadius(0); - send_gcode_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) { - m_print_btn->SetLabel(_L("Send Sliced File (.gcode)")); - m_print_select = eSendGcode; - if (m_print_enable) - m_print_enable = get_enable_print_status() && can_send_gcode(); - m_print_btn->Enable(m_print_enable); - this->Layout(); - p->Dismiss(); - }); #if ENABEL_PRINT_ALL p->append_button(print_all_btn); #endif p->append_button(print_plate_btn); + p->append_button(send_gcode_btn); p->append_button(export_sliced_file_3mf_btn); p->append_button(export_sliced_file_gcode_btn); - p->append_button(send_gcode_btn); p->Popup(m_print_btn); } ); diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index a487aa0379c..bbaac31abda 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -395,7 +395,8 @@ void PhysicalPrinterDialog::on_dpi_changed(const wxRect& suggested_rect) void PhysicalPrinterDialog::OnOK(wxEvent& event) { - event.Skip(); + wxGetApp().get_tab(Preset::TYPE_PRINTER)->save_preset(); + event.Skip(); } }} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp index f3569298cc4..ce59f85c489 100644 --- a/src/slic3r/GUI/PrintHostDialogs.cpp +++ b/src/slic3r/GUI/PrintHostDialogs.cpp @@ -37,7 +37,7 @@ static const char *CONFIG_KEY_PATH = "printhost_path"; static const char *CONFIG_KEY_GROUP = "printhost_group"; PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUploadActions post_actions, const wxArrayString &groups) - : MsgDialog(static_cast(wxGetApp().mainframe), _L("Send G-Code to printer host"), _L("Upload to Printer Host with the following filename:"),0) + : MsgDialog(static_cast(wxGetApp().mainframe), _L("Send to print"), _L("Upload to Printer Host with the following filename:"),0) , txt_filename(new wxTextCtrl(this, wxID_ANY)) , combo_groups(!groups.IsEmpty() ? new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, groups, wxCB_READONLY) : nullptr) , post_upload_action(PrintHostPostUploadAction::None) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index c86d66d9d51..b6632ab3293 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1745,6 +1745,7 @@ void TabPrint::build() optgroup->append_single_option_line("wall_infill_order"); optgroup->append_single_option_line("bridge_flow"); optgroup->append_single_option_line("only_one_wall_top"); + optgroup->append_single_option_line("only_one_wall_first_layer"); optgroup->append_single_option_line("detect_overhang_wall"); optgroup->append_single_option_line("reduce_crossing_wall"); optgroup->append_single_option_line("max_travel_detour_distance"); @@ -2413,6 +2414,10 @@ void TabFilament::build() optgroup = page->new_optgroup(L("Print temperature")); optgroup->split_multi_line = true; optgroup->option_label_at_right = true; + line = { L("Chamber temperature"), L("Chamber temperature") }; + line.append_option(optgroup->get_option("chamber_temperature")); + optgroup->append_line(line); + line = { L("Nozzle"), L("Nozzle temperature when printing") }; line.append_option(optgroup->get_option("nozzle_temperature_initial_layer")); line.append_option(optgroup->get_option("nozzle_temperature"));