diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 63217c038b..7ccb52b0e6 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -400,6 +400,16 @@ jobs: retention-days: 5 if-no-files-found: error + - name: Run external slicer regression tests + if: runner.os == 'Linux' + timeout-minutes: 20 + shell: bash + run: | + test_repo_dir="${{ runner.temp }}/orca-test-repo" + rm -rf "$test_repo_dir" + git clone --depth 1 https://github.com/OrcaSlicer/orca-test-repo.git "$test_repo_dir" + python3 "$test_repo_dir/run_test.py" "${{ github.workspace }}/build/package/bin/orca-slicer" + - name: Build orca_custom_preset_tests if: github.ref == 'refs/heads/main' && runner.os == 'Linux' && !vars.SELF_HOSTED working-directory: ${{ github.workspace }}/build/src/Release diff --git a/README.md b/README.md index 134a7acb96..ad2d6f6cfc 100644 --- a/README.md +++ b/README.md @@ -137,9 +137,27 @@ winget install --id=SoftFever.OrcaSlicer -e ![mac_security_setting](./SoftFever_doc/mac_security_setting.png) -## Linux (Ubuntu) +## Linux - 1. If you run into trouble executing it, try this command in the terminal: +### Flathub (Recommended) +OrcaSlicer is available through FlatHub: + +Download on Flathub + +Install from the command line: + +```shell +flatpak install flathub com.orcaslicer.OrcaSlicer +flatpak run com.orcaslicer.OrcaSlicer +``` + +It can also be installed through graphical software managers (KDE Discover, GNOME Software, etc.) when Flathub is enabled. Search for **OrcaSlicer** in your software center. + +### AppImage + 1. Download App image from the [releases page](https://github.com/OrcaSlicer/OrcaSlicer/releases). + 2. Double click the downloaded file to run it. + + 3. If you run into trouble executing it, try this command in the terminal: `chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage` # How to Compile diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 86c732f29b..05728b977d 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -162,7 +162,7 @@ msgstr "" msgid "Smart fill angle" msgstr "" -msgid "On overhangs only" +msgid "On highlighted overhangs only" msgstr "" msgid "Auto support threshold angle: " @@ -10183,6 +10183,9 @@ msgstr "" msgid "Switch between Prepare/Preview" msgstr "" +msgid "Toggle printable for object/part" +msgstr "" + msgid "Plater" msgstr "" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index a0b0fe6184..7960f651a6 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -177,8 +177,8 @@ msgstr "Tipus d'eina" msgid "Smart fill angle" msgstr "Angle de farciment intel·ligent" -msgid "On overhangs only" -msgstr "Només als voladissos" +msgid "On highlighted overhangs only" +msgstr "Només als voladissos ressaltats" msgid "Auto support threshold angle: " msgstr "Angle llindar de suport automàtic: " diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index 209eedd23d..2ce84a0cde 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -170,8 +170,8 @@ msgstr "Typ nástroje" msgid "Smart fill angle" msgstr "Úhel chytrého vyplnění" -msgid "On overhangs only" -msgstr "Pouze na převisy" +msgid "On highlighted overhangs only" +msgstr "Pouze na zvýrazněné převisy" msgid "Auto support threshold angle: " msgstr "Automatický prahový úhel podpěr: " diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index f507299180..8614a865d5 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -172,8 +172,8 @@ msgstr "Werkzeugtyp" msgid "Smart fill angle" msgstr "Intelligenter Füllwinkel" -msgid "On overhangs only" -msgstr "Nur an Überhängen" +msgid "On highlighted overhangs only" +msgstr "Nur an hervorgehobenen Überhängen" msgid "Auto support threshold angle: " msgstr "Winkel für automatische Supports: " diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index b0b7dced49..96d1f5c588 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -158,7 +158,7 @@ msgstr "" msgid "Smart fill angle" msgstr "" -msgid "On overhangs only" +msgid "On highlighted overhangs only" msgstr "" msgid "Auto support threshold angle: " diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 06b15cc83d..142ada0d46 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -172,8 +172,8 @@ msgstr "Tipo de herramienta" msgid "Smart fill angle" msgstr "Ángulo de relleno en puente" -msgid "On overhangs only" -msgstr "Solo en voladizos" +msgid "On highlighted overhangs only" +msgstr "Solo en voladizos resaltados" msgid "Auto support threshold angle: " msgstr "Ángulo del umbral de soporte automático: " diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 6c9e555179..3e285b8c4a 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -176,8 +176,8 @@ msgstr "Type d'outil" msgid "Smart fill angle" msgstr "Angle de remplissage intelligent" -msgid "On overhangs only" -msgstr "Sur les surplombs uniquement" +msgid "On highlighted overhangs only" +msgstr "Uniquement sur les surplombs mis en évidence" msgid "Auto support threshold angle: " msgstr "Angle de seuil de support automatique : " diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index 7253ad7b9b..80d440642e 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -169,8 +169,8 @@ msgstr "Eszköz típusa" msgid "Smart fill angle" msgstr "Okos kitöltési szög" -msgid "On overhangs only" -msgstr "Csak túlnyúlásokon" +msgid "On highlighted overhangs only" +msgstr "Csak a kiemelt túlnyúlásokon" msgid "Auto support threshold angle: " msgstr "Automatikus támasz szögének határértéke: " diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 6d94aa6b32..b33ae653af 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -172,8 +172,8 @@ msgstr "Tipo di strumento" msgid "Smart fill angle" msgstr "Angolo di riempimento intelligente" -msgid "On overhangs only" -msgstr "Solo sulle sporgenze" +msgid "On highlighted overhangs only" +msgstr "Solo sulle sporgenze evidenziate" msgid "Auto support threshold angle: " msgstr "Angolo di soglia per supporto automatico: " diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index cea37fa2be..7a3d446f82 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -171,8 +171,8 @@ msgstr "ツールタイプ" msgid "Smart fill angle" msgstr "自動充填角度" -msgid "On overhangs only" -msgstr "オーバーハングのみ" +msgid "On highlighted overhangs only" +msgstr "強調表示されたオーバーハングのみ" msgid "Auto support threshold angle: " msgstr "自動サポート角度閾値" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index dd075ac401..ec0168dd4c 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -173,8 +173,8 @@ msgstr "도구 유형" msgid "Smart fill angle" msgstr "스마트 채우기 각도" -msgid "On overhangs only" -msgstr "오버행에만 칠하기" +msgid "On highlighted overhangs only" +msgstr "강조된 오버행에만 칠하기" msgid "Auto support threshold angle: " msgstr "자동 서포트 임계값 각도: " diff --git a/localization/i18n/lt/OrcaSlicer_lt.po b/localization/i18n/lt/OrcaSlicer_lt.po index f29efb596a..877e0693c8 100644 --- a/localization/i18n/lt/OrcaSlicer_lt.po +++ b/localization/i18n/lt/OrcaSlicer_lt.po @@ -172,8 +172,8 @@ msgstr "Įrankio tipas" msgid "Smart fill angle" msgstr "Išmanaus užpildymo kampas" -msgid "On overhangs only" -msgstr "Tik kabantiems" +msgid "On highlighted overhangs only" +msgstr "Tik paryškintiems kabantiems" msgid "Auto support threshold angle: " msgstr "Automatinių atramų generavimo kampas: " @@ -11223,6 +11223,9 @@ msgstr "Nutolinti" msgid "Switch between Prepare/Preview" msgstr "Perjungimas tarp Paruošti / Peržiūrėti" +msgid "Toggle printable for object/part" +msgstr "Perjungti objekto / dalies spausdinimą" + msgid "Plater" msgstr "Plokštė" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index f79ac30055..7266a862b7 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -166,8 +166,8 @@ msgstr "Hulpmiddel type" msgid "Smart fill angle" msgstr "Slim vullen hoek" -msgid "On overhangs only" -msgstr "Alleen op overhangen" +msgid "On highlighted overhangs only" +msgstr "Alleen op gemarkeerde overhangen" msgid "Auto support threshold angle: " msgstr "Maximale hoek automatische ondersteuning: " diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index d50186e7d5..b991f18681 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -164,8 +164,8 @@ msgstr "Typ narzędzia" msgid "Smart fill angle" msgstr "Kąt inteligentnego wypełniania" -msgid "On overhangs only" -msgstr "Tylko na nawisach" +msgid "On highlighted overhangs only" +msgstr "Tylko na podświetlonych nawisach" msgid "Auto support threshold angle: " msgstr "Automatyczny kąt progowy podpory: " diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 5f9ba1a7d6..4c2bc0d138 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -178,8 +178,8 @@ msgstr "Tipo de ferramenta" msgid "Smart fill angle" msgstr "Ângulo de preenchimento inteligente" -msgid "On overhangs only" -msgstr "Apenas em saliências" +msgid "On highlighted overhangs only" +msgstr "Apenas em saliências destacadas" msgid "Auto support threshold angle: " msgstr "Ângulo limiar de suporte automático: " diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 238b3c425f..c344999ab3 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -185,8 +185,8 @@ msgstr "Инструмент" msgid "Smart fill angle" msgstr "Угол для умной заливки" -msgid "On overhangs only" -msgstr "Только на нависаниях" +msgid "On highlighted overhangs only" +msgstr "Только на подсвеченных нависаниях" msgid "Auto support threshold angle: " msgstr "Пороговый угол автоподдержки: " diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 629f4ac711..4a7e8b3acc 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -163,8 +163,8 @@ msgstr "Verktygs typ" msgid "Smart fill angle" msgstr "Smart fyllningsvinkel" -msgid "On overhangs only" -msgstr "Endast på överhäng" +msgid "On highlighted overhangs only" +msgstr "Endast på markerade överhäng" msgid "Auto support threshold angle: " msgstr "Automatisk support tröskelsvinkel: " diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 7d7de2ab9c..84238e9b72 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -157,8 +157,8 @@ msgstr "Araç türü" msgid "Smart fill angle" msgstr "Akıllı doldurma açısı" -msgid "On overhangs only" -msgstr "Yalnızca çıkıntılarda" +msgid "On highlighted overhangs only" +msgstr "Yalnızca vurgulanan çıkıntılarda" msgid "Auto support threshold angle: " msgstr "Otomatik destek eşik açısı: " diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 182ff0c978..56737be7e8 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -168,8 +168,8 @@ msgstr "Тип інструменту" msgid "Smart fill angle" msgstr "Кут розумного заповнення" -msgid "On overhangs only" -msgstr "Тільки на нависаннях" +msgid "On highlighted overhangs only" +msgstr "Тільки на підсвічених нависанняхх" msgid "Auto support threshold angle: " msgstr "Поріг кута автоматичної підтримки: " diff --git a/localization/i18n/vi/OrcaSlicer_vi.po b/localization/i18n/vi/OrcaSlicer_vi.po index 8f7d1314ad..5ece6f7a7b 100644 --- a/localization/i18n/vi/OrcaSlicer_vi.po +++ b/localization/i18n/vi/OrcaSlicer_vi.po @@ -167,8 +167,8 @@ msgstr "Loại công cụ" msgid "Smart fill angle" msgstr "Góc tô thông minh" -msgid "On overhangs only" -msgstr "Chỉ trên overhang" +msgid "On highlighted overhangs only" +msgstr "Chỉ trên các overhang được làm nổi bật" msgid "Auto support threshold angle: " msgstr "Góc ngưỡng tự động support: " diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 2c68d0b76f..c1af59fa3c 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -161,8 +161,8 @@ msgstr "工具类型" msgid "Smart fill angle" msgstr "智能填充角度" -msgid "On overhangs only" -msgstr "仅对悬垂区生效" +msgid "On highlighted overhangs only" +msgstr "仅对高亮悬垂区生效" msgid "Auto support threshold angle: " msgstr "自动支撑角度阈值：" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index dd0a69a8d3..035ef1d0e2 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -166,8 +166,8 @@ msgstr "筆刷類型" msgid "Smart fill angle" msgstr "智慧填充角度" -msgid "On overhangs only" -msgstr "僅對懸空區生效" +msgid "On highlighted overhangs only" +msgstr "僅對高亮懸空區生效" msgid "Auto support threshold angle: " msgstr "自動支撐角度臨界值：" diff --git a/resources/profiles/Anet/Anet A8 Plus(A8+)_cover.png b/resources/profiles/Anet/Anet A8 Plus(A8+)_cover.png index 45751c102a..4eb1ee93b2 100644 Binary files a/resources/profiles/Anet/Anet A8 Plus(A8+)_cover.png and b/resources/profiles/Anet/Anet A8 Plus(A8+)_cover.png differ diff --git a/resources/profiles/Anker/M5-CE-bed.stl b/resources/profiles/Anker/M5-CE-bed.stl index 1eabb0f624..dbbc4ddf52 100644 Binary files a/resources/profiles/Anker/M5-CE-bed.stl and b/resources/profiles/Anker/M5-CE-bed.stl differ diff --git a/resources/profiles/Anker/M5-CE-texture.svg b/resources/profiles/Anker/M5-CE-texture.svg index 4cdb0870a0..1e2da43d9b 100644 --- a/resources/profiles/Anker/M5-CE-texture.svg +++ b/resources/profiles/Anker/M5-CE-texture.svg @@ -1,15 +1 @@ - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anker/M5C-CE-bed.stl b/resources/profiles/Anker/M5C-CE-bed.stl index c4a049d4cf..d749a497d3 100644 Binary files a/resources/profiles/Anker/M5C-CE-bed.stl and b/resources/profiles/Anker/M5C-CE-bed.stl differ diff --git a/resources/profiles/Anycubic.json b/resources/profiles/Anycubic.json index 703ff4b67f..7133ca042a 100644 --- a/resources/profiles/Anycubic.json +++ b/resources/profiles/Anycubic.json @@ -1,6 +1,6 @@ { "name": "Anycubic", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Anycubic configurations", "machine_model_list": [ diff --git a/resources/profiles/Anycubic/Anycubic Kobra 2 Max_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Kobra 2 Max_buildplate_texture.svg index 6a55e654fa..03be7099c0 100644 --- a/resources/profiles/Anycubic/Anycubic Kobra 2 Max_buildplate_texture.svg +++ b/resources/profiles/Anycubic/Anycubic Kobra 2 Max_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anycubic/Anycubic Kobra 2 Neo_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Kobra 2 Neo_buildplate_texture.svg index ad8da5b767..6a8cf5a88e 100644 --- a/resources/profiles/Anycubic/Anycubic Kobra 2 Neo_buildplate_texture.svg +++ b/resources/profiles/Anycubic/Anycubic Kobra 2 Neo_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anycubic/Anycubic Kobra 2 Plus_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Kobra 2 Plus_buildplate_texture.svg index ad8da5b767..0896a4f515 100644 --- a/resources/profiles/Anycubic/Anycubic Kobra 2 Plus_buildplate_texture.svg +++ b/resources/profiles/Anycubic/Anycubic Kobra 2 Plus_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anycubic/Anycubic Kobra 2 Pro_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Kobra 2 Pro_buildplate_texture.svg index ad8da5b767..6a8cf5a88e 100644 --- a/resources/profiles/Anycubic/Anycubic Kobra 2 Pro_buildplate_texture.svg +++ b/resources/profiles/Anycubic/Anycubic Kobra 2 Pro_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anycubic/Anycubic Kobra 3_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Kobra 3_buildplate_texture.svg index 7a93488599..2e2fbf5cd3 100644 --- a/resources/profiles/Anycubic/Anycubic Kobra 3_buildplate_texture.svg +++ b/resources/profiles/Anycubic/Anycubic Kobra 3_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_model.stl b/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_model.stl index 110fcd0eb5..a61a4b99ef 100644 Binary files a/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_model.stl and b/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_model.stl differ diff --git a/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_texture.png b/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_texture.png deleted file mode 100644 index 19459df233..0000000000 Binary files a/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_texture.svg new file mode 100644 index 0000000000..6a8cf5a88e --- /dev/null +++ b/resources/profiles/Anycubic/Anycubic Kobra Neo_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/Anycubic Kobra Neo_cover.png b/resources/profiles/Anycubic/Anycubic Kobra Neo_cover.png index 50f3897ae3..6dda396acd 100644 Binary files a/resources/profiles/Anycubic/Anycubic Kobra Neo_cover.png and b/resources/profiles/Anycubic/Anycubic Kobra Neo_cover.png differ diff --git a/resources/profiles/Anycubic/Anycubic Kobra S1_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Kobra S1_buildplate_texture.svg index c1d8b5a3c5..d85e27cfcd 100644 --- a/resources/profiles/Anycubic/Anycubic Kobra S1_buildplate_texture.svg +++ b/resources/profiles/Anycubic/Anycubic Kobra S1_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anycubic/Anycubic Predator_buildplate_model.stl b/resources/profiles/Anycubic/Anycubic Predator_buildplate_model.stl index fc5b568a0d..7c6d564329 100644 Binary files a/resources/profiles/Anycubic/Anycubic Predator_buildplate_model.stl and b/resources/profiles/Anycubic/Anycubic Predator_buildplate_model.stl differ diff --git a/resources/profiles/Anycubic/Anycubic Predator_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Predator_buildplate_texture.svg index 0bbeb0f6cc..2fbbe4bf20 100644 --- a/resources/profiles/Anycubic/Anycubic Predator_buildplate_texture.svg +++ b/resources/profiles/Anycubic/Anycubic Predator_buildplate_texture.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/profiles/Anycubic/Anycubic Predator_cover.png b/resources/profiles/Anycubic/Anycubic Predator_cover.png index 5e7627ad1c..590f671440 100644 Binary files a/resources/profiles/Anycubic/Anycubic Predator_cover.png and b/resources/profiles/Anycubic/Anycubic Predator_cover.png differ diff --git a/resources/profiles/Anycubic/anycubic_4maxpro2_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_4maxpro2_buildplate_texture.png deleted file mode 100644 index 7a90dd9851..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_4maxpro2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_4maxpro2_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_4maxpro2_buildplate_texture.svg new file mode 100644 index 0000000000..a122289e27 --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_4maxpro2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/anycubic_4maxpro_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_4maxpro_buildplate_texture.png deleted file mode 100644 index c337cd7db6..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_4maxpro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_4maxpro_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_4maxpro_buildplate_texture.svg new file mode 100644 index 0000000000..e8a84e3263 --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_4maxpro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/anycubic_chiron_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_chiron_buildplate_texture.png deleted file mode 100644 index deff97a0cc..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_chiron_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_chiron_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_chiron_buildplate_texture.svg new file mode 100644 index 0000000000..437ed6975b --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_chiron_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/anycubic_i3megas_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_i3megas_buildplate_texture.png deleted file mode 100644 index b3636b7536..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_i3megas_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_i3megas_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_i3megas_buildplate_texture.svg new file mode 100644 index 0000000000..b2deeb31f1 --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_i3megas_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/anycubic_kobra2_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_kobra2_buildplate_texture.png deleted file mode 100644 index 9e77229309..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_kobra2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_kobra2_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_kobra2_buildplate_texture.svg new file mode 100644 index 0000000000..6a8cf5a88e --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_kobra2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/anycubic_kobra_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_kobra_buildplate_texture.png deleted file mode 100644 index 03346770fe..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_kobra_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_kobra_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_kobra_buildplate_texture.svg new file mode 100644 index 0000000000..6a8cf5a88e --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_kobra_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/anycubic_kobramax_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_kobramax_buildplate_texture.png deleted file mode 100644 index deff97a0cc..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_kobramax_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_kobramax_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_kobramax_buildplate_texture.svg new file mode 100644 index 0000000000..8a06659749 --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_kobramax_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/anycubic_kobraplus_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_kobraplus_buildplate_texture.png deleted file mode 100644 index deff97a0cc..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_kobraplus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_kobraplus_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_kobraplus_buildplate_texture.svg new file mode 100644 index 0000000000..1194da9cd2 --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_kobraplus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/anycubic_vyper_buildplate_texture.png b/resources/profiles/Anycubic/anycubic_vyper_buildplate_texture.png deleted file mode 100644 index b540ef090c..0000000000 Binary files a/resources/profiles/Anycubic/anycubic_vyper_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Anycubic/anycubic_vyper_buildplate_texture.svg b/resources/profiles/Anycubic/anycubic_vyper_buildplate_texture.svg new file mode 100644 index 0000000000..87ba120aaa --- /dev/null +++ b/resources/profiles/Anycubic/anycubic_vyper_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json index ab5b14da63..e54851b41c 100644 --- a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json +++ b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_4maxpro2_buildplate_model.stl", - "bed_texture": "anycubic_4maxpro2_buildplate_texture.png", + "bed_texture": "anycubic_4maxpro2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json index c90b7fce09..95144dab59 100644 --- a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json +++ b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_4maxpro_buildplate_model.stl", - "bed_texture": "anycubic_4maxpro_buildplate_texture.png", + "bed_texture": "anycubic_4maxpro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Chiron.json b/resources/profiles/Anycubic/machine/Anycubic Chiron.json index 646a86a01d..2772464526 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Chiron.json +++ b/resources/profiles/Anycubic/machine/Anycubic Chiron.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_chiron_buildplate_model.stl", - "bed_texture": "anycubic_chiron_buildplate_texture.png", + "bed_texture": "anycubic_chiron_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 2.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 2.json index 7387ee4144..545ea61e1d 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 2.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_kobra2_buildplate_model.stl", - "bed_texture": "anycubic_kobra2_buildplate_texture.png", + "bed_texture": "anycubic_kobra2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Max.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Max.json index ad87583d2e..fd3939620e 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Max.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_kobramax_buildplate_model.stl", - "bed_texture": "anycubic_kobramax_buildplate_texture.png", + "bed_texture": "anycubic_kobramax_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Neo.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Neo.json index 4b8bc82660..80effe6e8b 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Neo.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Neo.json @@ -6,7 +6,7 @@ "model_id": "Anycubic Kobra Neo", "nozzle_diameter": "0.4", "bed_model": "Anycubic Kobra Neo_buildplate_model.stl", - "bed_texture": "Anycubic Kobra Neo_buildplate_texture.png", + "bed_texture": "Anycubic Kobra Neo_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic PLA" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Plus.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Plus.json index e9c2ca5dfd..6a30264849 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Plus.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_kobraplus_buildplate_model.stl", - "bed_texture": "anycubic_kobraplus_buildplate_texture.png", + "bed_texture": "anycubic_kobraplus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra.json b/resources/profiles/Anycubic/machine/Anycubic Kobra.json index 39683f52cc..bbc1f460c3 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_kobra_buildplate_model.stl", - "bed_texture": "anycubic_kobra_buildplate_texture.png", + "bed_texture": "anycubic_kobra_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Vyper.json b/resources/profiles/Anycubic/machine/Anycubic Vyper.json index 0e0b874a56..862af26c4a 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Vyper.json +++ b/resources/profiles/Anycubic/machine/Anycubic Vyper.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_vyper_buildplate_model.stl", - "bed_texture": "anycubic_vyper_buildplate_texture.png", + "bed_texture": "anycubic_vyper_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json b/resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json index a5cef6af53..76192d1e21 100644 --- a/resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json +++ b/resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Anycubic", "bed_model": "anycubic_i3megas_buildplate_model.stl", - "bed_texture": "anycubic_i3megas_buildplate_texture.png", + "bed_texture": "anycubic_i3megas_buildplate_texture.svg", "hotend_model": "", "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" } diff --git a/resources/profiles/Artillery.json b/resources/profiles/Artillery.json index ad640a3166..977d5c4d10 100644 --- a/resources/profiles/Artillery.json +++ b/resources/profiles/Artillery.json @@ -1,6 +1,6 @@ { "name": "Artillery", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Artillery configurations", "machine_model_list": [ diff --git a/resources/profiles/Artillery/artillery_genius_buildplate_texture.png b/resources/profiles/Artillery/artillery_genius_buildplate_texture.png deleted file mode 100644 index 9eaa212dc2..0000000000 Binary files a/resources/profiles/Artillery/artillery_genius_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Artillery/artillery_genius_buildplate_texture.svg b/resources/profiles/Artillery/artillery_genius_buildplate_texture.svg new file mode 100644 index 0000000000..4dc3cdfe1a --- /dev/null +++ b/resources/profiles/Artillery/artillery_genius_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Artillery/artillery_geniuspro_buildplate_texture.png b/resources/profiles/Artillery/artillery_geniuspro_buildplate_texture.png deleted file mode 100644 index 9eaa212dc2..0000000000 Binary files a/resources/profiles/Artillery/artillery_geniuspro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Artillery/artillery_geniuspro_buildplate_texture.svg b/resources/profiles/Artillery/artillery_geniuspro_buildplate_texture.svg new file mode 100644 index 0000000000..4dc3cdfe1a --- /dev/null +++ b/resources/profiles/Artillery/artillery_geniuspro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Artillery/artillery_hornet_buildplate_texture.png b/resources/profiles/Artillery/artillery_hornet_buildplate_texture.png deleted file mode 100644 index 9eaa212dc2..0000000000 Binary files a/resources/profiles/Artillery/artillery_hornet_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Artillery/artillery_hornet_buildplate_texture.svg b/resources/profiles/Artillery/artillery_hornet_buildplate_texture.svg new file mode 100644 index 0000000000..ddc5d9eb26 --- /dev/null +++ b/resources/profiles/Artillery/artillery_hornet_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Artillery/artillery_m1_pro_buildplate_model.stl b/resources/profiles/Artillery/artillery_m1_pro_buildplate_model.stl index c0459d478c..b3c211c16a 100644 Binary files a/resources/profiles/Artillery/artillery_m1_pro_buildplate_model.stl and b/resources/profiles/Artillery/artillery_m1_pro_buildplate_model.stl differ diff --git a/resources/profiles/Artillery/artillery_m1_pro_buildplate_texture.svg b/resources/profiles/Artillery/artillery_m1_pro_buildplate_texture.svg index dbc8b8008f..9a25a849dd 100644 --- a/resources/profiles/Artillery/artillery_m1_pro_buildplate_texture.svg +++ b/resources/profiles/Artillery/artillery_m1_pro_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Artillery/artillery_sidewinderx1_buildplate_texture.png b/resources/profiles/Artillery/artillery_sidewinderx1_buildplate_texture.png deleted file mode 100644 index e97bce28ca..0000000000 Binary files a/resources/profiles/Artillery/artillery_sidewinderx1_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Artillery/artillery_sidewinderx1_buildplate_texture.svg b/resources/profiles/Artillery/artillery_sidewinderx1_buildplate_texture.svg new file mode 100644 index 0000000000..8e2433260c --- /dev/null +++ b/resources/profiles/Artillery/artillery_sidewinderx1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.png b/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.png deleted file mode 100644 index e97bce28ca..0000000000 Binary files a/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.svg b/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.svg new file mode 100644 index 0000000000..8e2433260c --- /dev/null +++ b/resources/profiles/Artillery/artillery_sidewinderx2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Artillery/machine/Artillery Genius Pro.json b/resources/profiles/Artillery/machine/Artillery Genius Pro.json index cf4966f7a3..6af35f73a6 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius Pro.json +++ b/resources/profiles/Artillery/machine/Artillery Genius Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Artillery", "bed_model": "artillery_geniuspro_buildplate_model.stl", - "bed_texture": "artillery_geniuspro_buildplate_texture.png", + "bed_texture": "artillery_geniuspro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" } diff --git a/resources/profiles/Artillery/machine/Artillery Genius.json b/resources/profiles/Artillery/machine/Artillery Genius.json index e5a47788cb..31c021230b 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius.json +++ b/resources/profiles/Artillery/machine/Artillery Genius.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Artillery", "bed_model": "artillery_genius_buildplate_model.stl", - "bed_texture": "artillery_genius_buildplate_texture.png", + "bed_texture": "artillery_genius_buildplate_texture.svg", "hotend_model": "", "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" } diff --git a/resources/profiles/Artillery/machine/Artillery Hornet.json b/resources/profiles/Artillery/machine/Artillery Hornet.json index 46e828cf48..c0e680e039 100644 --- a/resources/profiles/Artillery/machine/Artillery Hornet.json +++ b/resources/profiles/Artillery/machine/Artillery Hornet.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Artillery", "bed_model": "artillery_hornet_buildplate_model.stl", - "bed_texture": "artillery_hornet_buildplate_texture.png", + "bed_texture": "artillery_hornet_buildplate_texture.svg", "hotend_model": "", "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" } diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X1.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X1.json index 3f06ed8ff5..5d5f13f511 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X1.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Artillery", "bed_model": "artillery_sidewinderx1_buildplate_model.stl", - "bed_texture": "artillery_sidewinderx1_buildplate_texture.png", + "bed_texture": "artillery_sidewinderx1_buildplate_texture.svg", "hotend_model": "", "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" } diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json index 63939f0a9d..79922cfe8b 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Artillery", "bed_model": "artillery_sidewinderx2_buildplate_model.stl", - "bed_texture": "artillery_sidewinderx2_buildplate_texture.png", + "bed_texture": "artillery_sidewinderx2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" } diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 9ef394a9aa..c9f0e6a73c 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -7704,6 +7704,982 @@ { "name": "fdm_filament_dual_common", "sub_path": "filament/fdm_filament_dual_common.json" + }, + { + "name": "BETA ABS @base", + "sub_path": "filament/BETA/BETA ABS @base.json" + }, + { + "name": "BETA ABS @BBL P1P", + "sub_path": "filament/BETA/BETA ABS @BBL P1P.json" + }, + { + "name": "BETA ABS @BBL A1", + "sub_path": "filament/BETA/BETA ABS @BBL A1.json" + }, + { + "name": "BETA ABS @BBL H2D", + "sub_path": "filament/BETA/BETA ABS @BBL H2D.json" + }, + { + "name": "BETA ABS @BBL X1C", + "sub_path": "filament/BETA/BETA ABS @BBL X1C.json" + }, + { + "name": "BETA ASA @base", + "sub_path": "filament/BETA/BETA ASA @base.json" + }, + { + "name": "BETA ASA @BBL A1 0.4 nozzle", + "sub_path": "filament/BETA/BETA ASA @BBL A1 0.4 nozzle.json" + }, + { + "name": "BETA ASA @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA ASA @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA ASA @BBL X1C 0.4 nozzle", + "sub_path": "filament/BETA/BETA ASA @BBL X1C 0.4 nozzle.json" + }, + { + "name": "BETA PLA Silk+ @base", + "sub_path": "filament/BETA/BETA PLA Silk+ @base.json" + }, + { + "name": "BETA PLA Silk+ @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Silk+ @BBL P1P.json" + }, + { + "name": "BETA PLA Silk+ @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Silk+ @BBL X1C.json" + }, + { + "name": "BETA PLA Silk+ @BBL A1", + "sub_path": "filament/BETA/BETA PLA Silk+ @BBL A1.json" + }, + { + "name": "BETA PLA Silk+ @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Silk+ @BBL A1M.json" + }, + { + "name": "BETA PLA Silk+ @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Silk+ @BBL H2D.json" + }, + { + "name": "BETA PAHT-CF @base", + "sub_path": "filament/BETA/BETA PAHT-CF @base.json" + }, + { + "name": "BETA PAHT-CF @BBL P1P", + "sub_path": "filament/BETA/BETA PAHT-CF @BBL P1P.json" + }, + { + "name": "BETA PAHT-CF @BBL H2D", + "sub_path": "filament/BETA/BETA PAHT-CF @BBL H2D.json" + }, + { + "name": "BETA PAHT-CF @BBL X1C", + "sub_path": "filament/BETA/BETA PAHT-CF @BBL X1C.json" + }, + { + "name": "BETA PEBA 90A @base", + "sub_path": "filament/BETA/BETA PEBA 90A @base.json" + }, + { + "name": "BETA PEBA 90A @BBL A1", + "sub_path": "filament/BETA/BETA PEBA 90A @BBL A1.json" + }, + { + "name": "BETA PEBA 90A @BBL A1M", + "sub_path": "filament/BETA/BETA PEBA 90A @BBL A1M.json" + }, + { + "name": "BETA PEBA 90A @BBL H2D", + "sub_path": "filament/BETA/BETA PEBA 90A @BBL H2D.json" + }, + { + "name": "BETA PEBA 90A @BBL P1P", + "sub_path": "filament/BETA/BETA PEBA 90A @BBL P1P.json" + }, + { + "name": "BETA PEBA 90A @BBL X1C", + "sub_path": "filament/BETA/BETA PEBA 90A @BBL X1C.json" + }, + { + "name": "BETA PETG Heat Color Change @base", + "sub_path": "filament/BETA/BETA PETG Heat Color Change @base.json" + }, + { + "name": "BETA PETG Heat Color Change @BBL A1", + "sub_path": "filament/BETA/BETA PETG Heat Color Change @BBL A1.json" + }, + { + "name": "BETA PETG Heat Color Change @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Heat Color Change @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Heat Color Change @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Heat Color Change @BBL X1C.json" + }, + { + "name": "BETA PETG Fluorescence @base", + "sub_path": "filament/BETA/BETA PETG Fluorescence @base.json" + }, + { + "name": "BETA PETG Fluorescence @BBL A1", + "sub_path": "filament/BETA/BETA PETG Fluorescence @BBL A1.json" + }, + { + "name": "BETA PETG Fluorescence @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Fluorescence @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Fluorescence @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Fluorescence @BBL X1C.json" + }, + { + "name": "BETA PETG Glitter @base", + "sub_path": "filament/BETA/BETA PETG Glitter @base.json" + }, + { + "name": "BETA PETG Glitter @BBL A1", + "sub_path": "filament/BETA/BETA PETG Glitter @BBL A1.json" + }, + { + "name": "BETA PETG Glitter @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Glitter @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Glitter @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Glitter @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Glitter @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Glitter @BBL X1C.json" + }, + { + "name": "BETA PETG Glow @base", + "sub_path": "filament/BETA/BETA PETG Glow @base.json" + }, + { + "name": "BETA PETG Glow @BBL A1", + "sub_path": "filament/BETA/BETA PETG Glow @BBL A1.json" + }, + { + "name": "BETA PETG Glow @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Glow @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Glow @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Glow @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Glow @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Glow @BBL X1C.json" + }, + { + "name": "BETA PETG Gradient @base", + "sub_path": "filament/BETA/BETA PETG Gradient @base.json" + }, + { + "name": "BETA PETG Gradient @BBL A1", + "sub_path": "filament/BETA/BETA PETG Gradient @BBL A1.json" + }, + { + "name": "BETA PETG Gradient @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Gradient @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Gradient @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Gradient @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Gradient @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Gradient @BBL X1C.json" + }, + { + "name": "BETA PETG HF @base", + "sub_path": "filament/BETA/BETA PETG HF @base.json" + }, + { + "name": "BETA PETG HF @BBL A1", + "sub_path": "filament/BETA/BETA PETG HF @BBL A1.json" + }, + { + "name": "BETA PETG HF @BBL A1M", + "sub_path": "filament/BETA/BETA PETG HF @BBL A1M.json" + }, + { + "name": "BETA PETG HF @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG HF @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG HF @BBL X1C", + "sub_path": "filament/BETA/BETA PETG HF @BBL X1C.json" + }, + { + "name": "BETA PETG Marble @base", + "sub_path": "filament/BETA/BETA PETG Marble @base.json" + }, + { + "name": "BETA PETG Marble @BBL A1", + "sub_path": "filament/BETA/BETA PETG Marble @BBL A1.json" + }, + { + "name": "BETA PETG Marble @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Marble @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Marble @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Marble @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Marble @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Marble @BBL X1C.json" + }, + { + "name": "BETA PETG Matte @base", + "sub_path": "filament/BETA/BETA PETG Matte @base.json" + }, + { + "name": "BETA PETG Matte @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Matte @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Matte @BBL A1", + "sub_path": "filament/BETA/BETA PETG Matte @BBL A1.json" + }, + { + "name": "BETA PETG Matte @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Matte @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Matte @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Matte @BBL X1C.json" + }, + { + "name": "BETA PETG Metallic @base", + "sub_path": "filament/BETA/BETA PETG Metallic @base.json" + }, + { + "name": "BETA PETG Metallic @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Metallic @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Metallic @BBL A1", + "sub_path": "filament/BETA/BETA PETG Metallic @BBL A1.json" + }, + { + "name": "BETA PETG Metallic @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Metallic @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Metallic @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Metallic @BBL X1C.json" + }, + { + "name": "BETA PETG Transparent @base", + "sub_path": "filament/BETA/BETA PETG Transparent @base.json" + }, + { + "name": "BETA PETG Transparent @BBL A1", + "sub_path": "filament/BETA/BETA PETG Transparent @BBL A1.json" + }, + { + "name": "BETA PETG Transparent @BBL A1M", + "sub_path": "filament/BETA/BETA PETG Transparent @BBL A1M.json" + }, + { + "name": "BETA PETG Transparent @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG Transparent @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Transparent @BBL X1C", + "sub_path": "filament/BETA/BETA PETG Transparent @BBL X1C.json" + }, + { + "name": "BETA PETG UV Color Change @base", + "sub_path": "filament/BETA/BETA PETG UV Color Change @base.json" + }, + { + "name": "BETA PETG UV Color Change @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG UV Color Change @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG UV Color Change @BBL A1", + "sub_path": "filament/BETA/BETA PETG UV Color Change @BBL A1.json" + }, + { + "name": "BETA PETG UV Color Change @BBL X1C", + "sub_path": "filament/BETA/BETA PETG UV Color Change @BBL X1C.json" + }, + { + "name": "BETA PETG-CF @base", + "sub_path": "filament/BETA/BETA PETG-CF @base.json" + }, + { + "name": "BETA PETG-CF @BBL P1P 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-CF @BBL P1P 0.4 nozzle.json" + }, + { + "name": "BETA PETG-CF @BBL A1 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-CF @BBL A1 0.4 nozzle.json" + }, + { + "name": "BETA PETG-CF @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-CF @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG-CF @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-CF @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG-CF @BBL X1C 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-CF @BBL X1C 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @base", + "sub_path": "filament/BETA/BETA PETG-GF @base.json" + }, + { + "name": "BETA PETG-GF @BBL P1P 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-GF @BBL P1P 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL A1 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-GF @BBL A1 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-GF @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-GF @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL X1C 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG-GF @BBL X1C 0.4 nozzle.json" + }, + { + "name": "BETA PETG @base", + "sub_path": "filament/BETA/BETA PETG @base.json" + }, + { + "name": "BETA PETG @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PETG @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG @BBL A1", + "sub_path": "filament/BETA/BETA PETG @BBL A1.json" + }, + { + "name": "BETA PETG @BBL X1C", + "sub_path": "filament/BETA/BETA PETG @BBL X1C.json" + }, + { + "name": "BETA PLA Basic @base", + "sub_path": "filament/BETA/BETA PLA Basic @base.json" + }, + { + "name": "BETA PLA Basic @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Basic @BBL P1P.json" + }, + { + "name": "BETA PLA Basic @BBL A1", + "sub_path": "filament/BETA/BETA PLA Basic @BBL A1.json" + }, + { + "name": "BETA PLA Basic @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Basic @BBL A1M.json" + }, + { + "name": "BETA PLA Basic @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Basic @BBL H2D.json" + }, + { + "name": "BETA PLA Basic @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Basic @BBL X1C.json" + }, + { + "name": "BETA PLA Chameleon @base", + "sub_path": "filament/BETA/BETA PLA Chameleon @base.json" + }, + { + "name": "BETA PLA Chameleon @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Chameleon @BBL P1P.json" + }, + { + "name": "BETA PLA Chameleon @BBL A1", + "sub_path": "filament/BETA/BETA PLA Chameleon @BBL A1.json" + }, + { + "name": "BETA PLA Chameleon @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Chameleon @BBL A1M.json" + }, + { + "name": "BETA PLA Chameleon @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Chameleon @BBL H2D.json" + }, + { + "name": "BETA PLA Chameleon @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Chameleon @BBL X1C.json" + }, + { + "name": "BETA PLA Heat Color Change @base", + "sub_path": "filament/BETA/BETA PLA Heat Color Change @base.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL P1P.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL A1", + "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL A1.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL A1M.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL H2D.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL X1C.json" + }, + { + "name": "BETA PLA Fluorescence @base", + "sub_path": "filament/BETA/BETA PLA Fluorescence @base.json" + }, + { + "name": "BETA PLA Fluorescence @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL P1P.json" + }, + { + "name": "BETA PLA Fluorescence @BBL A1", + "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL A1.json" + }, + { + "name": "BETA PLA Fluorescence @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL A1M.json" + }, + { + "name": "BETA PLA Fluorescence @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL H2D.json" + }, + { + "name": "BETA PLA Fluorescence @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL X1C.json" + }, + { + "name": "BETA PLA Glitter @base", + "sub_path": "filament/BETA/BETA PLA Glitter @base.json" + }, + { + "name": "BETA PLA Glitter @BBL A1", + "sub_path": "filament/BETA/BETA PLA Glitter @BBL A1.json" + }, + { + "name": "BETA PLA Glitter @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Glitter @BBL A1M.json" + }, + { + "name": "BETA PLA Glitter @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Glitter @BBL H2D.json" + }, + { + "name": "BETA PLA Glitter @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Glitter @BBL P1P.json" + }, + { + "name": "BETA PLA Glitter @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Glitter @BBL X1C.json" + }, + { + "name": "BETA PLA Glow @base", + "sub_path": "filament/BETA/BETA PLA Glow @base.json" + }, + { + "name": "BETA PLA Glow @BBL A1", + "sub_path": "filament/BETA/BETA PLA Glow @BBL A1.json" + }, + { + "name": "BETA PLA Glow @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Glow @BBL A1M.json" + }, + { + "name": "BETA PLA Glow @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Glow @BBL H2D.json" + }, + { + "name": "BETA PLA Glow @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Glow @BBL P1P.json" + }, + { + "name": "BETA PLA Glow @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Glow @BBL X1C.json" + }, + { + "name": "BETA PLA Gradient @base", + "sub_path": "filament/BETA/BETA PLA Gradient @base.json" + }, + { + "name": "BETA PLA Gradient @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Gradient @BBL H2D.json" + }, + { + "name": "BETA PLA Gradient @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Gradient @BBL P1P.json" + }, + { + "name": "BETA PLA Gradient @BBL A1", + "sub_path": "filament/BETA/BETA PLA Gradient @BBL A1.json" + }, + { + "name": "BETA PLA Gradient @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Gradient @BBL A1M.json" + }, + { + "name": "BETA PLA Gradient @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Gradient @BBL X1C.json" + }, + { + "name": "BETA PLA Marble @base", + "sub_path": "filament/BETA/BETA PLA Marble @base.json" + }, + { + "name": "BETA PLA Marble @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Marble @BBL H2D.json" + }, + { + "name": "BETA PLA Marble @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Marble @BBL P1P.json" + }, + { + "name": "BETA PLA Marble @BBL A1", + "sub_path": "filament/BETA/BETA PLA Marble @BBL A1.json" + }, + { + "name": "BETA PLA Marble @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Marble @BBL A1M.json" + }, + { + "name": "BETA PLA Marble @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Marble @BBL X1C.json" + }, + { + "name": "BETA PLA Matte @base", + "sub_path": "filament/BETA/BETA PLA Matte @base.json" + }, + { + "name": "BETA PLA Matte @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Matte @BBL P1P.json" + }, + { + "name": "BETA PLA Matte @BBL A1", + "sub_path": "filament/BETA/BETA PLA Matte @BBL A1.json" + }, + { + "name": "BETA PLA Matte @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Matte @BBL A1M.json" + }, + { + "name": "BETA PLA Matte @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Matte @BBL H2D.json" + }, + { + "name": "BETA PLA Matte @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Matte @BBL X1C.json" + }, + { + "name": "BETA PLA Metal @base", + "sub_path": "filament/BETA/BETA PLA Metal @base.json" + }, + { + "name": "BETA PLA Metal @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Metal @BBL P1P.json" + }, + { + "name": "BETA PLA Metal @BBL A1", + "sub_path": "filament/BETA/BETA PLA Metal @BBL A1.json" + }, + { + "name": "BETA PLA Metal @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Metal @BBL A1M.json" + }, + { + "name": "BETA PLA Metal @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Metal @BBL H2D.json" + }, + { + "name": "BETA PLA Metal @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Metal @BBL X1C.json" + }, + { + "name": "BETA PLA Metallic @base", + "sub_path": "filament/BETA/BETA PLA Metallic @base.json" + }, + { + "name": "BETA PLA Metallic @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Metallic @BBL H2D.json" + }, + { + "name": "BETA PLA Metallic @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Metallic @BBL P1P.json" + }, + { + "name": "BETA PLA Metallic @BBL A1", + "sub_path": "filament/BETA/BETA PLA Metallic @BBL A1.json" + }, + { + "name": "BETA PLA Metallic @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Metallic @BBL A1M.json" + }, + { + "name": "BETA PLA Metallic @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Metallic @BBL X1C.json" + }, + { + "name": "BETA PLA PRO @base", + "sub_path": "filament/BETA/BETA PLA PRO @base.json" + }, + { + "name": "BETA PLA PRO @BBL P1P", + "sub_path": "filament/BETA/BETA PLA PRO @BBL P1P.json" + }, + { + "name": "BETA PLA PRO @BBL A1", + "sub_path": "filament/BETA/BETA PLA PRO @BBL A1.json" + }, + { + "name": "BETA PLA PRO @BBL A1M", + "sub_path": "filament/BETA/BETA PLA PRO @BBL A1M.json" + }, + { + "name": "BETA PLA PRO @BBL H2D", + "sub_path": "filament/BETA/BETA PLA PRO @BBL H2D.json" + }, + { + "name": "BETA PLA PRO @BBL X1C", + "sub_path": "filament/BETA/BETA PLA PRO @BBL X1C.json" + }, + { + "name": "BETA PLA Silk @base", + "sub_path": "filament/BETA/BETA PLA Silk @base.json" + }, + { + "name": "BETA PLA Silk @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Silk @BBL P1P.json" + }, + { + "name": "BETA PLA Silk @BBL A1", + "sub_path": "filament/BETA/BETA PLA Silk @BBL A1.json" + }, + { + "name": "BETA PLA Silk @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Silk @BBL A1M.json" + }, + { + "name": "BETA PLA Silk @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Silk @BBL H2D.json" + }, + { + "name": "BETA PLA Silk @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Silk @BBL X1C.json" + }, + { + "name": "BETA PLA Transparent @base", + "sub_path": "filament/BETA/BETA PLA Transparent @base.json" + }, + { + "name": "BETA PLA Transparent @BBL A1", + "sub_path": "filament/BETA/BETA PLA Transparent @BBL A1.json" + }, + { + "name": "BETA PLA Transparent @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Transparent @BBL A1M.json" + }, + { + "name": "BETA PLA Transparent @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Transparent @BBL H2D.json" + }, + { + "name": "BETA PLA Transparent @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Transparent @BBL P1P.json" + }, + { + "name": "BETA PLA Transparent @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Transparent @BBL X1C.json" + }, + { + "name": "BETA PLA UV Color Change @base", + "sub_path": "filament/BETA/BETA PLA UV Color Change @base.json" + }, + { + "name": "BETA PLA UV Color Change @BBL P1P", + "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL P1P.json" + }, + { + "name": "BETA PLA UV Color Change @BBL A1", + "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL A1.json" + }, + { + "name": "BETA PLA UV Color Change @BBL A1M", + "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL A1M.json" + }, + { + "name": "BETA PLA UV Color Change @BBL H2D", + "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL H2D.json" + }, + { + "name": "BETA PLA UV Color Change @BBL X1C", + "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL X1C.json" + }, + { + "name": "BETA PLA Youth @base", + "sub_path": "filament/BETA/BETA PLA Youth @base.json" + }, + { + "name": "BETA PLA Youth @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Youth @BBL X1C.json" + }, + { + "name": "BETA PLA Youth @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Youth @BBL A1M.json" + }, + { + "name": "BETA PLA Youth @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Youth @BBL P1P.json" + }, + { + "name": "BETA PLA Youth @BBL A1", + "sub_path": "filament/BETA/BETA PLA Youth @BBL A1.json" + }, + { + "name": "BETA PLA Youth @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Youth @BBL H2D.json" + }, + { + "name": "BETA PLA-CF @base", + "sub_path": "filament/BETA/BETA PLA-CF @base.json" + }, + { + "name": "BETA PLA-CF @BBL A1", + "sub_path": "filament/BETA/BETA PLA-CF @BBL A1.json" + }, + { + "name": "BETA PLA-CF @BBL A1M", + "sub_path": "filament/BETA/BETA PLA-CF @BBL A1M.json" + }, + { + "name": "BETA PLA-CF @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BETA PLA-CF @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PLA-CF @BBL P1P", + "sub_path": "filament/BETA/BETA PLA-CF @BBL P1P.json" + }, + { + "name": "BETA PLA-CF @BBL X1C", + "sub_path": "filament/BETA/BETA PLA-CF @BBL X1C.json" + }, + { + "name": "BETA PLA High Temp @base", + "sub_path": "filament/BETA/BETA PLA High Temp @base.json" + }, + { + "name": "BETA PLA High Temp @BBL P1P", + "sub_path": "filament/BETA/BETA PLA High Temp @BBL P1P.json" + }, + { + "name": "BETA PLA High Temp @BBL X1C", + "sub_path": "filament/BETA/BETA PLA High Temp @BBL X1C.json" + }, + { + "name": "BETA PLA High Temp @BBL A1", + "sub_path": "filament/BETA/BETA PLA High Temp @BBL A1.json" + }, + { + "name": "BETA PLA High Temp @BBL A1M", + "sub_path": "filament/BETA/BETA PLA High Temp @BBL A1M.json" + }, + { + "name": "BETA PLA High Temp @BBL H2D", + "sub_path": "filament/BETA/BETA PLA High Temp @BBL H2D.json" + }, + { + "name": "BETA PLA Wood @base", + "sub_path": "filament/BETA/BETA PLA Wood @base.json" + }, + { + "name": "BETA PLA Wood @BBL A1", + "sub_path": "filament/BETA/BETA PLA Wood @BBL A1.json" + }, + { + "name": "BETA PLA Wood @BBL A1M", + "sub_path": "filament/BETA/BETA PLA Wood @BBL A1M.json" + }, + { + "name": "BETA PLA Wood @BBL H2D", + "sub_path": "filament/BETA/BETA PLA Wood @BBL H2D.json" + }, + { + "name": "BETA PLA Wood @BBL P1P", + "sub_path": "filament/BETA/BETA PLA Wood @BBL P1P.json" + }, + { + "name": "BETA PLA Wood @BBL X1C", + "sub_path": "filament/BETA/BETA PLA Wood @BBL X1C.json" + }, + { + "name": "BETA TPU Matte @base", + "sub_path": "filament/BETA/BETA TPU Matte @base.json" + }, + { + "name": "BETA TPU Matte @BBL A1", + "sub_path": "filament/BETA/BETA TPU Matte @BBL A1.json" + }, + { + "name": "BETA TPU Matte @BBL A1M", + "sub_path": "filament/BETA/BETA TPU Matte @BBL A1M.json" + }, + { + "name": "BETA TPU Matte @BBL H2D", + "sub_path": "filament/BETA/BETA TPU Matte @BBL H2D.json" + }, + { + "name": "BETA TPU Matte @BBL P1P", + "sub_path": "filament/BETA/BETA TPU Matte @BBL P1P.json" + }, + { + "name": "BETA TPU Matte @BBL X1C", + "sub_path": "filament/BETA/BETA TPU Matte @BBL X1C.json" + }, + { + "name": "BETA TPU 95A @base", + "sub_path": "filament/BETA/BETA TPU 95A @base.json" + }, + { + "name": "BETA TPU 95A @BBL A1", + "sub_path": "filament/BETA/BETA TPU 95A @BBL A1.json" + }, + { + "name": "BETA TPU 95A @BBL A1M", + "sub_path": "filament/BETA/BETA TPU 95A @BBL A1M.json" + }, + { + "name": "BETA TPU 95A @BBL H2D", + "sub_path": "filament/BETA/BETA TPU 95A @BBL H2D.json" + }, + { + "name": "BETA TPU 95A @BBL P1P", + "sub_path": "filament/BETA/BETA TPU 95A @BBL P1P.json" + }, + { + "name": "BETA TPU 95A @BBL X1C", + "sub_path": "filament/BETA/BETA TPU 95A @BBL X1C.json" + }, + { + "name": "BETA TPU 98A @base", + "sub_path": "filament/BETA/BETA TPU 98A @base.json" + }, + { + "name": "BETA TPU 98A @BBL A1", + "sub_path": "filament/BETA/BETA TPU 98A @BBL A1.json" + }, + { + "name": "BETA TPU 98A @BBL A1M", + "sub_path": "filament/BETA/BETA TPU 98A @BBL A1M.json" + }, + { + "name": "BETA TPU 98A @BBL H2D", + "sub_path": "filament/BETA/BETA TPU 98A @BBL H2D.json" + }, + { + "name": "BETA TPU 98A @BBL P1P", + "sub_path": "filament/BETA/BETA TPU 98A @BBL P1P.json" + }, + { + "name": "BETA TPU 98A @BBL X1C", + "sub_path": "filament/BETA/BETA TPU 98A @BBL X1C.json" + }, + { + "name": "BETA TPU 90A @base", + "sub_path": "filament/BETA/BETA TPU 90A @base.json" + }, + { + "name": "BETA TPU 90A @BBL A1", + "sub_path": "filament/BETA/BETA TPU 90A @BBL A1.json" + }, + { + "name": "BETA TPU 90A @BBL A1M", + "sub_path": "filament/BETA/BETA TPU 90A @BBL A1M.json" + }, + { + "name": "BETA TPU 90A @BBL H2D", + "sub_path": "filament/BETA/BETA TPU 90A @BBL H2D.json" + }, + { + "name": "BETA TPU 90A @BBL P1P", + "sub_path": "filament/BETA/BETA TPU 90A @BBL P1P.json" + }, + { + "name": "BETA TPU 90A @BBL X1C", + "sub_path": "filament/BETA/BETA TPU 90A @BBL X1C.json" + }, + { + "name": "BETA PLA High Speed @base", + "sub_path": "filament/BETA/BETA PLA High Speed @base.json" + }, + { + "name": "BETA PLA High Speed @BBL A1", + "sub_path": "filament/BETA/BETA PLA High Speed @BBL A1.json" + }, + { + "name": "BETA PLA High Speed @BBL A1M", + "sub_path": "filament/BETA/BETA PLA High Speed @BBL A1M.json" + }, + { + "name": "BETA PLA High Speed @BBL H2D", + "sub_path": "filament/BETA/BETA PLA High Speed @BBL H2D.json" + }, + { + "name": "BETA PLA High Speed @BBL P1P", + "sub_path": "filament/BETA/BETA PLA High Speed @BBL P1P.json" + }, + { + "name": "BETA PLA High Speed @BBL X1C", + "sub_path": "filament/BETA/BETA PLA High Speed @BBL X1C.json" + }, + { + "name": "BETA HIPS @base", + "sub_path": "filament/BETA/BETA HIPS @base.json" + }, + { + "name": "BETA HIPS @BBL H2D", + "sub_path": "filament/BETA/BETA HIPS @BBL H2D.json" + }, + { + "name": "BETA HIPS @BBL X1C", + "sub_path": "filament/BETA/BETA HIPS @BBL X1C.json" } ], "machine_list": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA ABS @BBL A1.json new file mode 100644 index 0000000000..97348b871d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ABS @BBL A1.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA ABS @BBL A1", + "inherits": "BETA ABS @base", + "from": "system", + "setting_id": "BABB00_07", + "instantiation": "true", + "fan_max_speed": [ + "20" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "textured_plate_temp": [ + "100" + ], + "textured_plate_temp_initial_layer": [ + "100" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA ABS @BBL H2D.json new file mode 100644 index 0000000000..d4c4fda0ba --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ABS @BBL H2D.json @@ -0,0 +1,134 @@ +{ + "type": "filament", + "name": "BETA ABS @BBL H2D", + "inherits": "BETA ABS @base", + "from": "system", + "setting_id": "BABB00_11", + "instantiation": "true", + "chamber_temperatures": [ + "65" + ], + "fan_max_speed": [ + "60" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "20", + "35" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "270", + "270" + ], + "nozzle_temperature_initial_layer": [ + "260", + "260" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "slow_down_layer_time": [ + "12" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA ABS @BBL P1P.json new file mode 100644 index 0000000000..c9c9bbfe4b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ABS @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA ABS @BBL P1P", + "inherits": "BETA ABS @base", + "from": "system", + "setting_id": "BABB00_03", + "instantiation": "true", + "fan_max_speed": [ + "20" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "16", + "16" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "270", + "270" + ], + "nozzle_temperature_initial_layer": [ + "260", + "260" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "textured_plate_temp": [ + "100" + ], + "textured_plate_temp_initial_layer": [ + "100" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA ABS @BBL X1C.json new file mode 100644 index 0000000000..b6682d512a --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ABS @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA ABS @BBL X1C", + "inherits": "BETA ABS @base", + "from": "system", + "setting_id": "BABB00", + "instantiation": "true", + "fan_max_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "16", + "16" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "270", + "270" + ], + "nozzle_temperature_initial_layer": [ + "260", + "260" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @base.json b/resources/profiles/BBL/filament/BETA/BETA ABS @base.json new file mode 100644 index 0000000000..38e7aa5c12 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ABS @base.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "BETA ABS @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "BABB00", + "instantiation": "false", + "description": "When printing this filament, there's a risk of warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.", + "filament_cost": [ + "24.99" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "7.4" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL A1 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA ASA @BBL A1 0.4 nozzle.json new file mode 100644 index 0000000000..3aaff7f087 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ASA @BBL A1 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "name": "BETA ASA @BBL A1 0.4 nozzle", + "inherits": "BETA ASA @base", + "from": "system", + "setting_id": "BASB00_09", + "instantiation": "true", + "chamber_temperatures": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA ASA @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..66569a778a --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ASA @BBL H2D 0.4 nozzle.json @@ -0,0 +1,149 @@ +{ + "type": "filament", + "name": "BETA ASA @BBL H2D 0.4 nozzle", + "inherits": "BETA ASA @base", + "from": "system", + "setting_id": "BASB00_13", + "instantiation": "true", + "chamber_temperatures": [ + "65" + ], + "counter_coef_2": [ + "0.007" + ], + "counter_coef_3": [ + "0.003" + ], + "counter_limit_max": [ + "0.1" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "20", + "35" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_2": [ + "-0.006" + ], + "hole_coef_3": [ + "0.25" + ], + "hole_limit_min": [ + "-0.088" + ], + "hole_limit_max": [ + "0.14" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "270", + "270" + ], + "nozzle_temperature_initial_layer": [ + "270", + "270" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL X1C 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA ASA @BBL X1C 0.4 nozzle.json new file mode 100644 index 0000000000..3420b95e62 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ASA @BBL X1C 0.4 nozzle.json @@ -0,0 +1,126 @@ +{ + "type": "filament", + "name": "BETA ASA @BBL X1C 0.4 nozzle", + "inherits": "BETA ASA @base", + "from": "system", + "setting_id": "BASB00_02", + "instantiation": "true", + "chamber_temperatures": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "270", + "270" + ], + "nozzle_temperature_initial_layer": [ + "270", + "270" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @base.json b/resources/profiles/BBL/filament/BETA/BETA ASA @base.json new file mode 100644 index 0000000000..a36f654b02 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA ASA @base.json @@ -0,0 +1,57 @@ +{ + "type": "filament", + "name": "BETA ASA @base", + "inherits": "fdm_filament_asa", + "from": "system", + "filament_id": "BASB00", + "instantiation": "false", + "description": "When printing this filament, there's a risk of warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.", + "eng_plate_temp": [ + "100" + ], + "eng_plate_temp_initial_layer": [ + "100" + ], + "fan_max_speed": [ + "35" + ], + "filament_cost": [ + "31.99" + ], + "filament_density": [ + "1.05" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_vendor": [ + "BETA" + ], + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "impact_strength_z": [ + "4.9" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "slow_down_layer_time": [ + "12" + ], + "textured_plate_temp": [ + "100" + ], + "textured_plate_temp_initial_layer": [ + "100" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL H2D.json new file mode 100644 index 0000000000..7975343472 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL H2D.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA HIPS @BBL H2D", + "inherits": "BETA HIPS @base", + "from": "system", + "setting_id": "BHIB00_06", + "instantiation": "true", + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "8", + "8" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "240", + "240" + ], + "nozzle_temperature_initial_layer": [ + "240", + "240" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL X1C.json new file mode 100644 index 0000000000..7f8204ab99 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL X1C.json @@ -0,0 +1,133 @@ +{ + "type": "filament", + "name": "BETA HIPS @BBL X1C", + "inherits": "BETA HIPS @base", + "from": "system", + "setting_id": "BHIB00_00", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "8", + "8" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "240", + "240" + ], + "nozzle_temperature_initial_layer": [ + "240", + "240" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json b/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json new file mode 100644 index 0000000000..2647bc3397 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "BETA HIPS @base", + "inherits": "fdm_filament_hips", + "from": "system", + "filament_id": "BHIB00", + "instantiation": "false", + "filament_is_support": [ + "1" + ], + "filament_vendor": [ + "BETA" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL H2D.json new file mode 100644 index 0000000000..283b174880 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL H2D.json @@ -0,0 +1,139 @@ +{ + "type": "filament", + "name": "BETA PAHT-CF @BBL H2D", + "inherits": "BETA PAHT-CF @base", + "from": "system", + "setting_id": "BPAB00_01", + "instantiation": "true", + "chamber_temperatures": [ + "60" + ], + "counter_coef_2": [ + "0.00545" + ], + "counter_coef_3": [ + "-0.0202" + ], + "counter_limit_max": [ + "0.03" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.96", + "0.96" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "8", + "8" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "290", + "290" + ], + "nozzle_temperature_initial_layer": [ + "290", + "290" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL P1P.json new file mode 100644 index 0000000000..020684ae9d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL P1P.json @@ -0,0 +1,121 @@ +{ + "type": "filament", + "name": "BETA PAHT-CF @BBL P1P", + "inherits": "BETA PAHT-CF @base", + "from": "system", + "setting_id": "BPAB00_10", + "instantiation": "true", + "filament_flow_ratio": [ + "0.96", + "0.96" + ], + "filament_max_volumetric_speed": [ + "8", + "8" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "290", + "290" + ], + "nozzle_temperature_initial_layer": [ + "290", + "290" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL X1C.json new file mode 100644 index 0000000000..2d07f60dd7 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL X1C.json @@ -0,0 +1,133 @@ +{ + "type": "filament", + "name": "BETA PAHT-CF @BBL X1C", + "inherits": "BETA PAHT-CF @base", + "from": "system", + "setting_id": "BPAB00", + "instantiation": "true", + "chamber_temperatures": [ + "60" + ], + "filament_flow_ratio": [ + "0.96", + "0.96" + ], + "filament_max_volumetric_speed": [ + "8", + "8" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "290", + "290" + ], + "nozzle_temperature_initial_layer": [ + "290", + "290" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json new file mode 100644 index 0000000000..c0116f418c --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "BETA PAHT-CF @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "BPAB00", + "instantiation": "false", + "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.", + "fan_cooling_layer_time": [ + "5" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "94.99" + ], + "filament_density": [ + "1.06" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_type": [ + "PA-CF" + ], + "filament_vendor": [ + "BETA" + ], + "full_fan_speed_layer": [ + "2" + ], + "impact_strength_z": [ + "13.3" + ], + "overhang_fan_speed": [ + "40" + ], + "overhang_fan_threshold": [ + "0%" + ], + "temperature_vitrification": [ + "180" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1.json new file mode 100644 index 0000000000..5d2672ea39 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "name": "BETA PEBA 90A @BBL A1", + "inherits": "BETA PEBA 90A @base", + "from": "system", + "setting_id": "BPBB00_04", + "instantiation": "true", + "filament_density": [ + "1.22" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "45" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1M.json new file mode 100644 index 0000000000..65a899ec25 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1M.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "name": "BETA PEBA 90A @BBL A1M", + "inherits": "BETA PEBA 90A @base", + "from": "system", + "setting_id": "BPBB00_05", + "instantiation": "true", + "filament_density": [ + "1.22" + ], + "hot_plate_temp": [ + "30" + ], + "hot_plate_temp_initial_layer": [ + "30" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "textured_plate_temp": [ + "30" + ], + "textured_plate_temp_initial_layer": [ + "30" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle", + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL H2D.json new file mode 100644 index 0000000000..15e570c0ef --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL H2D.json @@ -0,0 +1,145 @@ +{ + "type": "filament", + "name": "BETA PEBA 90A @BBL H2D", + "inherits": "BETA PEBA 90A @base", + "from": "system", + "setting_id": "BPBB00_02", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "100" + ], + "eng_plate_temp": [ + "35" + ], + "eng_plate_temp_initial_layer": [ + "35" + ], + "filament_deretraction_speed": [ + "10", + "10" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_ramming_volumetric_speed": [ + "0.7", + "0.7" + ], + "filament_printable": [ + "2" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "2", + "2" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "10", + "10" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "195", + "195" + ], + "filament_ramming_travel_time": [ + "20", + "20" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "impact_strength_z": [ + "88.7" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL P1P.json new file mode 100644 index 0000000000..d84427a067 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL P1P.json @@ -0,0 +1,121 @@ +{ + "type": "filament", + "name": "BETA PEBA 90A @BBL P1P", + "inherits": "BETA PEBA 90A @base", + "from": "system", + "setting_id": "BPBB00_01", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL X1C.json new file mode 100644 index 0000000000..9787ec8671 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PEBA 90A @BBL X1C", + "inherits": "BETA PEBA 90A @base", + "from": "system", + "setting_id": "BPBB00_00", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json new file mode 100644 index 0000000000..d92ceb29b1 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json @@ -0,0 +1,33 @@ +{ + "type": "filament", + "name": "BETA PEBA 90A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "BPBB00", + "instantiation": "false", + "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.", + "filament_cost": [ + "59.99" + ], + "filament_max_volumetric_speed": [ + "2.8" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "87.3" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_initial_layer": [ + "225" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_layer_time": [ + "14" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1.json new file mode 100644 index 0000000000..e66cac62b6 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG @BBL A1", + "inherits": "BETA PETG @base", + "from": "system", + "setting_id": "BPGB00_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..0831aa7d3e --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG @base", + "from": "system", + "setting_id": "BPGB00_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..5f581768f2 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG @base", + "from": "system", + "setting_id": "BPGB00_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG @BBL X1C.json new file mode 100644 index 0000000000..5a92aaf386 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG @BBL X1C", + "inherits": "BETA PETG @base", + "from": "system", + "setting_id": "BPGB00_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG @base.json new file mode 100644 index 0000000000..9d15c065f5 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB00", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1.json new file mode 100644 index 0000000000..4afed91de9 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Fluorescence @BBL A1", + "inherits": "BETA PETG Fluorescence @base", + "from": "system", + "setting_id": "BPGB02_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..3dea382bb2 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Fluorescence @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG Fluorescence @base", + "from": "system", + "setting_id": "BPGB02_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..62dfb7753f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG Fluorescence @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Fluorescence @base", + "from": "system", + "setting_id": "BPGB02_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL X1C.json new file mode 100644 index 0000000000..88562c9da2 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG Fluorescence @BBL X1C", + "inherits": "BETA PETG Fluorescence @base", + "from": "system", + "setting_id": "BPGB02_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json new file mode 100644 index 0000000000..b9b0032612 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG Fluorescence @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB02", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1.json new file mode 100644 index 0000000000..d3a13707b4 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Glitter @BBL A1", + "inherits": "BETA PETG Glitter @base", + "from": "system", + "setting_id": "BPGB03_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..2b12feac1e --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Glitter @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG Glitter @base", + "from": "system", + "setting_id": "BPGB03_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..988f09054d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG Glitter @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Glitter @base", + "from": "system", + "setting_id": "BPGB03_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL X1C.json new file mode 100644 index 0000000000..8eb9ef276f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG Glitter @BBL X1C", + "inherits": "BETA PETG Glitter @base", + "from": "system", + "setting_id": "BPGB03_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json new file mode 100644 index 0000000000..70d84d21d3 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG Glitter @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB03", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1.json new file mode 100644 index 0000000000..039a6b5a77 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Glow @BBL A1", + "inherits": "BETA PETG Glow @base", + "from": "system", + "setting_id": "BPGB04_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..30a1290c7f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Glow @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG Glow @base", + "from": "system", + "setting_id": "BPGB04_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..d460a13719 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG Glow @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Glow @base", + "from": "system", + "setting_id": "BPGB04_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL X1C.json new file mode 100644 index 0000000000..e599deed02 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG Glow @BBL X1C", + "inherits": "BETA PETG Glow @base", + "from": "system", + "setting_id": "BPGB04_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json new file mode 100644 index 0000000000..7da99e23fc --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG Glow @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB04", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1.json new file mode 100644 index 0000000000..8c732afcf6 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Gradient @BBL A1", + "inherits": "BETA PETG Gradient @base", + "from": "system", + "setting_id": "BPGB05_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..c7dd29444b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Gradient @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG Gradient @base", + "from": "system", + "setting_id": "BPGB05_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..078a954fd6 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG Gradient @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Gradient @base", + "from": "system", + "setting_id": "BPGB05_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL X1C.json new file mode 100644 index 0000000000..0bca3fd849 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG Gradient @BBL X1C", + "inherits": "BETA PETG Gradient @base", + "from": "system", + "setting_id": "BPGB05_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json new file mode 100644 index 0000000000..6f6e891503 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG Gradient @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB05", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1.json new file mode 100644 index 0000000000..4fa56ff56c --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "BETA PETG HF @BBL A1", + "inherits": "BETA PETG HF @base", + "from": "system", + "setting_id": "BPGB06_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "15" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "nozzle_temperature": [ + "240" + ], + "overhang_fan_speed": [ + "100" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "7" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1M.json new file mode 100644 index 0000000000..4594b057e3 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1M.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "BETA PETG HF @BBL A1M", + "inherits": "BETA PETG HF @base", + "from": "system", + "setting_id": "BPGB06_06", + "instantiation": "true", + "fan_cooling_layer_time": [ + "15" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "nozzle_temperature": [ + "240" + ], + "overhang_fan_speed": [ + "100" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "7" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..5af6977e37 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL H2D 0.4 nozzle.json @@ -0,0 +1,164 @@ +{ + "type": "filament", + "name": "BETA PETG HF @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG HF @base", + "from": "system", + "setting_id": "BPGB06_09", + "instantiation": "true", + "counter_coef_2": [ + "0.007" + ], + "counter_coef_3": [ + "0.003" + ], + "counter_limit_max": [ + "0.1" + ], + "fan_cooling_layer_time": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "25", + "40" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "30" + ], + "hole_coef_2": [ + "-0.006" + ], + "hole_coef_3": [ + "0.1" + ], + "hole_limit_min": [ + "0.1" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "245", + "245" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "overhang_fan_speed": [ + "100" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "slow_down_layer_time": [ + "10" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL X1C.json new file mode 100644 index 0000000000..e880bef58f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL X1C.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG HF @BBL X1C", + "inherits": "BETA PETG HF @base", + "from": "system", + "setting_id": "BPGB06_00", + "instantiation": "true", + "fan_cooling_layer_time": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "245", + "245" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "overhang_fan_speed": [ + "100" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "10" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json new file mode 100644 index 0000000000..1ce6e4299e --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json @@ -0,0 +1,89 @@ +{ + "type": "filament", + "name": "BETA PETG HF @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB06", + "instantiation": "false", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.28" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_vendor": [ + "BETA" + ], + "filament_change_length": [ + "12" + ], + "filament_prime_volume": [ + "30" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "10.6" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "slow_down_layer_time": [ + "12" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1.json new file mode 100644 index 0000000000..178a75b1cc --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Heat Color Change @BBL A1", + "inherits": "BETA PETG Heat Color Change @base", + "from": "system", + "setting_id": "BPGB01_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..62371b18de --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Heat Color Change @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG Heat Color Change @base", + "from": "system", + "setting_id": "BPGB01_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..e94aec5705 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG Heat Color Change @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Heat Color Change @base", + "from": "system", + "setting_id": "BPGB01_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL X1C.json new file mode 100644 index 0000000000..9b3cec67e5 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG Heat Color Change @BBL X1C", + "inherits": "BETA PETG Heat Color Change @base", + "from": "system", + "setting_id": "BPGB01_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json new file mode 100644 index 0000000000..32a62c63b7 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG Heat Color Change @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB01", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1.json new file mode 100644 index 0000000000..829f200312 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Marble @BBL A1", + "inherits": "BETA PETG Marble @base", + "from": "system", + "setting_id": "BPGB07_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..b0cb67eb0e --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Marble @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG Marble @base", + "from": "system", + "setting_id": "BPGB07_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..2f510ad7ab --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG Marble @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Marble @base", + "from": "system", + "setting_id": "BPGB07_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL X1C.json new file mode 100644 index 0000000000..3b38034011 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG Marble @BBL X1C", + "inherits": "BETA PETG Marble @base", + "from": "system", + "setting_id": "BPGB07_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json new file mode 100644 index 0000000000..30c79b2db5 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG Marble @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB07", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1.json new file mode 100644 index 0000000000..a8062a0de5 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Matte @BBL A1", + "inherits": "BETA PETG Matte @base", + "from": "system", + "setting_id": "BPGB08_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..2ed2cd9930 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Matte @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG Matte @base", + "from": "system", + "setting_id": "BPGB08_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..edfdacc993 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG Matte @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Matte @base", + "from": "system", + "setting_id": "BPGB08_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL X1C.json new file mode 100644 index 0000000000..763594b41d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG Matte @BBL X1C", + "inherits": "BETA PETG Matte @base", + "from": "system", + "setting_id": "BPGB08_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json new file mode 100644 index 0000000000..c7278e20dd --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG Matte @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB08", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1.json new file mode 100644 index 0000000000..715ebc1ad1 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Metallic @BBL A1", + "inherits": "BETA PETG Metallic @base", + "from": "system", + "setting_id": "BPGB09_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..85b11b2e80 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG Metallic @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG Metallic @base", + "from": "system", + "setting_id": "BPGB09_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..c00e63bf3d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG Metallic @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Metallic @base", + "from": "system", + "setting_id": "BPGB09_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL X1C.json new file mode 100644 index 0000000000..71f0be98d3 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG Metallic @BBL X1C", + "inherits": "BETA PETG Metallic @base", + "from": "system", + "setting_id": "BPGB09_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json new file mode 100644 index 0000000000..b2d9ce8524 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG Metallic @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB09", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1.json new file mode 100644 index 0000000000..53202d68d2 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PETG Transparent @BBL A1", + "inherits": "BETA PETG Transparent @base", + "from": "system", + "setting_id": "BPGB10_05", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.3" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1M.json new file mode 100644 index 0000000000..0419cdd3d4 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1M.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PETG Transparent @BBL A1M", + "inherits": "BETA PETG Transparent @base", + "from": "system", + "setting_id": "BPGB10_02", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.3" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..e0e2c984aa --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL H2D 0.4 nozzle.json @@ -0,0 +1,131 @@ +{ + "type": "filament", + "name": "BETA PETG Transparent @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG Transparent @base", + "from": "system", + "setting_id": "BPGB10_06", + "instantiation": "true", + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "6", + "6" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "245", + "245" + ], + "nozzle_temperature_initial_layer": [ + "250", + "250" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "slow_down_layer_time": [ + "8" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL X1C.json new file mode 100644 index 0000000000..102dbce7bf --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL X1C.json @@ -0,0 +1,126 @@ +{ + "type": "filament", + "name": "BETA PETG Transparent @BBL X1C", + "inherits": "BETA PETG Transparent @base", + "from": "system", + "setting_id": "BPGB10_00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.3", + "0.3" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_max_volumetric_speed": [ + "6", + "6" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "245", + "245" + ], + "nozzle_temperature_initial_layer": [ + "250", + "250" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json new file mode 100644 index 0000000000..6378e0cfdd --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json @@ -0,0 +1,84 @@ +{ + "type": "filament", + "name": "BETA PETG Transparent @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB10", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "filament_vendor": [ + "BETA" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "7.2" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "slow_down_layer_time": [ + "12" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1.json new file mode 100644 index 0000000000..fd0e5b8e0d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG UV Color Change @BBL A1", + "inherits": "BETA PETG UV Color Change @base", + "from": "system", + "setting_id": "BPGB11_06", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..9b8d64318c --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PETG UV Color Change @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG UV Color Change @base", + "from": "system", + "setting_id": "BPGB11_03", + "instantiation": "true", + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop_types": [ + "Spiral Lift" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "pre_start_fan_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..2ff953dc88 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json @@ -0,0 +1,138 @@ +{ + "type": "filament", + "name": "BETA PETG UV Color Change @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG UV Color Change @base", + "from": "system", + "setting_id": "BPGB11_09", + "instantiation": "true", + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "250", + "250" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL X1C.json new file mode 100644 index 0000000000..cd5be66bf3 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PETG UV Color Change @BBL X1C", + "inherits": "BETA PETG UV Color Change @base", + "from": "system", + "setting_id": "BPGB11_01", + "instantiation": "true", + "fan_min_speed": [ + "20" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "245", + "245" + ], + "override_process_overhang_speed": [ + "0", + "0" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json new file mode 100644 index 0000000000..53717f5be3 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "name": "BETA PETG UV Color Change @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB11", + "instantiation": "false", + "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "filament_prime_volume_nc": [ + "60" + ], + "first_x_layer_fan_speed": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_change_length_nc": [ + "10" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "13.6" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "override_process_overhang_speed": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1 0.4 nozzle.json new file mode 100644 index 0000000000..4e15c8fc86 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1 0.4 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "BETA PETG-CF @BBL A1 0.4 nozzle", + "inherits": "BETA PETG-CF @base", + "from": "system", + "setting_id": "BPGB12_05", + "instantiation": "true", + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "5" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "9" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "overhang_fan_speed": [ + "100" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..d19e61f946 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1M 0.4 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "BETA PETG-CF @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG-CF @base", + "from": "system", + "setting_id": "BPGB12_04", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "9" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..fd47d4f843 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL H2D 0.4 nozzle.json @@ -0,0 +1,155 @@ +{ + "type": "filament", + "name": "BETA PETG-CF @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG-CF @base", + "from": "system", + "setting_id": "BPGB12_08", + "instantiation": "true", + "counter_coef_2": [ + "0.00565" + ], + "counter_coef_3": [ + "-0.0112" + ], + "counter_limit_max": [ + "0.065" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "5" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "11.5", + "11.5" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_2": [ + "-0.0121" + ], + "hole_coef_3": [ + "0.145" + ], + "hole_limit_min": [ + "0.068" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255" + ], + "overhang_fan_speed": [ + "100" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL P1P 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL P1P 0.4 nozzle.json new file mode 100644 index 0000000000..845086dfe1 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL P1P 0.4 nozzle.json @@ -0,0 +1,131 @@ +{ + "type": "filament", + "name": "BETA PETG-CF @BBL P1P 0.4 nozzle", + "inherits": "BETA PETG-CF @base", + "from": "system", + "setting_id": "BPGB12_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "5" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "11.5", + "11.5" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255" + ], + "overhang_fan_speed": [ + "100" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL X1C 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL X1C 0.4 nozzle.json new file mode 100644 index 0000000000..4c8bf18ae3 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL X1C 0.4 nozzle.json @@ -0,0 +1,134 @@ +{ + "type": "filament", + "name": "BETA PETG-CF @BBL X1C 0.4 nozzle", + "inherits": "BETA PETG-CF @base", + "from": "system", + "setting_id": "BPGB12_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "5" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "11.5", + "11.5" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255" + ], + "overhang_fan_speed": [ + "100" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json new file mode 100644 index 0000000000..165d5a56b8 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json @@ -0,0 +1,83 @@ +{ + "type": "filament", + "name": "BETA PETG-CF @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB12", + "instantiation": "false", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "0" + ], + "filament_cost": [ + "34.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "14" + ], + "filament_type": [ + "PETG-CF" + ], + "filament_vendor": [ + "BETA" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "10.7" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "required_nozzle_HRC": [ + "40" + ], + "slow_down_layer_time": [ + "6" + ], + "temperature_vitrification": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1 0.4 nozzle.json new file mode 100644 index 0000000000..719dd3ddfe --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1 0.4 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "BETA PETG-GF @BBL A1 0.4 nozzle", + "inherits": "BETA PETG-GF @base", + "from": "system", + "setting_id": "BPGB13_05", + "instantiation": "true", + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "5" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "9" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "overhang_fan_speed": [ + "100" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1M 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1M 0.4 nozzle.json new file mode 100644 index 0000000000..f874d81f46 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1M 0.4 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "BETA PETG-GF @BBL A1M 0.4 nozzle", + "inherits": "BETA PETG-GF @base", + "from": "system", + "setting_id": "BPGB13_04", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "9" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..fd093d8506 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL H2D 0.4 nozzle.json @@ -0,0 +1,155 @@ +{ + "type": "filament", + "name": "BETA PETG-GF @BBL H2D 0.4 nozzle", + "inherits": "BETA PETG-GF @base", + "from": "system", + "setting_id": "BPGB13_08", + "instantiation": "true", + "counter_coef_2": [ + "0.00565" + ], + "counter_coef_3": [ + "-0.0112" + ], + "counter_limit_max": [ + "0.065" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "5" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "11.5", + "11.5" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_2": [ + "-0.0121" + ], + "hole_coef_3": [ + "0.145" + ], + "hole_limit_min": [ + "0.068" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255" + ], + "overhang_fan_speed": [ + "100" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL P1P 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL P1P 0.4 nozzle.json new file mode 100644 index 0000000000..f700b2149e --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL P1P 0.4 nozzle.json @@ -0,0 +1,131 @@ +{ + "type": "filament", + "name": "BETA PETG-GF @BBL P1P 0.4 nozzle", + "inherits": "BETA PETG-GF @base", + "from": "system", + "setting_id": "BPGB13_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "5" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "11.5", + "11.5" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255" + ], + "overhang_fan_speed": [ + "100" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL X1C 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL X1C 0.4 nozzle.json new file mode 100644 index 0000000000..32b0daf255 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL X1C 0.4 nozzle.json @@ -0,0 +1,134 @@ +{ + "type": "filament", + "name": "BETA PETG-GF @BBL X1C 0.4 nozzle", + "inherits": "BETA PETG-GF @base", + "from": "system", + "setting_id": "BPGB13_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "5" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "11.5", + "11.5" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.95", + "0.95" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "255", + "255" + ], + "nozzle_temperature_initial_layer": [ + "255", + "255" + ], + "overhang_fan_speed": [ + "100" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json new file mode 100644 index 0000000000..6261eaa7d2 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json @@ -0,0 +1,83 @@ +{ + "type": "filament", + "name": "BETA PETG-GF @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "BPGB13", + "instantiation": "false", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "0" + ], + "filament_cost": [ + "34.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "14" + ], + "filament_type": [ + "PETG-CF" + ], + "filament_vendor": [ + "BETA" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "impact_strength_z": [ + "10.7" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "required_nozzle_HRC": [ + "40" + ], + "slow_down_layer_time": [ + "6" + ], + "temperature_vitrification": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1.json new file mode 100644 index 0000000000..3e0545627d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1.json @@ -0,0 +1,46 @@ +{ + "type": "filament", + "name": "BETA PLA Basic @BBL A1", + "inherits": "BETA PLA Basic @base", + "from": "system", + "setting_id": "BPLB00_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1M.json new file mode 100644 index 0000000000..074c8bbad6 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1M.json @@ -0,0 +1,46 @@ +{ + "type": "filament", + "name": "BETA PLA Basic @BBL A1M", + "inherits": "BETA PLA Basic @base", + "from": "system", + "setting_id": "BPLB00_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL H2D.json new file mode 100644 index 0000000000..f309ce4697 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL H2D.json @@ -0,0 +1,155 @@ +{ + "type": "filament", + "name": "BETA PLA Basic @BBL H2D", + "inherits": "BETA PLA Basic @base", + "from": "system", + "setting_id": "BPLB00_12", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "75" + ], + "counter_coef_2": [ + "0.003" + ], + "counter_coef_3": [ + "0.01" + ], + "counter_limit_max": [ + "0.088" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "25", + "40" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_3": [ + "0.18" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL P1P.json new file mode 100644 index 0000000000..a9b3b41e67 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Basic @BBL P1P", + "inherits": "BETA PLA Basic @base", + "from": "system", + "setting_id": "BPLB00_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL X1C.json new file mode 100644 index 0000000000..2efae39e66 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL X1C.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA PLA Basic @BBL X1C", + "inherits": "BETA PLA Basic @base", + "from": "system", + "setting_id": "BPLB00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json new file mode 100644 index 0000000000..1653813bc1 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "BETA PLA Basic @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB00", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_vendor": [ + "BETA" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_scarf_height": [ + "10%" + ], + "filament_scarf_gap": [ + "0%" + ], + "filament_scarf_length": [ + "10" + ], + "filament_change_length": [ + "5" + ], + "filament_prime_volume": [ + "30" + ], + "impact_strength_z": [ + "13.8" + ], + "compatible_printers": [], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1.json new file mode 100644 index 0000000000..da7e730707 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Chameleon @BBL A1", + "inherits": "BETA PLA Chameleon @base", + "from": "system", + "setting_id": "BPLB02_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1M.json new file mode 100644 index 0000000000..667a27517c --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1M.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Chameleon @BBL A1M", + "inherits": "BETA PLA Chameleon @base", + "from": "system", + "setting_id": "BPLB02_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL H2D.json new file mode 100644 index 0000000000..61921e055e --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Chameleon @BBL H2D", + "inherits": "BETA PLA Chameleon @base", + "from": "system", + "setting_id": "BPLB02_04", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL P1P.json new file mode 100644 index 0000000000..896b695cad --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Chameleon @BBL P1P", + "inherits": "BETA PLA Chameleon @base", + "from": "system", + "setting_id": "BPLB02_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL X1C.json new file mode 100644 index 0000000000..ecc1332410 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Chameleon @BBL X1C", + "inherits": "BETA PLA Chameleon @base", + "from": "system", + "setting_id": "BPLB02_00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json new file mode 100644 index 0000000000..cb618e7bd0 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PLA Chameleon @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB02", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.22" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "6.5" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1.json new file mode 100644 index 0000000000..07ccf57777 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Fluorescence @BBL A1", + "inherits": "BETA PLA Fluorescence @base", + "from": "system", + "setting_id": "BPLB04_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1M.json new file mode 100644 index 0000000000..fe2a32394a --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1M.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Fluorescence @BBL A1M", + "inherits": "BETA PLA Fluorescence @base", + "from": "system", + "setting_id": "BPLB04_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL H2D.json new file mode 100644 index 0000000000..4dfe6a3041 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Fluorescence @BBL H2D", + "inherits": "BETA PLA Fluorescence @base", + "from": "system", + "setting_id": "BPLB04_04", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL P1P.json new file mode 100644 index 0000000000..fa085c4b5b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Fluorescence @BBL P1P", + "inherits": "BETA PLA Fluorescence @base", + "from": "system", + "setting_id": "BPLB04_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL X1C.json new file mode 100644 index 0000000000..f7930db006 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Fluorescence @BBL X1C", + "inherits": "BETA PLA Fluorescence @base", + "from": "system", + "setting_id": "BPLB04_00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json new file mode 100644 index 0000000000..684ce8866f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PLA Fluorescence @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB04", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.22" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "6.5" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1.json new file mode 100644 index 0000000000..a50ea558f6 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "name": "BETA PLA Glitter @BBL A1", + "inherits": "BETA PLA Glitter @base", + "from": "system", + "setting_id": "BPLB05_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1M.json new file mode 100644 index 0000000000..e9f9995415 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1M.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "name": "BETA PLA Glitter @BBL A1M", + "inherits": "BETA PLA Glitter @base", + "from": "system", + "setting_id": "BPLB05_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL H2D.json new file mode 100644 index 0000000000..30a169c731 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Glitter @BBL H2D", + "inherits": "BETA PLA Glitter @base", + "from": "system", + "setting_id": "BPLB05_04", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL P1P.json new file mode 100644 index 0000000000..56fbd91b1f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Glitter @BBL P1P", + "inherits": "BETA PLA Glitter @base", + "from": "system", + "setting_id": "BPLB05_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL X1C.json new file mode 100644 index 0000000000..27ef9b6bb1 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Glitter @BBL X1C", + "inherits": "BETA PLA Glitter @base", + "from": "system", + "setting_id": "BPLB05_00", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json new file mode 100644 index 0000000000..d180d4fb04 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PLA Glitter @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB05", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "10.3" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1.json new file mode 100644 index 0000000000..b3e3f5810f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Glow @BBL A1", + "inherits": "BETA PLA Glow @base", + "from": "system", + "setting_id": "BPLB06_11", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1M.json new file mode 100644 index 0000000000..ce16e93ea2 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1M.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Glow @BBL A1M", + "inherits": "BETA PLA Glow @base", + "from": "system", + "setting_id": "BPLB06_16", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL H2D.json new file mode 100644 index 0000000000..f36dad2a44 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Glow @BBL H2D", + "inherits": "BETA PLA Glow @base", + "from": "system", + "setting_id": "BPLB06_06", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL P1P.json new file mode 100644 index 0000000000..4e1abbead0 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Glow @BBL P1P", + "inherits": "BETA PLA Glow @base", + "from": "system", + "setting_id": "BPLB06_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL X1C.json new file mode 100644 index 0000000000..b7ed381bd3 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL X1C.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA PLA Glow @BBL X1C", + "inherits": "BETA PLA Glow @base", + "from": "system", + "setting_id": "BPLB06_00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json new file mode 100644 index 0000000000..05657ebd86 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "BETA PLA Glow @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB06", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "19.8" + ], + "temperature_vitrification": [ + "45" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1.json new file mode 100644 index 0000000000..93a1e0c8a7 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Gradient @BBL A1", + "inherits": "BETA PLA Gradient @base", + "from": "system", + "setting_id": "BPLB07_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1M.json new file mode 100644 index 0000000000..a29b928941 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1M.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Gradient @BBL A1M", + "inherits": "BETA PLA Gradient @base", + "from": "system", + "setting_id": "BPLB07_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL H2D.json new file mode 100644 index 0000000000..3657d33348 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Gradient @BBL H2D", + "inherits": "BETA PLA Gradient @base", + "from": "system", + "setting_id": "BPLB07_04", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL P1P.json new file mode 100644 index 0000000000..38ca268766 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Gradient @BBL P1P", + "inherits": "BETA PLA Gradient @base", + "from": "system", + "setting_id": "BPLB07_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL X1C.json new file mode 100644 index 0000000000..28167832c7 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Gradient @BBL X1C", + "inherits": "BETA PLA Gradient @base", + "from": "system", + "setting_id": "BPLB07_00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json new file mode 100644 index 0000000000..f6cb4e3193 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PLA Gradient @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB07", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.22" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "6.5" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1.json new file mode 100644 index 0000000000..f07c12540f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Heat Color Change @BBL A1", + "inherits": "BETA PLA Heat Color Change @base", + "from": "system", + "setting_id": "BPLB03_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1M.json new file mode 100644 index 0000000000..057ac94128 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1M.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Heat Color Change @BBL A1M", + "inherits": "BETA PLA Heat Color Change @base", + "from": "system", + "setting_id": "BPLB03_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL H2D.json new file mode 100644 index 0000000000..7777bdb4ca --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Heat Color Change @BBL H2D", + "inherits": "BETA PLA Heat Color Change @base", + "from": "system", + "setting_id": "BPLB03_04", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL P1P.json new file mode 100644 index 0000000000..0b8b264d0f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Heat Color Change @BBL P1P", + "inherits": "BETA PLA Heat Color Change @base", + "from": "system", + "setting_id": "BPLB03_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL X1C.json new file mode 100644 index 0000000000..96ae68563e --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Heat Color Change @BBL X1C", + "inherits": "BETA PLA Heat Color Change @base", + "from": "system", + "setting_id": "BPLB03_00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json new file mode 100644 index 0000000000..6f55ffdab8 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PLA Heat Color Change @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB03", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.22" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "6.5" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1.json new file mode 100644 index 0000000000..0f8dc55aec --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "name": "BETA PLA High Speed @BBL A1", + "inherits": "BETA PLA High Speed @base", + "from": "system", + "setting_id": "BPLB20_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1M.json new file mode 100644 index 0000000000..a9a989fa0b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1M.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "name": "BETA PLA High Speed @BBL A1M", + "inherits": "BETA PLA High Speed @base", + "from": "system", + "setting_id": "BPLB20_06", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle", + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL H2D.json new file mode 100644 index 0000000000..c353b206f8 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA High Speed @BBL H2D", + "inherits": "BETA PLA High Speed @base", + "from": "system", + "setting_id": "BPLB20_08", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "slow_down_layer_time": [ + "4" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL P1P.json new file mode 100644 index 0000000000..36f42f9c42 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL P1P.json @@ -0,0 +1,139 @@ +{ + "type": "filament", + "name": "BETA PLA High Speed @BBL P1P", + "inherits": "BETA PLA High Speed @base", + "from": "system", + "setting_id": "BPLB20_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL X1C.json new file mode 100644 index 0000000000..0c6aa6b8b2 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL X1C.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA High Speed @BBL X1C", + "inherits": "BETA PLA High Speed @base", + "from": "system", + "setting_id": "BPLB20_00", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "4" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @base.json new file mode 100644 index 0000000000..604604cb04 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @base.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "name": "BETA PLA High Speed @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB20", + "instantiation": "false", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_vendor": [ + "BETA" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1.json new file mode 100644 index 0000000000..b8ccc3af16 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA High Temp @BBL A1", + "inherits": "BETA PLA High Temp @base", + "from": "system", + "setting_id": "BPLB18_05", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "8" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1M.json new file mode 100644 index 0000000000..c7bca3f5c4 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1M.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA High Temp @BBL A1M", + "inherits": "BETA PLA High Temp @base", + "from": "system", + "setting_id": "BPLB18_07", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "8" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL H2D.json new file mode 100644 index 0000000000..08653bbf37 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL H2D.json @@ -0,0 +1,148 @@ +{ + "type": "filament", + "name": "BETA PLA High Temp @BBL H2D", + "inherits": "BETA PLA High Temp @base", + "from": "system", + "setting_id": "BPLB18_09", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "75" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "slow_down_layer_time": [ + "6" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL P1P.json new file mode 100644 index 0000000000..25a0522a02 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA High Temp @BBL P1P", + "inherits": "BETA PLA High Temp @base", + "from": "system", + "setting_id": "BPLB18_03", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL X1C.json new file mode 100644 index 0000000000..e221c28c18 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL X1C.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA High Temp @BBL X1C", + "inherits": "BETA PLA High Temp @base", + "from": "system", + "setting_id": "BPLB18_00", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json new file mode 100644 index 0000000000..7ac72d59fa --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json @@ -0,0 +1,39 @@ +{ + "type": "filament", + "name": "BETA PLA High Temp @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB18", + "instantiation": "false", + "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_scarf_height": [ + "5%" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "8.5" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1.json new file mode 100644 index 0000000000..4bff45b61d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Marble @BBL A1", + "inherits": "BETA PLA Marble @base", + "from": "system", + "setting_id": "BPLB08_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1M.json new file mode 100644 index 0000000000..3ad98ecb34 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1M.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Marble @BBL A1M", + "inherits": "BETA PLA Marble @base", + "from": "system", + "setting_id": "BPLB08_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL H2D.json new file mode 100644 index 0000000000..decacdcc40 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Marble @BBL H2D", + "inherits": "BETA PLA Marble @base", + "from": "system", + "setting_id": "BPLB08_04", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL P1P.json new file mode 100644 index 0000000000..2e7cf93c79 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Marble @BBL P1P", + "inherits": "BETA PLA Marble @base", + "from": "system", + "setting_id": "BPLB08_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL X1C.json new file mode 100644 index 0000000000..bfc904d686 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Marble @BBL X1C", + "inherits": "BETA PLA Marble @base", + "from": "system", + "setting_id": "BPLB08_00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json new file mode 100644 index 0000000000..c27f1b4fd1 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PLA Marble @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB08", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.22" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "6.5" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1.json new file mode 100644 index 0000000000..5791eaacb1 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1.json @@ -0,0 +1,49 @@ +{ + "type": "filament", + "name": "BETA PLA Matte @BBL A1", + "inherits": "BETA PLA Matte @base", + "from": "system", + "setting_id": "BPLB09_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1M.json new file mode 100644 index 0000000000..d2dace4b32 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1M.json @@ -0,0 +1,49 @@ +{ + "type": "filament", + "name": "BETA PLA Matte @BBL A1M", + "inherits": "BETA PLA Matte @base", + "from": "system", + "setting_id": "BPLB09_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL H2D.json new file mode 100644 index 0000000000..ef3fa05d53 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL H2D.json @@ -0,0 +1,161 @@ +{ + "type": "filament", + "name": "BETA PLA Matte @BBL H2D", + "inherits": "BETA PLA Matte @base", + "from": "system", + "setting_id": "BPLB09_05", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "75" + ], + "counter_coef_2": [ + "0.06" + ], + "counter_coef_3": [ + "-0.32" + ], + "counter_limit_min": [ + "-0.4" + ], + "counter_limit_max": [ + "0.05" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "25", + "40" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_2": [ + "-0.0081" + ], + "hole_coef_3": [ + "0.18" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL P1P.json new file mode 100644 index 0000000000..8076797fb8 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Matte @BBL P1P", + "inherits": "BETA PLA Matte @base", + "from": "system", + "setting_id": "BPLB09_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "22", + "22" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL X1C.json new file mode 100644 index 0000000000..dea5b1f08b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL X1C.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA PLA Matte @BBL X1C", + "inherits": "BETA PLA Matte @base", + "from": "system", + "setting_id": "BPLB09", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "22", + "22" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json new file mode 100644 index 0000000000..d67331d549 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json @@ -0,0 +1,38 @@ +{ + "type": "filament", + "name": "BETA PLA Matte @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB09", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.32" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_scarf_height": [ + "5%" + ], + "filament_scarf_gap": [ + "0%" + ], + "filament_scarf_length": [ + "10" + ], + "impact_strength_z": [ + "6.6" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1.json new file mode 100644 index 0000000000..0824f7da2a --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Metal @BBL A1", + "inherits": "BETA PLA Metal @base", + "from": "system", + "setting_id": "BPLB10_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1M.json new file mode 100644 index 0000000000..7c845e3bc0 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1M.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Metal @BBL A1M", + "inherits": "BETA PLA Metal @base", + "from": "system", + "setting_id": "BPLB10_00", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL H2D.json new file mode 100644 index 0000000000..7dd3a3f16d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Metal @BBL H2D", + "inherits": "BETA PLA Metal @base", + "from": "system", + "setting_id": "BPLB10_07", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL P1P.json new file mode 100644 index 0000000000..48eede1a01 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Metal @BBL P1P", + "inherits": "BETA PLA Metal @base", + "from": "system", + "setting_id": "BPLB10_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL X1C.json new file mode 100644 index 0000000000..263bf64877 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Metal @BBL X1C", + "inherits": "BETA PLA Metal @base", + "from": "system", + "setting_id": "BPLB10", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json new file mode 100644 index 0000000000..3a5668800d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json @@ -0,0 +1,30 @@ +{ + "type": "filament", + "name": "BETA PLA Metal @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB10", + "instantiation": "false", + "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "filament_scarf_seam_type": [ + "none" + ], + "impact_strength_z": [ + "16.8" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1.json new file mode 100644 index 0000000000..87c03f5dc7 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Metallic @BBL A1", + "inherits": "BETA PLA Metallic @base", + "from": "system", + "setting_id": "BPLB11_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1M.json new file mode 100644 index 0000000000..685c0be389 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1M.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Metallic @BBL A1M", + "inherits": "BETA PLA Metallic @base", + "from": "system", + "setting_id": "BPLB11_00", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL H2D.json new file mode 100644 index 0000000000..23e0eada1d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Metallic @BBL H2D", + "inherits": "BETA PLA Metallic @base", + "from": "system", + "setting_id": "BPLB11_07", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL P1P.json new file mode 100644 index 0000000000..eb1d1f6804 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Metallic @BBL P1P", + "inherits": "BETA PLA Metallic @base", + "from": "system", + "setting_id": "BPLB11_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL X1C.json new file mode 100644 index 0000000000..edc372c4c8 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Metallic @BBL X1C", + "inherits": "BETA PLA Metallic @base", + "from": "system", + "setting_id": "BPLB11", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json new file mode 100644 index 0000000000..5c1c8f3ddf --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json @@ -0,0 +1,30 @@ +{ + "type": "filament", + "name": "BETA PLA Metallic @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB11", + "instantiation": "false", + "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.25" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "filament_scarf_seam_type": [ + "none" + ], + "impact_strength_z": [ + "16.8" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1.json new file mode 100644 index 0000000000..c8b2a6fa6a --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1.json @@ -0,0 +1,46 @@ +{ + "type": "filament", + "name": "BETA PLA PRO @BBL A1", + "inherits": "BETA PLA PRO @base", + "from": "system", + "setting_id": "BPLB12_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1M.json new file mode 100644 index 0000000000..fe1de91251 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1M.json @@ -0,0 +1,46 @@ +{ + "type": "filament", + "name": "BETA PLA PRO @BBL A1M", + "inherits": "BETA PLA PRO @base", + "from": "system", + "setting_id": "BPLB12_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL H2D.json new file mode 100644 index 0000000000..13aaebc092 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL H2D.json @@ -0,0 +1,155 @@ +{ + "type": "filament", + "name": "BETA PLA PRO @BBL H2D", + "inherits": "BETA PLA PRO @base", + "from": "system", + "setting_id": "BPLB12_12", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "75" + ], + "counter_coef_2": [ + "0.003" + ], + "counter_coef_3": [ + "0.01" + ], + "counter_limit_max": [ + "0.088" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "25", + "40" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_3": [ + "0.18" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL P1P.json new file mode 100644 index 0000000000..ded38c78d8 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA PRO @BBL P1P", + "inherits": "BETA PLA PRO @base", + "from": "system", + "setting_id": "BPLB12_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL X1C.json new file mode 100644 index 0000000000..bb7581f809 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL X1C.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA PLA PRO @BBL X1C", + "inherits": "BETA PLA PRO @base", + "from": "system", + "setting_id": "BPLB12", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "21", + "21" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json new file mode 100644 index 0000000000..340b2c88ec --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "BETA PLA PRO @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB12", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_vendor": [ + "BETA" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_scarf_height": [ + "10%" + ], + "filament_scarf_gap": [ + "0%" + ], + "filament_scarf_length": [ + "10" + ], + "filament_change_length": [ + "5" + ], + "filament_prime_volume": [ + "30" + ], + "impact_strength_z": [ + "13.8" + ], + "compatible_printers": [], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1.json new file mode 100644 index 0000000000..0fa19d6760 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Silk @BBL A1", + "inherits": "BETA PLA Silk @base", + "from": "system", + "setting_id": "BPLB13_05", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1M.json new file mode 100644 index 0000000000..eb9a1c4d17 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1M.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Silk @BBL A1M", + "inherits": "BETA PLA Silk @base", + "from": "system", + "setting_id": "BPLB13_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL H2D.json new file mode 100644 index 0000000000..513d2a4aa7 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL H2D.json @@ -0,0 +1,160 @@ +{ + "type": "filament", + "name": "BETA PLA Silk @BBL H2D", + "inherits": "BETA PLA Silk @base", + "from": "system", + "setting_id": "BPLB13_16", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "75" + ], + "counter_coef_2": [ + "0.02" + ], + "counter_coef_3": [ + "-0.01" + ], + "counter_limit_min": [ + "-0.05" + ], + "counter_limit_max": [ + "0.05" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_2": [ + "-0.0081" + ], + "hole_coef_3": [ + "0.2" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "slow_down_layer_time": [ + "6" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL P1P.json new file mode 100644 index 0000000000..e8cbc2e14b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL P1P.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Silk @BBL P1P", + "inherits": "BETA PLA Silk @base", + "from": "system", + "setting_id": "BPLB13_12", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL X1C.json new file mode 100644 index 0000000000..8a7e3eff50 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA PLA Silk @BBL X1C", + "inherits": "BETA PLA Silk @base", + "from": "system", + "setting_id": "BPLB13_01", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json new file mode 100644 index 0000000000..fb445eed6b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json @@ -0,0 +1,45 @@ +{ + "type": "filament", + "name": "BETA PLA Silk @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB13", + "instantiation": "false", + "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.32" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "filament_scarf_height": [ + "5%" + ], + "filament_scarf_gap": [ + "0%" + ], + "impact_strength_z": [ + "4.6" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "supertack_plate_temp": [ + "0" + ], + "supertack_plate_temp_initial_layer": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1.json new file mode 100644 index 0000000000..fde75ade2b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Silk+ @BBL A1", + "inherits": "BETA PLA Silk+ @base", + "from": "system", + "setting_id": "BPLB01_05", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "8" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1M.json new file mode 100644 index 0000000000..2f7caa3f45 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1M.json @@ -0,0 +1,43 @@ +{ + "type": "filament", + "name": "BETA PLA Silk+ @BBL A1M", + "inherits": "BETA PLA Silk+ @base", + "from": "system", + "setting_id": "BPLB01_07", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "8" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL H2D.json new file mode 100644 index 0000000000..244dab338f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL H2D.json @@ -0,0 +1,148 @@ +{ + "type": "filament", + "name": "BETA PLA Silk+ @BBL H2D", + "inherits": "BETA PLA Silk+ @base", + "from": "system", + "setting_id": "BPLB01_09", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "75" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "slow_down_layer_time": [ + "6" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL P1P.json new file mode 100644 index 0000000000..f809b6d7e9 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Silk+ @BBL P1P", + "inherits": "BETA PLA Silk+ @base", + "from": "system", + "setting_id": "BPLB01_03", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL X1C.json new file mode 100644 index 0000000000..065b493b2c --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL X1C.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA Silk+ @BBL X1C", + "inherits": "BETA PLA Silk+ @base", + "from": "system", + "setting_id": "BPLB01_00", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json new file mode 100644 index 0000000000..3320396323 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json @@ -0,0 +1,39 @@ +{ + "type": "filament", + "name": "BETA PLA Silk+ @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB01", + "instantiation": "false", + "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_scarf_height": [ + "5%" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "8.5" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1.json new file mode 100644 index 0000000000..2a84d1f507 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "BETA PLA Transparent @BBL A1", + "inherits": "BETA PLA Transparent @base", + "from": "system", + "setting_id": "BPLB14_06", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_retract_before_wipe": [ + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1M.json new file mode 100644 index 0000000000..94753a2b93 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1M.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "BETA PLA Transparent @BBL A1M", + "inherits": "BETA PLA Transparent @base", + "from": "system", + "setting_id": "BPLB14_09", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_retract_before_wipe": [ + "0" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL H2D.json new file mode 100644 index 0000000000..3d11c50857 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL H2D.json @@ -0,0 +1,131 @@ +{ + "type": "filament", + "name": "BETA PLA Transparent @BBL H2D", + "inherits": "BETA PLA Transparent @base", + "from": "system", + "setting_id": "BPLB14_12", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\nM145 P0 ; set airduct mode to cooling mode\nM142 P1 R35 S40 U0.3 V0.5 ; set chamber autocooling" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL P1P.json new file mode 100644 index 0000000000..a180a2a124 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL P1P.json @@ -0,0 +1,143 @@ +{ + "type": "filament", + "name": "BETA PLA Transparent @BBL P1P", + "inherits": "BETA PLA Transparent @base", + "from": "system", + "setting_id": "BPLB14_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_retract_before_wipe": [ + "0", + "0" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL X1C.json new file mode 100644 index 0000000000..072bb2ec9c --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL X1C.json @@ -0,0 +1,129 @@ +{ + "type": "filament", + "name": "BETA PLA Transparent @BBL X1C", + "inherits": "BETA PLA Transparent @base", + "from": "system", + "setting_id": "BPLB14_00", + "instantiation": "true", + "description": "The generic presets are conservatively tuned for compatibility with a wider range of filaments. For higher printing quality and speeds, please use Bambu filaments with Bambu presets.", + "filament_retract_before_wipe": [ + "0", + "0" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json new file mode 100644 index 0000000000..ce0c342852 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "BETA PLA Transparent @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB14", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.22" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1.json new file mode 100644 index 0000000000..f9016e233b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA UV Color Change @BBL A1", + "inherits": "BETA PLA UV Color Change @base", + "from": "system", + "setting_id": "BPLB15_11", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1M.json new file mode 100644 index 0000000000..da74968584 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1M.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA UV Color Change @BBL A1M", + "inherits": "BETA PLA UV Color Change @base", + "from": "system", + "setting_id": "BPLB15_16", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL H2D.json new file mode 100644 index 0000000000..5d23c31585 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL H2D.json @@ -0,0 +1,136 @@ +{ + "type": "filament", + "name": "BETA PLA UV Color Change @BBL H2D", + "inherits": "BETA PLA UV Color Change @base", + "from": "system", + "setting_id": "BPLB15_06", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL P1P.json new file mode 100644 index 0000000000..4ec6559082 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA UV Color Change @BBL P1P", + "inherits": "BETA PLA UV Color Change @base", + "from": "system", + "setting_id": "BPLB15_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL X1C.json new file mode 100644 index 0000000000..f990e19fbe --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL X1C.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA PLA UV Color Change @BBL X1C", + "inherits": "BETA PLA UV Color Change @base", + "from": "system", + "setting_id": "BPLB15_00", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json new file mode 100644 index 0000000000..033d1ef2ce --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "BETA PLA UV Color Change @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB15", + "instantiation": "false", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.26" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "19.8" + ], + "temperature_vitrification": [ + "45" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1.json new file mode 100644 index 0000000000..59a931d95d --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Wood @BBL A1", + "inherits": "BETA PLA Wood @base", + "from": "system", + "setting_id": "BPLB19_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1M.json new file mode 100644 index 0000000000..ee662f0c7b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1M.json @@ -0,0 +1,40 @@ +{ + "type": "filament", + "name": "BETA PLA Wood @BBL A1M", + "inherits": "BETA PLA Wood @base", + "from": "system", + "setting_id": "BPLB19_05", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL H2D.json new file mode 100644 index 0000000000..74c43f6e6b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL H2D.json @@ -0,0 +1,135 @@ +{ + "type": "filament", + "name": "BETA PLA Wood @BBL H2D", + "inherits": "BETA PLA Wood @base", + "from": "system", + "setting_id": "BPLB19_06", + "instantiation": "true", + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL P1P.json new file mode 100644 index 0000000000..eb0c56df11 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL P1P.json @@ -0,0 +1,145 @@ +{ + "type": "filament", + "name": "BETA PLA Wood @BBL P1P", + "inherits": "BETA PLA Wood @base", + "from": "system", + "setting_id": "BPLB19_03", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL X1C.json new file mode 100644 index 0000000000..9ada7a13f1 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL X1C.json @@ -0,0 +1,124 @@ +{ + "type": "filament", + "name": "BETA PLA Wood @BBL X1C", + "inherits": "BETA PLA Wood @base", + "from": "system", + "setting_id": "BPLB19_00", + "instantiation": "true", + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json new file mode 100644 index 0000000000..471c5709cd --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json @@ -0,0 +1,38 @@ +{ + "type": "filament", + "name": "BETA PLA Wood @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB19", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.21" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "5.6" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1.json new file mode 100644 index 0000000000..c2fa4faa80 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1.json @@ -0,0 +1,49 @@ +{ + "type": "filament", + "name": "BETA PLA Youth @BBL A1", + "inherits": "BETA PLA Youth @base", + "from": "system", + "setting_id": "BPLB16_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1M.json new file mode 100644 index 0000000000..799c3c13db --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1M.json @@ -0,0 +1,49 @@ +{ + "type": "filament", + "name": "BETA PLA Youth @BBL A1M", + "inherits": "BETA PLA Youth @base", + "from": "system", + "setting_id": "BPLB16_02", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "pre_start_fan_time": [ + "2" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL H2D.json new file mode 100644 index 0000000000..66520b424e --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL H2D.json @@ -0,0 +1,161 @@ +{ + "type": "filament", + "name": "BETA PLA Youth @BBL H2D", + "inherits": "BETA PLA Youth @base", + "from": "system", + "setting_id": "BPLB16_05", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "75" + ], + "counter_coef_2": [ + "0.06" + ], + "counter_coef_3": [ + "-0.32" + ], + "counter_limit_min": [ + "-0.4" + ], + "counter_limit_max": [ + "0.05" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "25", + "40" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_2": [ + "-0.0081" + ], + "hole_coef_3": [ + "0.18" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "pre_start_fan_time": [ + "2" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL P1P.json new file mode 100644 index 0000000000..2afbb6da25 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL P1P.json @@ -0,0 +1,142 @@ +{ + "type": "filament", + "name": "BETA PLA Youth @BBL P1P", + "inherits": "BETA PLA Youth @base", + "from": "system", + "setting_id": "BPLB16_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "22", + "22" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL X1C.json new file mode 100644 index 0000000000..e80eb16387 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL X1C.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA PLA Youth @BBL X1C", + "inherits": "BETA PLA Youth @base", + "from": "system", + "setting_id": "BPLB16", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "22", + "22" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "220", + "220" + ], + "nozzle_temperature_initial_layer": [ + "220", + "220" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json new file mode 100644 index 0000000000..b63dc707e0 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json @@ -0,0 +1,38 @@ +{ + "type": "filament", + "name": "BETA PLA Youth @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB16", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.32" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_vendor": [ + "BETA" + ], + "filament_scarf_seam_type": [ + "none" + ], + "filament_scarf_height": [ + "5%" + ], + "filament_scarf_gap": [ + "0%" + ], + "filament_scarf_length": [ + "10" + ], + "impact_strength_z": [ + "6.6" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1.json new file mode 100644 index 0000000000..8aab52aaff --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PLA-CF @BBL A1", + "inherits": "BETA PLA-CF @base", + "from": "system", + "setting_id": "BPLB17_04", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1M.json new file mode 100644 index 0000000000..4ccfd18683 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1M.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "BETA PLA-CF @BBL A1M", + "inherits": "BETA PLA-CF @base", + "from": "system", + "setting_id": "BPLB17_00", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_long_retractions_when_cut": [ + "1" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_retraction_distances_when_cut": [ + "18" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL H2D 0.4 nozzle.json new file mode 100644 index 0000000000..320aee32e5 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL H2D 0.4 nozzle.json @@ -0,0 +1,146 @@ +{ + "type": "filament", + "name": "BETA PLA-CF @BBL H2D 0.4 nozzle", + "inherits": "BETA PLA-CF @base", + "from": "system", + "setting_id": "BPLB17_08", + "instantiation": "true", + "counter_coef_2": [ + "0.012" + ], + "counter_coef_3": [ + "-0.063" + ], + "counter_limit_max": [ + "0.07" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "1", + "1" + ], + "filament_wipe_distance": [ + "1", + "1" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "Spiral Lift", + "Spiral Lift" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hole_coef_2": [ + "-0.0103" + ], + "hole_coef_3": [ + "0.1974" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "10", + "10" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL P1P.json new file mode 100644 index 0000000000..499a024436 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL P1P.json @@ -0,0 +1,137 @@ +{ + "type": "filament", + "name": "BETA PLA-CF @BBL P1P", + "inherits": "BETA PLA-CF @base", + "from": "system", + "setting_id": "BPLB17_10", + "instantiation": "true", + "fan_cooling_layer_time": [ + "80" + ], + "fan_min_speed": [ + "50" + ], + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL X1C.json new file mode 100644 index 0000000000..0f123a7e5a --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL X1C.json @@ -0,0 +1,125 @@ +{ + "type": "filament", + "name": "BETA PLA-CF @BBL X1C", + "inherits": "BETA PLA-CF @base", + "from": "system", + "setting_id": "BPLB17_01", + "instantiation": "true", + "filament_long_retractions_when_cut": [ + "1", + "1" + ], + "filament_max_volumetric_speed": [ + "15", + "15" + ], + "filament_retraction_distances_when_cut": [ + "18", + "18" + ], + "filament_flow_ratio": [ + "0.98", + "0.98" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json new file mode 100644 index 0000000000..88028090da --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json @@ -0,0 +1,56 @@ +{ + "type": "filament", + "name": "BETA PLA-CF @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "BPLB17", + "instantiation": "false", + "additional_cooling_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "filament_cost": [ + "34.99" + ], + "filament_density": [ + "1.22" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_type": [ + "PLA-CF" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "7.8" + ], + "nozzle_temperature_range_low": [ + "210" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "required_nozzle_HRC": [ + "40" + ], + "supertack_plate_temp": [ + "50" + ], + "supertack_plate_temp_initial_layer": [ + "50" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1.json new file mode 100644 index 0000000000..35e3010043 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "name": "BETA TPU 90A @BBL A1", + "inherits": "BETA TPU 90A @base", + "from": "system", + "setting_id": "BTUB00_04", + "instantiation": "true", + "filament_density": [ + "1.22" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "45" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1M.json new file mode 100644 index 0000000000..e4a5c32532 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1M.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "name": "BETA TPU 90A @BBL A1M", + "inherits": "BETA TPU 90A @base", + "from": "system", + "setting_id": "BTUB00_05", + "instantiation": "true", + "filament_density": [ + "1.22" + ], + "hot_plate_temp": [ + "30" + ], + "hot_plate_temp_initial_layer": [ + "30" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "textured_plate_temp": [ + "30" + ], + "textured_plate_temp_initial_layer": [ + "30" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle", + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL H2D.json new file mode 100644 index 0000000000..d37436075b --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL H2D.json @@ -0,0 +1,145 @@ +{ + "type": "filament", + "name": "BETA TPU 90A @BBL H2D", + "inherits": "BETA TPU 90A @base", + "from": "system", + "setting_id": "BTUB00_02", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "100" + ], + "eng_plate_temp": [ + "35" + ], + "eng_plate_temp_initial_layer": [ + "35" + ], + "filament_deretraction_speed": [ + "10", + "10" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_ramming_volumetric_speed": [ + "0.7", + "0.7" + ], + "filament_printable": [ + "2" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "2", + "2" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "10", + "10" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "195", + "195" + ], + "filament_ramming_travel_time": [ + "20", + "20" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "impact_strength_z": [ + "88.7" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL P1P.json new file mode 100644 index 0000000000..2b599ce405 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL P1P.json @@ -0,0 +1,121 @@ +{ + "type": "filament", + "name": "BETA TPU 90A @BBL P1P", + "inherits": "BETA TPU 90A @base", + "from": "system", + "setting_id": "BTUB00_01", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL X1C.json new file mode 100644 index 0000000000..00935d8509 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA TPU 90A @BBL X1C", + "inherits": "BETA TPU 90A @base", + "from": "system", + "setting_id": "BTUB00_00", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json new file mode 100644 index 0000000000..6664874f99 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json @@ -0,0 +1,33 @@ +{ + "type": "filament", + "name": "BETA TPU 90A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "BTUB00", + "instantiation": "false", + "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.", + "filament_cost": [ + "59.99" + ], + "filament_max_volumetric_speed": [ + "2.8" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "87.3" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_initial_layer": [ + "225" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_layer_time": [ + "14" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1.json new file mode 100644 index 0000000000..7a7432b1c0 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "BETA TPU 95A @BBL A1", + "inherits": "BETA TPU 95A @base", + "from": "system", + "setting_id": "BTUB02_01", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3.6" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1M.json new file mode 100644 index 0000000000..a6d90ba06a --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1M.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "BETA TPU 95A @BBL A1M", + "inherits": "BETA TPU 95A @base", + "from": "system", + "setting_id": "BTUB02_00", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3.6" + ], + "hot_plate_temp": [ + "30" + ], + "hot_plate_temp_initial_layer": [ + "30" + ], + "textured_plate_temp": [ + "30" + ], + "textured_plate_temp_initial_layer": [ + "30" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL H2D.json new file mode 100644 index 0000000000..dcce8d00cb --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL H2D.json @@ -0,0 +1,139 @@ +{ + "type": "filament", + "name": "BETA TPU 95A @BBL H2D", + "inherits": "BETA TPU 95A @base", + "from": "system", + "setting_id": "BTUB02_03", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "100" + ], + "eng_plate_temp": [ + "35" + ], + "eng_plate_temp_initial_layer": [ + "35" + ], + "filament_deretraction_speed": [ + "10", + "10" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "3.6", + "3.6" + ], + "filament_ramming_volumetric_speed": [ + "0.9", + "0.9" + ], + "filament_printable": [ + "2" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "2", + "2" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "10", + "10" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "200", + "200" + ], + "filament_ramming_travel_time": [ + "20", + "20" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL P1P.json new file mode 100644 index 0000000000..a2fb288291 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL P1P.json @@ -0,0 +1,133 @@ +{ + "type": "filament", + "name": "BETA TPU 95A @BBL P1P", + "inherits": "BETA TPU 95A @base", + "from": "system", + "setting_id": "BTUB02_10", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3.6", + "3.6" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "45" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL X1C.json new file mode 100644 index 0000000000..e96641af54 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL X1C.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA TPU 95A @BBL X1C", + "inherits": "BETA TPU 95A @base", + "from": "system", + "setting_id": "BTUB02", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3.6", + "3.6" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json new file mode 100644 index 0000000000..2ec4a56075 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "BETA TPU 95A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "BTUB02", + "instantiation": "false", + "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.", + "filament_cost": [ + "41.99" + ], + "filament_density": [ + "1.22" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1.json new file mode 100644 index 0000000000..2813ecc893 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "BETA TPU 98A @BBL A1", + "inherits": "BETA TPU 98A @base", + "from": "system", + "setting_id": "BTUB03_01", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3.6" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1M.json new file mode 100644 index 0000000000..baf4f84328 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1M.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "BETA TPU 98A @BBL A1M", + "inherits": "BETA TPU 98A @base", + "from": "system", + "setting_id": "BTUB03_00", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3.6" + ], + "hot_plate_temp": [ + "30" + ], + "hot_plate_temp_initial_layer": [ + "30" + ], + "textured_plate_temp": [ + "30" + ], + "textured_plate_temp_initial_layer": [ + "30" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL H2D.json new file mode 100644 index 0000000000..bf342fadc9 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL H2D.json @@ -0,0 +1,139 @@ +{ + "type": "filament", + "name": "BETA TPU 98A @BBL H2D", + "inherits": "BETA TPU 98A @base", + "from": "system", + "setting_id": "BTUB03_03", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "100" + ], + "eng_plate_temp": [ + "35" + ], + "eng_plate_temp_initial_layer": [ + "35" + ], + "filament_deretraction_speed": [ + "10", + "10" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "3.6", + "3.6" + ], + "filament_ramming_volumetric_speed": [ + "0.9", + "0.9" + ], + "filament_printable": [ + "2" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "2", + "2" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "10", + "10" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "200", + "200" + ], + "filament_ramming_travel_time": [ + "20", + "20" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL P1P.json new file mode 100644 index 0000000000..419eb5b7c6 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL P1P.json @@ -0,0 +1,133 @@ +{ + "type": "filament", + "name": "BETA TPU 98A @BBL P1P", + "inherits": "BETA TPU 98A @base", + "from": "system", + "setting_id": "BTUB03_10", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3.6", + "3.6" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "45" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL X1C.json new file mode 100644 index 0000000000..8df9a59fe2 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL X1C.json @@ -0,0 +1,127 @@ +{ + "type": "filament", + "name": "BETA TPU 98A @BBL X1C", + "inherits": "BETA TPU 98A @base", + "from": "system", + "setting_id": "BTUB03", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3.6", + "3.6" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "230", + "230" + ], + "nozzle_temperature_initial_layer": [ + "230", + "230" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json new file mode 100644 index 0000000000..58ef5a5c21 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "BETA TPU 98A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "BTUB03", + "instantiation": "false", + "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.", + "filament_cost": [ + "41.99" + ], + "filament_density": [ + "1.22" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1.json b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1.json new file mode 100644 index 0000000000..427e618aec --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "name": "BETA TPU Matte @BBL A1", + "inherits": "BETA TPU Matte @base", + "from": "system", + "setting_id": "BTUB01_04", + "instantiation": "true", + "filament_density": [ + "1.22" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "45" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ], + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1M.json b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1M.json new file mode 100644 index 0000000000..0ce2e0f9f3 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1M.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "name": "BETA TPU Matte @BBL A1M", + "inherits": "BETA TPU Matte @base", + "from": "system", + "setting_id": "BTUB01_05", + "instantiation": "true", + "filament_density": [ + "1.22" + ], + "hot_plate_temp": [ + "30" + ], + "hot_plate_temp_initial_layer": [ + "30" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "textured_plate_temp": [ + "30" + ], + "textured_plate_temp_initial_layer": [ + "30" + ], + "compatible_printers": [ + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle", + "Bambu Lab A1 mini 0.4 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL H2D.json b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL H2D.json new file mode 100644 index 0000000000..10193d7d5a --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL H2D.json @@ -0,0 +1,145 @@ +{ + "type": "filament", + "name": "BETA TPU Matte @BBL H2D", + "inherits": "BETA TPU Matte @base", + "from": "system", + "setting_id": "BTUB01_02", + "instantiation": "true", + "additional_cooling_fan_speed": [ + "100" + ], + "eng_plate_temp": [ + "35" + ], + "eng_plate_temp_initial_layer": [ + "35" + ], + "filament_deretraction_speed": [ + "10", + "10" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_ramming_volumetric_speed": [ + "0.7", + "0.7" + ], + "filament_printable": [ + "2" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_length": [ + "2", + "2" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "10", + "10" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "195", + "195" + ], + "filament_ramming_travel_time": [ + "20", + "20" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "impact_strength_z": [ + "88.7" + ], + "long_retractions_when_ec": [ + "1", + "1" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab H2D 0.4 nozzle", + "Bambu Lab H2D 0.6 nozzle", + "Bambu Lab H2D 0.8 nozzle" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL P1P.json b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL P1P.json new file mode 100644 index 0000000000..c5648fb898 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL P1P.json @@ -0,0 +1,121 @@ +{ + "type": "filament", + "name": "BETA TPU Matte @BBL P1P", + "inherits": "BETA TPU Matte @base", + "from": "system", + "setting_id": "BTUB01_01", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL X1C.json b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL X1C.json new file mode 100644 index 0000000000..046660b063 --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL X1C.json @@ -0,0 +1,130 @@ +{ + "type": "filament", + "name": "BETA TPU Matte @BBL X1C", + "inherits": "BETA TPU Matte @base", + "from": "system", + "setting_id": "BTUB01_00", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2.8", + "2.8" + ], + "filament_retraction_length": [ + "0.4", + "0.4" + ], + "filament_deretraction_speed": [ + "nil", + "nil" + ], + "filament_flow_ratio": [ + "1", + "1" + ], + "filament_flush_temp": [ + "0", + "0" + ], + "filament_flush_volumetric_speed": [ + "0", + "0" + ], + "filament_long_retractions_when_cut": [ + "nil", + "nil" + ], + "filament_ramming_volumetric_speed": [ + "-1", + "-1" + ], + "filament_retract_before_wipe": [ + "nil", + "nil" + ], + "filament_retract_restart_extra": [ + "nil", + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil", + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil", + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil", + "nil" + ], + "filament_retraction_speed": [ + "nil", + "nil" + ], + "filament_wipe": [ + "nil", + "nil" + ], + "filament_wipe_distance": [ + "nil", + "nil" + ], + "filament_z_hop": [ + "nil", + "nil" + ], + "filament_z_hop_types": [ + "nil", + "nil" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_pre_cooling_temperature": [ + "0", + "0" + ], + "filament_ramming_travel_time": [ + "0", + "0" + ], + "filament_adaptive_volumetric_speed": [ + "0", + "0" + ], + "long_retractions_when_ec": [ + "0", + "0" + ], + "nozzle_temperature": [ + "225", + "225" + ], + "nozzle_temperature_initial_layer": [ + "225", + "225" + ], + "retraction_distances_when_ec": [ + "0", + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0", + "0 0 0 0 0 0" + ], + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json new file mode 100644 index 0000000000..20d773373f --- /dev/null +++ b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json @@ -0,0 +1,33 @@ +{ + "type": "filament", + "name": "BETA TPU Matte @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "BTUB01", + "instantiation": "false", + "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.", + "filament_cost": [ + "59.99" + ], + "filament_max_volumetric_speed": [ + "2.8" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "87.3" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_initial_layer": [ + "225" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_layer_time": [ + "14" + ] +} diff --git a/resources/profiles/BIQU.json b/resources/profiles/BIQU.json index 6698aaee89..cef8049680 100644 --- a/resources/profiles/BIQU.json +++ b/resources/profiles/BIQU.json @@ -1,6 +1,6 @@ { "name": "BIQU", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "BIQU configurations", "machine_model_list": [ diff --git a/resources/profiles/BIQU/BIQU_B1_buildplate_texture.png b/resources/profiles/BIQU/BIQU_B1_buildplate_texture.png deleted file mode 100644 index c87094ae2c..0000000000 Binary files a/resources/profiles/BIQU/BIQU_B1_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/BIQU/BIQU_B1_buildplate_texture.svg b/resources/profiles/BIQU/BIQU_B1_buildplate_texture.svg new file mode 100644 index 0000000000..e21dae35aa --- /dev/null +++ b/resources/profiles/BIQU/BIQU_B1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/BIQU/BIQU_BX_buildplate_texture.png b/resources/profiles/BIQU/BIQU_BX_buildplate_texture.png deleted file mode 100644 index 8af4091c2d..0000000000 Binary files a/resources/profiles/BIQU/BIQU_BX_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/BIQU/BIQU_BX_buildplate_texture.svg b/resources/profiles/BIQU/BIQU_BX_buildplate_texture.svg new file mode 100644 index 0000000000..ab8d8a61a4 --- /dev/null +++ b/resources/profiles/BIQU/BIQU_BX_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/BIQU/BIQU_Hurakan_buildplate_texture.png b/resources/profiles/BIQU/BIQU_Hurakan_buildplate_texture.png deleted file mode 100644 index f0ce2a5290..0000000000 Binary files a/resources/profiles/BIQU/BIQU_Hurakan_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/BIQU/BIQU_Hurakan_buildplate_texture.svg b/resources/profiles/BIQU/BIQU_Hurakan_buildplate_texture.svg new file mode 100644 index 0000000000..0036c317bc --- /dev/null +++ b/resources/profiles/BIQU/BIQU_Hurakan_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/BIQU/machine/BIQU B1.json b/resources/profiles/BIQU/machine/BIQU B1.json index 815eb57935..21d5299079 100644 --- a/resources/profiles/BIQU/machine/BIQU B1.json +++ b/resources/profiles/BIQU/machine/BIQU B1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "BIQU", "bed_model": "BIQU_B1_buildplate_model.stl", - "bed_texture": "BIQU_B1_buildplate_texture.png", + "bed_texture": "BIQU_B1_buildplate_texture.svg", "hotend_model": "biqu_b1_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" } diff --git a/resources/profiles/BIQU/machine/BIQU BX.json b/resources/profiles/BIQU/machine/BIQU BX.json index 17ba98d9b0..8696a4f268 100644 --- a/resources/profiles/BIQU/machine/BIQU BX.json +++ b/resources/profiles/BIQU/machine/BIQU BX.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "BIQU", "bed_model": "BIQU_BX_buildplate_model.stl", - "bed_texture": "BIQU_BX_buildplate_texture.png", + "bed_texture": "BIQU_BX_buildplate_texture.svg", "hotend_model": "biqu_bx_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" } diff --git a/resources/profiles/BIQU/machine/BIQU Hurakan.json b/resources/profiles/BIQU/machine/BIQU Hurakan.json index 2dd676eb68..2cf4b4d7d3 100644 --- a/resources/profiles/BIQU/machine/BIQU Hurakan.json +++ b/resources/profiles/BIQU/machine/BIQU Hurakan.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "BIQU", "bed_model": "BIQU_Hurakan_buildplate_model.stl", - "bed_texture": "BIQU_Hurakan_buildplate_model.png", + "bed_texture": "BIQU_Hurakan_buildplate_texture.svg", "hotend_model": "biqu_hurakan_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" } diff --git a/resources/profiles/Blocks.json b/resources/profiles/Blocks.json index 651ed98964..6f39b96ef5 100644 --- a/resources/profiles/Blocks.json +++ b/resources/profiles/Blocks.json @@ -1,6 +1,6 @@ { "name": "Blocks", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Blocks configurations", "machine_model_list": [ diff --git a/resources/profiles/Blocks/PRO S100 HotBed texture.png b/resources/profiles/Blocks/PRO S100 HotBed texture.png deleted file mode 100644 index 357b473687..0000000000 Binary files a/resources/profiles/Blocks/PRO S100 HotBed texture.png and /dev/null differ diff --git a/resources/profiles/Blocks/PRO S100 HotBed texture.svg b/resources/profiles/Blocks/PRO S100 HotBed texture.svg new file mode 100644 index 0000000000..25f0059d58 --- /dev/null +++ b/resources/profiles/Blocks/PRO S100 HotBed texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Blocks/RD50 V2 HotBed texture.png b/resources/profiles/Blocks/RD50 V2 HotBed texture.png deleted file mode 100644 index b697f5b927..0000000000 Binary files a/resources/profiles/Blocks/RD50 V2 HotBed texture.png and /dev/null differ diff --git a/resources/profiles/Blocks/RD50 V2 HotBed texture.svg b/resources/profiles/Blocks/RD50 V2 HotBed texture.svg new file mode 100644 index 0000000000..9692db01c7 --- /dev/null +++ b/resources/profiles/Blocks/RD50 V2 HotBed texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Blocks/RF50 HotBed texture.png b/resources/profiles/Blocks/RF50 HotBed texture.png deleted file mode 100644 index c277b178e7..0000000000 Binary files a/resources/profiles/Blocks/RF50 HotBed texture.png and /dev/null differ diff --git a/resources/profiles/Blocks/RF50 HotBed texture.svg b/resources/profiles/Blocks/RF50 HotBed texture.svg new file mode 100644 index 0000000000..486301943c --- /dev/null +++ b/resources/profiles/Blocks/RF50 HotBed texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Blocks/machine/BLOCKS Pro S100.json b/resources/profiles/Blocks/machine/BLOCKS Pro S100.json index 5ff0c6a70e..abd474d3f1 100644 --- a/resources/profiles/Blocks/machine/BLOCKS Pro S100.json +++ b/resources/profiles/Blocks/machine/BLOCKS Pro S100.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Blocks", "bed_model": "PRO S100 HotBed model.stl", - "bed_texture": "PRO S100 HotBed texture.png", + "bed_texture": "PRO S100 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", "default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json b/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json index ce8abf6ce1..b3b82c876c 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json +++ b/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Blocks", "bed_model": "RD50 V2 HotBed model.stl", - "bed_texture": "RD50 V2 HotBed texture.png", + "bed_texture": "RD50 V2 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", "default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50.json b/resources/profiles/Blocks/machine/BLOCKS RF50.json index 2f2e3359ae..acc4e95f63 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Blocks", "bed_model": "RF50 HotBed model.stl", - "bed_texture": "RF50 HotBed texture.png", + "bed_texture": "RF50 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", "default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU" } diff --git a/resources/profiles/Chuanying.json b/resources/profiles/Chuanying.json index 657340bf16..325569339a 100644 --- a/resources/profiles/Chuanying.json +++ b/resources/profiles/Chuanying.json @@ -1,7 +1,7 @@ { "name": "Chuanying", "url": "", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Chuanying configurations", "machine_model_list": [ diff --git a/resources/profiles/Chuanying/chuanying_x1_buildplate_texture.png b/resources/profiles/Chuanying/chuanying_x1_buildplate_texture.png deleted file mode 100644 index 62e4658694..0000000000 Binary files a/resources/profiles/Chuanying/chuanying_x1_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Chuanying/chuanying_x1_buildplate_texture.svg b/resources/profiles/Chuanying/chuanying_x1_buildplate_texture.svg new file mode 100644 index 0000000000..68118d8cd7 --- /dev/null +++ b/resources/profiles/Chuanying/chuanying_x1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Chuanying/machine/Chuanying X1.json b/resources/profiles/Chuanying/machine/Chuanying X1.json index a854dcb654..c3debcfa76 100644 --- a/resources/profiles/Chuanying/machine/Chuanying X1.json +++ b/resources/profiles/Chuanying/machine/Chuanying X1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Chuanying", "bed_model": "chuanying_x1_buildplate_model.STL", - "bed_texture": "chuanying_x1_buildplate_texture.png", + "bed_texture": "chuanying_x1_buildplate_texture.svg", "hotend_model": "chuanying_x1_hotend.STL", "default_materials": "Chuanying Generic PETG;Chuanying Generic PLA" } diff --git a/resources/profiles/Co Print.json b/resources/profiles/Co Print.json index 78433932cb..7184d02328 100644 --- a/resources/profiles/Co Print.json +++ b/resources/profiles/Co Print.json @@ -1,6 +1,6 @@ { "name": "Co Print", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "CoPrint configurations", "machine_model_list": [ diff --git a/resources/profiles/Co Print/Co_Print_ChromaSet_buildplate_texture.png b/resources/profiles/Co Print/Co_Print_ChromaSet_buildplate_texture.png deleted file mode 100644 index be496254c0..0000000000 Binary files a/resources/profiles/Co Print/Co_Print_ChromaSet_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Co Print/Co_Print_ChromaSet_buildplate_texture.svg b/resources/profiles/Co Print/Co_Print_ChromaSet_buildplate_texture.svg new file mode 100644 index 0000000000..774dc9f41e --- /dev/null +++ b/resources/profiles/Co Print/Co_Print_ChromaSet_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet.json b/resources/profiles/Co Print/machine/Co Print ChromaSet.json index 76d3bc0e7d..883ee91c93 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Co Print", "bed_model": "", - "bed_texture": "Co_Print_ChromaSet_buildplate_texture.png", + "bed_texture": "Co_Print_ChromaSet_buildplate_texture.svg", "hotend_model": "", "default_materials": "CoPrint Generic PLA" } diff --git a/resources/profiles/CoLiDo/CoLiDo 160 V2_cover.png b/resources/profiles/CoLiDo/CoLiDo 160 V2_cover.png index 558641f54d..bfa28d72dc 100644 Binary files a/resources/profiles/CoLiDo/CoLiDo 160 V2_cover.png and b/resources/profiles/CoLiDo/CoLiDo 160 V2_cover.png differ diff --git a/resources/profiles/CoLiDo/CoLiDo DIY 4.0_cover.png b/resources/profiles/CoLiDo/CoLiDo DIY 4.0_cover.png index 13646d0c95..51410d4d35 100644 Binary files a/resources/profiles/CoLiDo/CoLiDo DIY 4.0_cover.png and b/resources/profiles/CoLiDo/CoLiDo DIY 4.0_cover.png differ diff --git a/resources/profiles/CoLiDo/CoLiDo X16_cover.png b/resources/profiles/CoLiDo/CoLiDo X16_cover.png index 4f4c602d77..bfa28d72dc 100644 Binary files a/resources/profiles/CoLiDo/CoLiDo X16_cover.png and b/resources/profiles/CoLiDo/CoLiDo X16_cover.png differ diff --git a/resources/profiles/Comgrow.json b/resources/profiles/Comgrow.json index 6c768f524c..13f8fad50f 100644 --- a/resources/profiles/Comgrow.json +++ b/resources/profiles/Comgrow.json @@ -1,6 +1,6 @@ { "name": "Comgrow", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Comgrow configurations", "machine_model_list": [ diff --git a/resources/profiles/Comgrow/comgrow_t300_buildplate_model.stl b/resources/profiles/Comgrow/comgrow_t300_buildplate_model.stl index 1a066e0539..138e99fb86 100644 Binary files a/resources/profiles/Comgrow/comgrow_t300_buildplate_model.stl and b/resources/profiles/Comgrow/comgrow_t300_buildplate_model.stl differ diff --git a/resources/profiles/Comgrow/comgrow_t300_buildplate_texture.png b/resources/profiles/Comgrow/comgrow_t300_buildplate_texture.png deleted file mode 100644 index f0da3b2543..0000000000 Binary files a/resources/profiles/Comgrow/comgrow_t300_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Comgrow/comgrow_t300_buildplate_texture.svg b/resources/profiles/Comgrow/comgrow_t300_buildplate_texture.svg new file mode 100644 index 0000000000..202709baf3 --- /dev/null +++ b/resources/profiles/Comgrow/comgrow_t300_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.png b/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.png deleted file mode 100644 index 2c20b53703..0000000000 Binary files a/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.svg b/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.svg new file mode 100644 index 0000000000..02e4bd42e9 --- /dev/null +++ b/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Comgrow/machine/Comgrow T300.json b/resources/profiles/Comgrow/machine/Comgrow T300.json index 159264daf4..41c94aa193 100644 --- a/resources/profiles/Comgrow/machine/Comgrow T300.json +++ b/resources/profiles/Comgrow/machine/Comgrow T300.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Comgrow", "bed_model": "comgrow_t300_buildplate_model.stl", - "bed_texture": "comgrow_t300_buildplate_texture.png", + "bed_texture": "comgrow_t300_buildplate_texture.svg", "hotend_model": "", "default_materials": "Comgrow T300 PLA" } diff --git a/resources/profiles/Comgrow/machine/Comgrow T500.json b/resources/profiles/Comgrow/machine/Comgrow T500.json index fdb3f8c040..e7945de67a 100644 --- a/resources/profiles/Comgrow/machine/Comgrow T500.json +++ b/resources/profiles/Comgrow/machine/Comgrow T500.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Comgrow", "bed_model": "comgrow_t500_buildplate_model.stl", - "bed_texture": "comgrow_t500_buildplate_texture.png", + "bed_texture": "comgrow_t500_buildplate_texture.svg", "hotend_model": "", "default_materials": "Comgrow Generic PLA;Comgrow Generic PETG;Comgrow Generic ABS" } diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index 31eca88b46..2616d6696c 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -1,6 +1,6 @@ { "name": "Creality", - "version": "02.03.02.61", + "version": "02.03.02.70", "force_update": "0", "description": "Creality configurations", "machine_model_list": [ diff --git a/resources/profiles/Creality/Creality CR-10 Max_cover.png b/resources/profiles/Creality/Creality CR-10 Max_cover.png index dc2e32cb3d..b00418c197 100644 Binary files a/resources/profiles/Creality/Creality CR-10 Max_cover.png and b/resources/profiles/Creality/Creality CR-10 Max_cover.png differ diff --git a/resources/profiles/Creality/Creality CR-10 SE_cover.png b/resources/profiles/Creality/Creality CR-10 SE_cover.png index 799af89053..12302a0ca7 100644 Binary files a/resources/profiles/Creality/Creality CR-10 SE_cover.png and b/resources/profiles/Creality/Creality CR-10 SE_cover.png differ diff --git a/resources/profiles/Creality/Creality CR-10 V2_cover.png b/resources/profiles/Creality/Creality CR-10 V2_cover.png index 3d7c6a5f56..de07461203 100644 Binary files a/resources/profiles/Creality/Creality CR-10 V2_cover.png and b/resources/profiles/Creality/Creality CR-10 V2_cover.png differ diff --git a/resources/profiles/Creality/Creality CR-10 V3_cover.png b/resources/profiles/Creality/Creality CR-10 V3_cover.png index 46287c7a45..77c268936d 100644 Binary files a/resources/profiles/Creality/Creality CR-10 V3_cover.png and b/resources/profiles/Creality/Creality CR-10 V3_cover.png differ diff --git a/resources/profiles/Creality/Creality CR-6 Max_cover.png b/resources/profiles/Creality/Creality CR-6 Max_cover.png index 83573b3f9f..e0dd7b0619 100644 Binary files a/resources/profiles/Creality/Creality CR-6 Max_cover.png and b/resources/profiles/Creality/Creality CR-6 Max_cover.png differ diff --git a/resources/profiles/Creality/Creality CR-6 SE_cover.png b/resources/profiles/Creality/Creality CR-6 SE_cover.png index bcceed8c23..39261deb6e 100644 Binary files a/resources/profiles/Creality/Creality CR-6 SE_cover.png and b/resources/profiles/Creality/Creality CR-6 SE_cover.png differ diff --git a/resources/profiles/Creality/Creality CR-M4_cover.png b/resources/profiles/Creality/Creality CR-M4_cover.png index 7f6d77898b..91985cbe35 100644 Binary files a/resources/profiles/Creality/Creality CR-M4_cover.png and b/resources/profiles/Creality/Creality CR-M4_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 Pro_cover.png b/resources/profiles/Creality/Creality Ender-3 Pro_cover.png index 2592d43c30..c411916d2a 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 Pro_cover.png and b/resources/profiles/Creality/Creality Ender-3 Pro_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 S1 Plus_cover.png b/resources/profiles/Creality/Creality Ender-3 S1 Plus_cover.png index 39638e019a..67de8b4938 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 S1 Plus_cover.png and b/resources/profiles/Creality/Creality Ender-3 S1 Plus_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 S1 Pro_cover.png b/resources/profiles/Creality/Creality Ender-3 S1 Pro_cover.png index d5fae1c5ae..e0064cdb29 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 S1 Pro_cover.png and b/resources/profiles/Creality/Creality Ender-3 S1 Pro_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 S1_cover.png b/resources/profiles/Creality/Creality Ender-3 S1_cover.png index aad279e711..fdcdcc70b3 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 S1_cover.png and b/resources/profiles/Creality/Creality Ender-3 S1_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 V2 Neo_cover.png b/resources/profiles/Creality/Creality Ender-3 V2 Neo_cover.png index 995b7864d1..4927638ae8 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 V2 Neo_cover.png and b/resources/profiles/Creality/Creality Ender-3 V2 Neo_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 V2_cover.png b/resources/profiles/Creality/Creality Ender-3 V2_cover.png index 39a68076b3..9f05007cac 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 V2_cover.png and b/resources/profiles/Creality/Creality Ender-3 V2_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 V3 KE_cover.png b/resources/profiles/Creality/Creality Ender-3 V3 KE_cover.png index 1179f0d53d..0d4359c67e 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 V3 KE_cover.png and b/resources/profiles/Creality/Creality Ender-3 V3 KE_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 V3 Plus_cover.png b/resources/profiles/Creality/Creality Ender-3 V3 Plus_cover.png index 9a42a991d7..0961ab842d 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 V3 Plus_cover.png and b/resources/profiles/Creality/Creality Ender-3 V3 Plus_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 V3 SE_cover.png b/resources/profiles/Creality/Creality Ender-3 V3 SE_cover.png index cd0a3ce0b2..463ae1f90b 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 V3 SE_cover.png and b/resources/profiles/Creality/Creality Ender-3 V3 SE_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3 V3_cover.png b/resources/profiles/Creality/Creality Ender-3 V3_cover.png index ac3568c94b..74e67482fd 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 V3_cover.png and b/resources/profiles/Creality/Creality Ender-3 V3_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-3_cover.png b/resources/profiles/Creality/Creality Ender-3_cover.png index d5af7b7e0f..5a3dcb9043 100644 Binary files a/resources/profiles/Creality/Creality Ender-3_cover.png and b/resources/profiles/Creality/Creality Ender-3_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-5 Max_cover.png b/resources/profiles/Creality/Creality Ender-5 Max_cover.png index 80415333f7..1ed0d90230 100644 Binary files a/resources/profiles/Creality/Creality Ender-5 Max_cover.png and b/resources/profiles/Creality/Creality Ender-5 Max_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-5 Plus_cover.png b/resources/profiles/Creality/Creality Ender-5 Plus_cover.png index e8bf144e78..9be95d9a34 100644 Binary files a/resources/profiles/Creality/Creality Ender-5 Plus_cover.png and b/resources/profiles/Creality/Creality Ender-5 Plus_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-5 Pro (2019)_cover.png b/resources/profiles/Creality/Creality Ender-5 Pro (2019)_cover.png index cd92b6a9a7..dd2d6644db 100644 Binary files a/resources/profiles/Creality/Creality Ender-5 Pro (2019)_cover.png and b/resources/profiles/Creality/Creality Ender-5 Pro (2019)_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-5 S1_cover.png b/resources/profiles/Creality/Creality Ender-5 S1_cover.png index 4ef376a9c9..b8eeba37ef 100644 Binary files a/resources/profiles/Creality/Creality Ender-5 S1_cover.png and b/resources/profiles/Creality/Creality Ender-5 S1_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-5S_cover.png b/resources/profiles/Creality/Creality Ender-5S_cover.png index 8ac5d009cc..1f90ee4389 100644 Binary files a/resources/profiles/Creality/Creality Ender-5S_cover.png and b/resources/profiles/Creality/Creality Ender-5S_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-5_cover.png b/resources/profiles/Creality/Creality Ender-5_cover.png index a77de0c369..1f90ee4389 100644 Binary files a/resources/profiles/Creality/Creality Ender-5_cover.png and b/resources/profiles/Creality/Creality Ender-5_cover.png differ diff --git a/resources/profiles/Creality/Creality Ender-6_cover.png b/resources/profiles/Creality/Creality Ender-6_cover.png index 96b2cba416..696aecc336 100644 Binary files a/resources/profiles/Creality/Creality Ender-6_cover.png and b/resources/profiles/Creality/Creality Ender-6_cover.png differ diff --git a/resources/profiles/Creality/Creality Hi_cover.png b/resources/profiles/Creality/Creality Hi_cover.png index a7343e1186..5b61bf02f4 100644 Binary files a/resources/profiles/Creality/Creality Hi_cover.png and b/resources/profiles/Creality/Creality Hi_cover.png differ diff --git a/resources/profiles/Creality/Creality K1 Max_cover.png b/resources/profiles/Creality/Creality K1 Max_cover.png index 7d6cb09b67..37307637a0 100644 Binary files a/resources/profiles/Creality/Creality K1 Max_cover.png and b/resources/profiles/Creality/Creality K1 Max_cover.png differ diff --git a/resources/profiles/Creality/Creality K1 SE_cover.png b/resources/profiles/Creality/Creality K1 SE_cover.png index 09642cbcc9..57692351e6 100644 Binary files a/resources/profiles/Creality/Creality K1 SE_cover.png and b/resources/profiles/Creality/Creality K1 SE_cover.png differ diff --git a/resources/profiles/Creality/Creality K1C_cover.png b/resources/profiles/Creality/Creality K1C_cover.png index 1b5fda4ce5..8b8c2f20a5 100644 Binary files a/resources/profiles/Creality/Creality K1C_cover.png and b/resources/profiles/Creality/Creality K1C_cover.png differ diff --git a/resources/profiles/Creality/Creality K1_cover.png b/resources/profiles/Creality/Creality K1_cover.png index 5cff5d2187..eea76c1ba0 100644 Binary files a/resources/profiles/Creality/Creality K1_cover.png and b/resources/profiles/Creality/Creality K1_cover.png differ diff --git a/resources/profiles/Creality/Creality K2 Plus_cover.png b/resources/profiles/Creality/Creality K2 Plus_cover.png index b2f5ab7c89..5146856cc9 100644 Binary files a/resources/profiles/Creality/Creality K2 Plus_cover.png and b/resources/profiles/Creality/Creality K2 Plus_cover.png differ diff --git a/resources/profiles/Creality/Creality K2 Pro_cover.png b/resources/profiles/Creality/Creality K2 Pro_cover.png index 31a912708c..5e6ab47fee 100644 Binary files a/resources/profiles/Creality/Creality K2 Pro_cover.png and b/resources/profiles/Creality/Creality K2 Pro_cover.png differ diff --git a/resources/profiles/Creality/Creality K2_cover.png b/resources/profiles/Creality/Creality K2_cover.png index 77928c5d9e..fd131fa85b 100644 Binary files a/resources/profiles/Creality/Creality K2_cover.png and b/resources/profiles/Creality/Creality K2_cover.png differ diff --git a/resources/profiles/Creality/Creality Sermoon V1_cover.png b/resources/profiles/Creality/Creality Sermoon V1_cover.png index 5736dbe7b5..a03a156c9f 100644 Binary files a/resources/profiles/Creality/Creality Sermoon V1_cover.png and b/resources/profiles/Creality/Creality Sermoon V1_cover.png differ diff --git a/resources/profiles/Creality/creality_cr10max_buildplate_texture.png b/resources/profiles/Creality/creality_cr10max_buildplate_texture.png deleted file mode 100644 index c87a116ff5..0000000000 Binary files a/resources/profiles/Creality/creality_cr10max_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_cr10max_buildplate_texture.svg b/resources/profiles/Creality/creality_cr10max_buildplate_texture.svg new file mode 100644 index 0000000000..7f49a75270 --- /dev/null +++ b/resources/profiles/Creality/creality_cr10max_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_cr10se_buildplate_texture.png b/resources/profiles/Creality/creality_cr10se_buildplate_texture.png deleted file mode 100644 index f9d61c63ca..0000000000 Binary files a/resources/profiles/Creality/creality_cr10se_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_cr10se_buildplate_texture.svg b/resources/profiles/Creality/creality_cr10se_buildplate_texture.svg new file mode 100644 index 0000000000..b85ab79453 --- /dev/null +++ b/resources/profiles/Creality/creality_cr10se_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_cr10v2_buildplate_texture.png b/resources/profiles/Creality/creality_cr10v2_buildplate_texture.png deleted file mode 100644 index 0098bd6fa2..0000000000 Binary files a/resources/profiles/Creality/creality_cr10v2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_cr10v2_buildplate_texture.svg b/resources/profiles/Creality/creality_cr10v2_buildplate_texture.svg new file mode 100644 index 0000000000..d37228ccaa --- /dev/null +++ b/resources/profiles/Creality/creality_cr10v2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_cr10v3_buildplate_texture.png b/resources/profiles/Creality/creality_cr10v3_buildplate_texture.png deleted file mode 100644 index 0098bd6fa2..0000000000 Binary files a/resources/profiles/Creality/creality_cr10v3_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_cr10v3_buildplate_texture.svg b/resources/profiles/Creality/creality_cr10v3_buildplate_texture.svg new file mode 100644 index 0000000000..d37228ccaa --- /dev/null +++ b/resources/profiles/Creality/creality_cr10v3_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_cr6max_buildplate_texture.svg b/resources/profiles/Creality/creality_cr6max_buildplate_texture.svg new file mode 100644 index 0000000000..92b180532a --- /dev/null +++ b/resources/profiles/Creality/creality_cr6max_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_cr6se_buildplate_texture.png b/resources/profiles/Creality/creality_cr6se_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_cr6se_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_cr6se_buildplate_texture.svg b/resources/profiles/Creality/creality_cr6se_buildplate_texture.svg new file mode 100644 index 0000000000..1461c85413 --- /dev/null +++ b/resources/profiles/Creality/creality_cr6se_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_crm4_buildplate_model.stl b/resources/profiles/Creality/creality_crm4_buildplate_model.stl index 58de989fac..b1e981ef0f 100644 Binary files a/resources/profiles/Creality/creality_crm4_buildplate_model.stl and b/resources/profiles/Creality/creality_crm4_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_crm4_buildplate_texture.png b/resources/profiles/Creality/creality_crm4_buildplate_texture.png deleted file mode 100644 index c87a116ff5..0000000000 Binary files a/resources/profiles/Creality/creality_crm4_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_crm4_buildplate_texture.svg b/resources/profiles/Creality/creality_crm4_buildplate_texture.svg new file mode 100644 index 0000000000..aff3550f75 --- /dev/null +++ b/resources/profiles/Creality/creality_crm4_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3s1_buildplate_model.stl b/resources/profiles/Creality/creality_ender3s1_buildplate_model.stl index b025ac9e71..484e7ebf03 100644 Binary files a/resources/profiles/Creality/creality_ender3s1_buildplate_model.stl and b/resources/profiles/Creality/creality_ender3s1_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_ender3s1_buildplate_texture.png b/resources/profiles/Creality/creality_ender3s1_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_ender3s1_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3s1_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3s1_buildplate_texture.svg new file mode 100644 index 0000000000..ba8844e163 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3s1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3s1plus_buildplate_texture.png b/resources/profiles/Creality/creality_ender3s1plus_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_ender3s1plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3s1plus_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3s1plus_buildplate_texture.svg new file mode 100644 index 0000000000..c5a87ef366 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3s1plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3s1pro_buildplate_texture.png b/resources/profiles/Creality/creality_ender3s1pro_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_ender3s1pro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3s1pro_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3s1pro_buildplate_texture.svg new file mode 100644 index 0000000000..ba8844e163 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3s1pro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3v2_buildplate_texture.png b/resources/profiles/Creality/creality_ender3v2_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_ender3v2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3v2_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3v2_buildplate_texture.svg new file mode 100644 index 0000000000..8d6abde641 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3v2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3v2neo_buildplate_model.stl b/resources/profiles/Creality/creality_ender3v2neo_buildplate_model.stl index 37b66670ba..484e7ebf03 100644 Binary files a/resources/profiles/Creality/creality_ender3v2neo_buildplate_model.stl and b/resources/profiles/Creality/creality_ender3v2neo_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_ender3v2neo_buildplate_texture.png b/resources/profiles/Creality/creality_ender3v2neo_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_ender3v2neo_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3v2neo_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3v2neo_buildplate_texture.svg new file mode 100644 index 0000000000..ba8844e163 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3v2neo_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3v3_buildplate_texture.png b/resources/profiles/Creality/creality_ender3v3_buildplate_texture.png deleted file mode 100644 index 2e8d441e67..0000000000 Binary files a/resources/profiles/Creality/creality_ender3v3_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3v3_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3v3_buildplate_texture.svg new file mode 100644 index 0000000000..b85ab79453 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3v3_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.png b/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.png deleted file mode 100644 index 745c3083d0..0000000000 Binary files a/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.svg new file mode 100644 index 0000000000..b85ab79453 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3v3plus_buildplate_texture.png.png b/resources/profiles/Creality/creality_ender3v3plus_buildplate_texture.png.png deleted file mode 100644 index 4dcf16e604..0000000000 Binary files a/resources/profiles/Creality/creality_ender3v3plus_buildplate_texture.png.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3v3plus_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3v3plus_buildplate_texture.svg new file mode 100644 index 0000000000..c408483599 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3v3plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.png b/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.png deleted file mode 100644 index 2e8d441e67..0000000000 Binary files a/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.svg new file mode 100644 index 0000000000..b85ab79453 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender5_buildplate_texture.png b/resources/profiles/Creality/creality_ender5_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_ender5_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender5_buildplate_texture.svg b/resources/profiles/Creality/creality_ender5_buildplate_texture.svg new file mode 100644 index 0000000000..8d6abde641 --- /dev/null +++ b/resources/profiles/Creality/creality_ender5_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender5max_buildplate_texture.png b/resources/profiles/Creality/creality_ender5max_buildplate_texture.png deleted file mode 100644 index 2d0d384d42..0000000000 Binary files a/resources/profiles/Creality/creality_ender5max_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender5max_buildplate_texture.svg b/resources/profiles/Creality/creality_ender5max_buildplate_texture.svg new file mode 100644 index 0000000000..df261bd720 --- /dev/null +++ b/resources/profiles/Creality/creality_ender5max_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender5plus_buildplate_model.stl b/resources/profiles/Creality/creality_ender5plus_buildplate_model.stl index 55a4416517..bb3b3ddb44 100644 Binary files a/resources/profiles/Creality/creality_ender5plus_buildplate_model.stl and b/resources/profiles/Creality/creality_ender5plus_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_ender5plus_buildplate_texture.png b/resources/profiles/Creality/creality_ender5plus_buildplate_texture.png deleted file mode 100644 index 2d91111eb5..0000000000 Binary files a/resources/profiles/Creality/creality_ender5plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender5plus_buildplate_texture.svg b/resources/profiles/Creality/creality_ender5plus_buildplate_texture.svg new file mode 100644 index 0000000000..3e977a5a83 --- /dev/null +++ b/resources/profiles/Creality/creality_ender5plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender5pro_buildplate_texture.png b/resources/profiles/Creality/creality_ender5pro_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_ender5pro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender5pro_buildplate_texture.svg b/resources/profiles/Creality/creality_ender5pro_buildplate_texture.svg new file mode 100644 index 0000000000..8d6abde641 --- /dev/null +++ b/resources/profiles/Creality/creality_ender5pro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender5s1_buildplate_texture.png b/resources/profiles/Creality/creality_ender5s1_buildplate_texture.png deleted file mode 100644 index 9a9e00239c..0000000000 Binary files a/resources/profiles/Creality/creality_ender5s1_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender5s1_buildplate_texture.svg b/resources/profiles/Creality/creality_ender5s1_buildplate_texture.svg new file mode 100644 index 0000000000..ba8844e163 --- /dev/null +++ b/resources/profiles/Creality/creality_ender5s1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender5s_buildplate_texture.png b/resources/profiles/Creality/creality_ender5s_buildplate_texture.png deleted file mode 100644 index 1d9ed77a17..0000000000 Binary files a/resources/profiles/Creality/creality_ender5s_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender5s_buildplate_texture.svg b/resources/profiles/Creality/creality_ender5s_buildplate_texture.svg new file mode 100644 index 0000000000..8d6abde641 --- /dev/null +++ b/resources/profiles/Creality/creality_ender5s_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender6_buildplate_texture.png b/resources/profiles/Creality/creality_ender6_buildplate_texture.png deleted file mode 100644 index ba7abacd57..0000000000 Binary files a/resources/profiles/Creality/creality_ender6_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_ender6_buildplate_texture.svg b/resources/profiles/Creality/creality_ender6_buildplate_texture.svg new file mode 100644 index 0000000000..62189cc746 --- /dev/null +++ b/resources/profiles/Creality/creality_ender6_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_hi_buildplate_texture.png b/resources/profiles/Creality/creality_hi_buildplate_texture.png deleted file mode 100644 index d08316d5ec..0000000000 Binary files a/resources/profiles/Creality/creality_hi_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_hi_buildplate_texture.svg b/resources/profiles/Creality/creality_hi_buildplate_texture.svg new file mode 100644 index 0000000000..0ba4ee48da --- /dev/null +++ b/resources/profiles/Creality/creality_hi_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_k1_buildplate_texture.png b/resources/profiles/Creality/creality_k1_buildplate_texture.png deleted file mode 100644 index cde0238078..0000000000 Binary files a/resources/profiles/Creality/creality_k1_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_k1_buildplate_texture.svg b/resources/profiles/Creality/creality_k1_buildplate_texture.svg new file mode 100644 index 0000000000..99c1550615 --- /dev/null +++ b/resources/profiles/Creality/creality_k1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_k1c_buildplate_texture.png b/resources/profiles/Creality/creality_k1c_buildplate_texture.png deleted file mode 100644 index 2e8d441e67..0000000000 Binary files a/resources/profiles/Creality/creality_k1c_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_k1c_buildplate_texture.svg b/resources/profiles/Creality/creality_k1c_buildplate_texture.svg new file mode 100644 index 0000000000..99c1550615 --- /dev/null +++ b/resources/profiles/Creality/creality_k1c_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_k1max_buildplate_texture.png b/resources/profiles/Creality/creality_k1max_buildplate_texture.png deleted file mode 100644 index 4dcf16e604..0000000000 Binary files a/resources/profiles/Creality/creality_k1max_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_k1max_buildplate_texture.svg b/resources/profiles/Creality/creality_k1max_buildplate_texture.svg new file mode 100644 index 0000000000..6c4647c29c --- /dev/null +++ b/resources/profiles/Creality/creality_k1max_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_k1se_buildplate_texture.png b/resources/profiles/Creality/creality_k1se_buildplate_texture.png deleted file mode 100644 index cde0238078..0000000000 Binary files a/resources/profiles/Creality/creality_k1se_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_k1se_buildplate_texture.svg b/resources/profiles/Creality/creality_k1se_buildplate_texture.svg new file mode 100644 index 0000000000..99c1550615 --- /dev/null +++ b/resources/profiles/Creality/creality_k1se_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_k2_buildplate_model.stl b/resources/profiles/Creality/creality_k2_buildplate_model.stl index c442446270..ea27ded434 100644 Binary files a/resources/profiles/Creality/creality_k2_buildplate_model.stl and b/resources/profiles/Creality/creality_k2_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_k2_buildplate_texture.png b/resources/profiles/Creality/creality_k2_buildplate_texture.png deleted file mode 100644 index 4dcf16e604..0000000000 Binary files a/resources/profiles/Creality/creality_k2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_k2_buildplate_texture.svg b/resources/profiles/Creality/creality_k2_buildplate_texture.svg new file mode 100644 index 0000000000..53f9ee4f54 --- /dev/null +++ b/resources/profiles/Creality/creality_k2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_k2plus_buildplate_texture.png b/resources/profiles/Creality/creality_k2plus_buildplate_texture.png deleted file mode 100644 index 4dcf16e604..0000000000 Binary files a/resources/profiles/Creality/creality_k2plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_k2plus_buildplate_texture.svg b/resources/profiles/Creality/creality_k2plus_buildplate_texture.svg new file mode 100644 index 0000000000..d992df26de --- /dev/null +++ b/resources/profiles/Creality/creality_k2plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_k2pro_buildplate_model.stl b/resources/profiles/Creality/creality_k2pro_buildplate_model.stl index 3f2d9ff51f..7392fe7dc6 100644 Binary files a/resources/profiles/Creality/creality_k2pro_buildplate_model.stl and b/resources/profiles/Creality/creality_k2pro_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_k2pro_buildplate_texture.png b/resources/profiles/Creality/creality_k2pro_buildplate_texture.png deleted file mode 100644 index 4dcf16e604..0000000000 Binary files a/resources/profiles/Creality/creality_k2pro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Creality/creality_k2pro_buildplate_texture.svg b/resources/profiles/Creality/creality_k2pro_buildplate_texture.svg new file mode 100644 index 0000000000..3107a76d8e --- /dev/null +++ b/resources/profiles/Creality/creality_k2pro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_sermoonv1_buildplate_model.stl b/resources/profiles/Creality/creality_sermoonv1_buildplate_model.stl new file mode 100644 index 0000000000..fdf4b6c430 Binary files /dev/null and b/resources/profiles/Creality/creality_sermoonv1_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_sermoonv1_buildplate_texture.svg b/resources/profiles/Creality/creality_sermoonv1_buildplate_texture.svg new file mode 100644 index 0000000000..d8fc85dbde --- /dev/null +++ b/resources/profiles/Creality/creality_sermoonv1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality CR-10 Max.json b/resources/profiles/Creality/machine/Creality CR-10 Max.json index 0eff5b35c5..5922576073 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 Max.json +++ b/resources/profiles/Creality/machine/Creality CR-10 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_cr10max_buildplate_model.stl", - "bed_texture": "creality_cr10max_buildplate_texture.png", + "bed_texture": "creality_cr10max_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE.json b/resources/profiles/Creality/machine/Creality CR-10 SE.json index 3060113b7f..6e57e38c0c 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_cr10se_buildplate_model.stl", - "bed_texture": "creality_cr10se_buildplate_texture.png", + "bed_texture": "creality_cr10se_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PETG;Creality Generic TPU;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality CR-10 V2.json b/resources/profiles/Creality/machine/Creality CR-10 V2.json index 18ee983ea9..a709fe2309 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 V2.json +++ b/resources/profiles/Creality/machine/Creality CR-10 V2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_cr10v2_buildplate_model.stl", - "bed_texture": "creality_cr10v2_buildplate_texture.png", + "bed_texture": "creality_cr10v2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality CR-10 V3.json b/resources/profiles/Creality/machine/Creality CR-10 V3.json index 236a87333f..37cfe67f05 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 V3.json +++ b/resources/profiles/Creality/machine/Creality CR-10 V3.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_cr10v3_buildplate_model.stl", - "bed_texture": "creality_cr10v3_buildplate_texture.png", + "bed_texture": "creality_cr10v3_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max.json b/resources/profiles/Creality/machine/Creality CR-6 Max.json index 850c6af74d..aa1925da6e 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max.json @@ -3,7 +3,7 @@ "name": "Creality CR-6 Max", "nozzle_diameter": "0.2;0.4;0.6;0.8", "bed_model": "creality_cr6max_buildplate_model.stl", - "bed_texture": "creality_cr6se_buildplate_texture.png", + "bed_texture": "creality_cr6max_buildplate_texture.svg", "family": "Creality", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE.json b/resources/profiles/Creality/machine/Creality CR-6 SE.json index e93dfcc22e..2d7026c31d 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE.json @@ -3,7 +3,7 @@ "name": "Creality CR-6 SE", "nozzle_diameter": "0.2;0.4;0.6;0.8", "bed_model": "creality_cr6se_buildplate_model.stl", - "bed_texture": "creality_cr6se_buildplate_texture.png", + "bed_texture": "creality_cr6se_buildplate_texture.svg", "family": "Creality", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Creality/machine/Creality CR-M4.json b/resources/profiles/Creality/machine/Creality CR-M4.json index 79ad81768c..0cb519eec9 100644 --- a/resources/profiles/Creality/machine/Creality CR-M4.json +++ b/resources/profiles/Creality/machine/Creality CR-M4.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_crm4_buildplate_model.stl", - "bed_texture": "creality_crm4_buildplate_texture.png", + "bed_texture": "creality_crm4_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro.json index 877835cb7a..982a2256bf 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3v2_buildplate_model.stl", - "bed_texture": "creality_ender3v2_buildplate_texture.png", + "bed_texture": "creality_ender3v2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json index 74718410df..134df7200d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3s1plus_buildplate_model.stl", - "bed_texture": "creality_ender3s1plus_buildplate_texture.png", + "bed_texture": "creality_ender3s1plus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json index 5712342369..2ce3d35e19 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3s1pro_buildplate_model.stl", - "bed_texture": "creality_ender3s1pro_buildplate_texture.png", + "bed_texture": "creality_ender3s1pro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1.json b/resources/profiles/Creality/machine/Creality Ender-3 S1.json index 4a962d26ca..aec61a4289 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3s1_buildplate_model.stl", - "bed_texture": "creality_ender3s1_buildplate_texture.png", + "bed_texture": "creality_ender3s1_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo.json b/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo.json index 8afdbfbae6..827ae40bc3 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3v2neo_buildplate_model.stl", - "bed_texture": "creality_ender3v2neo_buildplate_texture.png", + "bed_texture": "creality_ender3v2neo_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PLA;Creality Generic PETG" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V2.json b/resources/profiles/Creality/machine/Creality Ender-3 V2.json index 780d76b13d..88665f5892 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V2.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3v2_buildplate_model.stl", - "bed_texture": "creality_ender3v2_buildplate_texture.png", + "bed_texture": "creality_ender3v2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE.json index 6c11e0e1ba..63ac65eec6 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3v3ke_buildplate_model.stl", - "bed_texture": "creality_ender3v3ke_buildplate_texture.png", + "bed_texture": "creality_ender3v3ke_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus.json index 579d0304b6..b471a9ab08 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3v3plus_buildplate_model.stl", - "bed_texture": "creality_ender3v3plus_buildplate_texture.png", + "bed_texture": "creality_ender3v3plus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE.json index 3d9a5ddde9..2ceb56c108 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3v3se_buildplate_model.stl", - "bed_texture": "creality_ender3v3se_buildplate_texture.png", + "bed_texture": "creality_ender3v3se_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3.json b/resources/profiles/Creality/machine/Creality Ender-3 V3.json index d3f84deee6..74f5c275fc 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3v3_buildplate_model.stl", - "bed_texture": "creality_ender3v3_buildplate_texture.png", + "bed_texture": "creality_ender3v3_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3.json b/resources/profiles/Creality/machine/Creality Ender-3.json index e91ce1b765..66a234e378 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3.json +++ b/resources/profiles/Creality/machine/Creality Ender-3.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender3v2_buildplate_model.stl", - "bed_texture": "creality_ender3v2_buildplate_texture.png", + "bed_texture": "creality_ender3v2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Max.json b/resources/profiles/Creality/machine/Creality Ender-5 Max.json index 5f1304eed7..993b6fee1f 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Max.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender5max_buildplate_model.stl", - "bed_texture": "creality_ender5max_buildplate_texture.png", + "bed_texture": "creality_ender5max_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Hyper PLA-CF @Ender-5Max-all;Creality Hyper PLA @Ender-5Max-all;Creality Hyper ABS @Ender-5Max-all;Creality Generic TPU @Ender-5Max-all;Creality Generic ASA @Ender-5Max-all;Creality Silk PLA @Ender-5Max-all;Creality Generic PLA @Ender-5Max-all;Creality Generic PETG @Ender-5Max-all;Creality Generic ABS @Ender-5Max-all;Creality Generic PA @Ender-5Max-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Plus.json b/resources/profiles/Creality/machine/Creality Ender-5 Plus.json index b8ddd17725..2950cdacf5 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Plus.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender5plus_buildplate_model.stl", - "bed_texture": "creality_ender5plus_buildplate_texture.png", + "bed_texture": "creality_ender5plus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json index d95a0a78c8..1863dd03c6 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender5pro_buildplate_model.stl", - "bed_texture": "creality_ender5pro_buildplate_texture.png", + "bed_texture": "creality_ender5pro_buildplate_texture.svg", "hotend_model": "hotend.stl", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5 S1.json b/resources/profiles/Creality/machine/Creality Ender-5 S1.json index 78285d3da5..23ec29b299 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 S1.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 S1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender5s1_buildplate_model.stl", - "bed_texture": "creality_ender5s1_buildplate_texture.png", + "bed_texture": "creality_ender5s1_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5.json b/resources/profiles/Creality/machine/Creality Ender-5.json index 5f6a6dfe72..f43c00b81b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5.json +++ b/resources/profiles/Creality/machine/Creality Ender-5.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender5_buildplate_model.stl", - "bed_texture": "creality_ender5_buildplate_texture.png", + "bed_texture": "creality_ender5_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5S.json b/resources/profiles/Creality/machine/Creality Ender-5S.json index e5ae6d5b4d..ff1f2633fa 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5S.json +++ b/resources/profiles/Creality/machine/Creality Ender-5S.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender5s_buildplate_model.stl", - "bed_texture": "creality_ender5s_buildplate_texture.png", + "bed_texture": "creality_ender5s_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Ender-6.json b/resources/profiles/Creality/machine/Creality Ender-6.json index 7e91e96ea3..f327bd97b0 100644 --- a/resources/profiles/Creality/machine/Creality Ender-6.json +++ b/resources/profiles/Creality/machine/Creality Ender-6.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender6_buildplate_model.stl", - "bed_texture": "creality_ender6_buildplate_texture.png", + "bed_texture": "creality_ender6_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" } diff --git a/resources/profiles/Creality/machine/Creality Hi.json b/resources/profiles/Creality/machine/Creality Hi.json index 3e4e686af8..7415bf942c 100644 --- a/resources/profiles/Creality/machine/Creality Hi.json +++ b/resources/profiles/Creality/machine/Creality Hi.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_hi_buildplate_model.stl", - "bed_texture": "creality_hi_buildplate_texture.png", + "bed_texture": "creality_hi_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "", "default_materials": "Creality Generic ABS @Hi-all;Creality Generic ASA @Hi-all;Creality Generic ASA-CF @Hi-all;Creality Generic PETG @Hi-all;Creality Generic PETG-CF @Hi-all;Creality Generic PLA @Hi-all;Creality Generic PLA High Speed @Hi-all;Creality Generic PLA Matte @Hi-all;Creality Generic PLA Silk @Hi-all;Creality Generic PLA-CF @Hi-all;Creality Generic PLA Wood @Hi-all;Creality Generic TPU @Hi-all" diff --git a/resources/profiles/Creality/machine/Creality K1 Max.json b/resources/profiles/Creality/machine/Creality K1 Max.json index 6ff71eff65..fe56e243d0 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max.json +++ b/resources/profiles/Creality/machine/Creality K1 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_k1max_buildplate_model.stl", - "bed_texture": "creality_k1max_buildplate_texture.png", + "bed_texture": "creality_k1max_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU" } diff --git a/resources/profiles/Creality/machine/Creality K1 SE.json b/resources/profiles/Creality/machine/Creality K1 SE.json index 2f27076251..f26d41c78c 100644 --- a/resources/profiles/Creality/machine/Creality K1 SE.json +++ b/resources/profiles/Creality/machine/Creality K1 SE.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_k1se_buildplate_model.stl", - "bed_texture": "creality_k1se_buildplate_texture.png", + "bed_texture": "creality_k1se_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS @K1-all;Creality Generic ASA @K1-all;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG @K1-all;Creality Generic PLA @K1-all;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU @K1-all" } diff --git a/resources/profiles/Creality/machine/Creality K1.json b/resources/profiles/Creality/machine/Creality K1.json index 0ef5fd533d..f1090131c5 100644 --- a/resources/profiles/Creality/machine/Creality K1.json +++ b/resources/profiles/Creality/machine/Creality K1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_k1_buildplate_model.stl", - "bed_texture": "creality_k1_buildplate_texture.png", + "bed_texture": "creality_k1_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PC @K1-all;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PETG;Creality Generic TPU" } diff --git a/resources/profiles/Creality/machine/Creality K1C.json b/resources/profiles/Creality/machine/Creality K1C.json index 2a5f16a86b..55c1af0a6d 100644 --- a/resources/profiles/Creality/machine/Creality K1C.json +++ b/resources/profiles/Creality/machine/Creality K1C.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_k1c_buildplate_model.stl", - "bed_texture": "creality_k1c_buildplate_texture.png", + "bed_texture": "creality_k1c_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS @K1-all;Creality Generic ASA @K1-all;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG @K1-all;Creality Generic PLA @K1-all;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU @K1-all" } diff --git a/resources/profiles/Creality/machine/Creality K2 Plus.json b/resources/profiles/Creality/machine/Creality K2 Plus.json index f4bcbe76fc..707e150841 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_k2plus_buildplate_model.stl", - "bed_texture": "creality_k2plus_buildplate_texture.png", + "bed_texture": "creality_k2plus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS @K2-all;Creality Generic ASA @K2-all;Creality Generic PETG @K2-all;Creality Generic PLA @K2-all;Creality Generic PLA High Speed @K2-all;Creality Generic PLA Matte @K2-all;Creality Generic PLA Silk @K2-all" } diff --git a/resources/profiles/Creality/machine/Creality K2 Pro.json b/resources/profiles/Creality/machine/Creality K2 Pro.json index 5bef59ae09..d50ec5384a 100644 --- a/resources/profiles/Creality/machine/Creality K2 Pro.json +++ b/resources/profiles/Creality/machine/Creality K2 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_k2pro_buildplate_model.stl", - "bed_texture": "creality_k2pro_buildplate_texture.png", + "bed_texture": "creality_k2pro_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "", "default_materials": "Creality Generic ABS @K2-all;Creality Generic ASA @K2-all;Creality Generic PETG @K2-all;Creality Generic PLA @K2-all;Creality Generic PLA High Speed @K2-all;Creality Generic PLA Matte @K2-all;Creality Generic PLA Silk @K2-all" diff --git a/resources/profiles/Creality/machine/Creality K2.json b/resources/profiles/Creality/machine/Creality K2.json index 687a803b11..3baf9e4126 100644 --- a/resources/profiles/Creality/machine/Creality K2.json +++ b/resources/profiles/Creality/machine/Creality K2.json @@ -7,7 +7,7 @@ "family": "Creality", "bed_model": "creality_k2_buildplate_model.stl", "default_bed_type": "Textured PEI Plate", - "bed_texture": "creality_k2_buildplate_texture.png", + "bed_texture": "creality_k2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Creality Generic ABS @K2-all;Creality Generic ASA @K2-all;Creality Generic PETG @K2-all;Creality Generic PLA @K2-all;Creality Generic PLA High Speed @K2-all;Creality Generic PLA Matte @K2-all;Creality Generic PLA Silk @K2-all" } diff --git a/resources/profiles/Creality/machine/Creality Sermoon V1.json b/resources/profiles/Creality/machine/Creality Sermoon V1.json index 3a280d0e75..1f7f26c390 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon V1.json +++ b/resources/profiles/Creality/machine/Creality Sermoon V1.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4", "machine_tech": "FFF", "family": "Creality", - "bed_model": "", - "bed_texture": "", + "bed_model": "creality_sermoonv1_buildplate_model.stl", + "bed_texture": "creality_sermoonv1_buildplate_texture.svg", "z_hop_types": [ "Spiral Lift" ], diff --git a/resources/profiles/Cubicon/Cubicon xCeler-I_bed_texture.svg b/resources/profiles/Cubicon/Cubicon xCeler-I_bed_texture.svg index 3ea086ae45..fe7fb91ba4 100644 --- a/resources/profiles/Cubicon/Cubicon xCeler-I_bed_texture.svg +++ b/resources/profiles/Cubicon/Cubicon xCeler-I_bed_texture.svg @@ -1,258 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/profiles/Cubicon/Cubicon xCeler-I_cover.png b/resources/profiles/Cubicon/Cubicon xCeler-I_cover.png index 869c09f040..eafac7e4f9 100644 Binary files a/resources/profiles/Cubicon/Cubicon xCeler-I_cover.png and b/resources/profiles/Cubicon/Cubicon xCeler-I_cover.png differ diff --git a/resources/profiles/Cubicon/Cubicon xCeler-Plus_cover.png b/resources/profiles/Cubicon/Cubicon xCeler-Plus_cover.png index 039818b219..5c627a8fe8 100644 Binary files a/resources/profiles/Cubicon/Cubicon xCeler-Plus_cover.png and b/resources/profiles/Cubicon/Cubicon xCeler-Plus_cover.png differ diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json index 64bcf07250..f285aa7738 100644 --- a/resources/profiles/Elegoo.json +++ b/resources/profiles/Elegoo.json @@ -1,6 +1,6 @@ { "name": "Elegoo", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Elegoo configurations", "machine_model_list": [ diff --git a/resources/profiles/Elegoo/Elegoo Centauri Carbon 2_cover.png b/resources/profiles/Elegoo/Elegoo Centauri Carbon 2_cover.png index 14b59b4dd7..9bc6c49c2c 100644 Binary files a/resources/profiles/Elegoo/Elegoo Centauri Carbon 2_cover.png and b/resources/profiles/Elegoo/Elegoo Centauri Carbon 2_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Centauri Carbon_cover.png b/resources/profiles/Elegoo/Elegoo Centauri Carbon_cover.png index 1d8e6c4116..b5a208ff17 100644 Binary files a/resources/profiles/Elegoo/Elegoo Centauri Carbon_cover.png and b/resources/profiles/Elegoo/Elegoo Centauri Carbon_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Centauri_cover.png b/resources/profiles/Elegoo/Elegoo Centauri_cover.png index 718c8d23d3..16a461c473 100644 Binary files a/resources/profiles/Elegoo/Elegoo Centauri_cover.png and b/resources/profiles/Elegoo/Elegoo Centauri_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 2D_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 2D_cover.png index 3bcb8c7abb..6dc60ac23a 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 2D_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 2D_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 2S_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 2S_cover.png index 882ae11bce..c0be1b3d60 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 2S_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 2S_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 2_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 2_cover.png index 72738e33bf..01ac629713 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 2_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 2_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 3 Max_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 3 Max_cover.png index 5e797028f8..4787fdfd13 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 3 Max_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 3 Max_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 3 Plus_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 3 Plus_cover.png index 8e49cb4b84..743c5dfadb 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 3 Plus_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 3 Plus_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 3 Pro_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 3 Pro_cover.png index 6f7d960120..c469c2c2d2 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 3 Pro_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 3 Pro_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 3_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 3_cover.png index 92ec09a41c..34f48a4adc 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 3_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 3_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 4 Max_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 4 Max_cover.png index 5e797028f8..302d5d75f9 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 4 Max_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 4 Max_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 4 Plus_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 4 Plus_cover.png index 8e49cb4b84..80d669d8da 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 4 Plus_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 4 Plus_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 4 Pro_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 4 Pro_cover.png index b1eb69a9dc..867066a5a2 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 4 Pro_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 4 Pro_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune 4_cover.png b/resources/profiles/Elegoo/Elegoo Neptune 4_cover.png index 8041e1bc00..a646650248 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune 4_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune 4_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune X_cover.png b/resources/profiles/Elegoo/Elegoo Neptune X_cover.png index 26c07260a9..070f93a824 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune X_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune X_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo Neptune_cover.png b/resources/profiles/Elegoo/Elegoo Neptune_cover.png index a1aae0005f..8814fd3ef6 100644 Binary files a/resources/profiles/Elegoo/Elegoo Neptune_cover.png and b/resources/profiles/Elegoo/Elegoo Neptune_cover.png differ diff --git a/resources/profiles/Elegoo/Elegoo OrangeStorm Giga_cover.png b/resources/profiles/Elegoo/Elegoo OrangeStorm Giga_cover.png index 1e6e09d3b9..e342673728 100644 Binary files a/resources/profiles/Elegoo/Elegoo OrangeStorm Giga_cover.png and b/resources/profiles/Elegoo/Elegoo OrangeStorm Giga_cover.png differ diff --git a/resources/profiles/Elegoo/elegoo_centuri_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_centuri_buildplate_model.stl index 5a71e1bec6..6141c456cf 100644 Binary files a/resources/profiles/Elegoo/elegoo_centuri_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_centuri_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_centuri_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_centuri_buildplate_texture.png deleted file mode 100644 index 7d506a7baf..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_centuri_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_centuri_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_centuri_buildplate_texture.svg new file mode 100644 index 0000000000..b6ac675029 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_centuri_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_model.stl index 5a71e1bec6..6141c456cf 100644 Binary files a/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_texture.png deleted file mode 100644 index 859d98cf14..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_texture.svg new file mode 100644 index 0000000000..b6ac675029 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_centuri_carbon_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune2_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune2_buildplate_model.stl index a3837d2b59..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune2_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune2_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune2_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune2_buildplate_texture.png deleted file mode 100644 index 5bddd900ae..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune2_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune2_buildplate_texture.svg new file mode 100644 index 0000000000..89d404b56d --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_model.stl index a3837d2b59..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_texture.png deleted file mode 100644 index 5bddd900ae..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_texture.svg new file mode 100644 index 0000000000..89d404b56d --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune2d_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_model.stl index a3837d2b59..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_texture.png deleted file mode 100644 index 5bddd900ae..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_texture.svg new file mode 100644 index 0000000000..105ac97a40 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune2s_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune3_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune3_buildplate_model.stl index f311c4a87e..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune3_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune3_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune3_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune3_buildplate_texture.png deleted file mode 100644 index 9d6fe9195c..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune3_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune3_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune3_buildplate_texture.svg new file mode 100644 index 0000000000..105ac97a40 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune3_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_model.stl index db0d557270..2bdadc0ab1 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.svg new file mode 100644 index 0000000000..a02ffe6fb3 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune3max_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_model.stl index 7465a18db9..bafdf865b9 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_texture.png deleted file mode 100644 index 3a79c552a1..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_texture.svg new file mode 100644 index 0000000000..ce3768598c --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune3plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_model.stl index 0823105657..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_texture.png deleted file mode 100644 index 8f7a0c5949..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_texture.svg new file mode 100644 index 0000000000..25a27a6f84 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune3pro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune4_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune4_buildplate_model.stl index 350d948fbf..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune4_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune4_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune4_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune4_buildplate_texture.png deleted file mode 100644 index 09e63a30dc..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune4_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune4_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune4_buildplate_texture.svg new file mode 100644 index 0000000000..25a27a6f84 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune4_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune4max_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune4max_buildplate_model.stl index db0d557270..2bdadc0ab1 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune4max_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune4max_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune4max_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune4max_buildplate_texture.svg new file mode 100644 index 0000000000..a02ffe6fb3 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune4max_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_model.stl index 7465a18db9..bafdf865b9 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_texture.png deleted file mode 100644 index a21560505a..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_texture.svg new file mode 100644 index 0000000000..ce3768598c --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune4plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_model.stl index 350d948fbf..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_texture.png deleted file mode 100644 index 53f013cbd7..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_texture.svg new file mode 100644 index 0000000000..b5ed7b0658 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune4pro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptune_buildplate_model.stl index 246bd382b7..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptune_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptune_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptune_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune_buildplate_texture.png deleted file mode 100644 index 28f21f119d..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptune_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptune_buildplate_texture.svg new file mode 100644 index 0000000000..78a323a57a --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptune_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png deleted file mode 100644 index bae1e0d742..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptune_max_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptunex_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_neptunex_buildplate_model.stl index a3837d2b59..5fbed3a624 100644 Binary files a/resources/profiles/Elegoo/elegoo_neptunex_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_neptunex_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_neptunex_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_neptunex_buildplate_texture.png deleted file mode 100644 index 5bddd900ae..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_neptunex_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_neptunex_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_neptunex_buildplate_texture.svg new file mode 100644 index 0000000000..105ac97a40 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_neptunex_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_model.stl b/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_model.stl index be34fd4a88..57bd944775 100644 Binary files a/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_model.stl and b/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_model.stl differ diff --git a/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_texture.png b/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_texture.png deleted file mode 100644 index a8d46b4615..0000000000 Binary files a/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_texture.svg b/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_texture.svg new file mode 100644 index 0000000000..1f14ff0908 --- /dev/null +++ b/resources/profiles/Elegoo/elegoo_orangestorm_giga_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json b/resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json index 7a5738169c..9f4ca8a27a 100644 --- a/resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json +++ b/resources/profiles/Elegoo/machine/EC/Elegoo Centauri.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_centuri_buildplate_model.stl", - "bed_texture": "elegoo_centuri_buildplate_texture.png", + "bed_texture": "elegoo_centuri_buildplate_texture.svg", "hotend_model": "", "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @EC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @EC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @EC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @EC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @EC;Elegoo PLA @EC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @EC;Elegoo Rapid PETG @0.2 nozzle;Elegoo Rapid PETG @EC;Elegoo Rapid PETG+;;Elegoo Rapid PLA+ @EC;Elegoo Rapid PLA+ @0.2 nozzle;Elegoo Rapid PLA+ @EC;Elegoo TPU 95A @EC" } diff --git a/resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json b/resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json index 36ca0518d1..3a0ba38a7d 100644 --- a/resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json +++ b/resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_centuri_carbon_buildplate_model.stl", - "bed_texture": "elegoo_centuri_carbon_buildplate_texture.png", + "bed_texture": "elegoo_centuri_carbon_buildplate_texture.svg", "hotend_model": "", "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @ECC;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @ECC;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @ECC;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @ECC;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @ECC;Elegoo PLA-CF @ECC;Elegoo PLA @ECC;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @ECC;Elegoo Rapid PETG @0.2 nozzle;Elegoo Rapid PETG @ECC;Elegoo Rapid PETG+;Elegoo Rapid PLA+ @0.2 nozzle;Elegoo Rapid PLA+ @ECC;Elegoo TPU 95A @ECC" } diff --git a/resources/profiles/Elegoo/machine/ECC2/Elegoo Centauri Carbon 2.json b/resources/profiles/Elegoo/machine/ECC2/Elegoo Centauri Carbon 2.json index 93e49ed66d..d242425799 100644 --- a/resources/profiles/Elegoo/machine/ECC2/Elegoo Centauri Carbon 2.json +++ b/resources/profiles/Elegoo/machine/ECC2/Elegoo Centauri Carbon 2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_centuri_carbon_buildplate_model.stl", - "bed_texture": "elegoo_centuri_carbon_buildplate_texture.png", + "bed_texture": "elegoo_centuri_carbon_buildplate_texture.svg", "hotend_model": "", "default_materials": "Elegoo ASA @0.2 nozzle;Elegoo ASA @ECC2;Elegoo PETG @0.2 nozzle;Elegoo PETG @ECC2;Elegoo PETG PRO @0.2 nozzle;Elegoo PETG PRO @ECC2;Elegoo PLA @0.2 nozzle;Elegoo PLA Matte @0.2 nozzle;Elegoo PLA Matte @ECC2;Elegoo PLA PRO @0.2 nozzle;Elegoo PLA PRO @ECC2;Elegoo PLA Silk @0.2 nozzle;Elegoo PLA Silk @ECC2;Elegoo PLA-CF @ECC2;Elegoo PLA @ECC2;Elegoo PLA+ @0.2 nozzle;Elegoo PLA+ @ECC2;Elegoo Rapid PETG @0.2 nozzle;Elegoo Rapid PETG @ECC2;Elegoo Rapid PLA+ @0.2 nozzle;Elegoo Rapid PLA+ @ECC2;Elegoo TPU 95A @ECC2;Elegoo PLA Basic @0.2 nozzle;Elegoo PLA Basic @ECC2;Elegoo PLA Galaxy @ECC2;Elegoo PLA Marble @ECC2; Elegoo PLA Sparkle @ECC2;Elegoo PLA Wood @ECC2;Elegoo Rapid TPU 95A @ECC2;Elegoo ABS @0.2 nozzle;Elegoo ABS @ECC2;Elegoo PAHT-CF @ECC2;Elegoo PC @0.2 nozzle;Elegoo PC @ECC2;Elegoo PC-FR @0.2 nozzle;Elegoo PC-FR @ECC2;Elegoo PETG-CF @ECC2;Elegoo PETG-GF @ECC2;Elegoo PETG Translucent @0.2 nozzle;Elegoo PETG Translucent @ECC2" } diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2.json index 27d4218d18..85a1ec7827 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune2_buildplate_model.stl", - "bed_texture": "elegoo_neptune2_buildplate_texture.png", + "bed_texture": "elegoo_neptune2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2D.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2D.json index 0f59ee3430..7ff670044e 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2D.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2D.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune2d_buildplate_model.stl", - "bed_texture": "elegoo_neptune2d_buildplate_texture.png", + "bed_texture": "elegoo_neptune2d_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2S.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2S.json index 995bb607d8..7e4307bbca 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2S.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 2S.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune2s_buildplate_model.stl", - "bed_texture": "elegoo_neptune2s_buildplate_texture.png", + "bed_texture": "elegoo_neptune2s_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 3.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 3.json index 6567739ac3..acc5234661 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 3.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune 3.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune3_buildplate_model.stl", - "bed_texture": "elegoo_neptune3_buildplate_texture.png", + "bed_texture": "elegoo_neptune3_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune X.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune X.json index fe677bf91e..c801b38001 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune X.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune X.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptunex_buildplate_model.stl", - "bed_texture": "elegoo_neptunex_buildplate_texture.png", + "bed_texture": "elegoo_neptunex_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune.json b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune.json index 1f5a2a6fcc..376e1520c6 100644 --- a/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune.json +++ b/resources/profiles/Elegoo/machine/EN2SERIES/Elegoo Neptune.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune_buildplate_model.stl", - "bed_texture": "elegoo_neptune_buildplate_texture.png", + "bed_texture": "elegoo_neptune_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Max.json b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Max.json index c04b40f2a9..1fe18647a6 100644 --- a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Max.json +++ b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune3max_buildplate_model.stl", - "bed_texture": "elegoo_neptune_max_buildplate_texture.png", + "bed_texture": "elegoo_neptune3max_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Plus.json b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Plus.json index 8a3fd7d1b1..0830277e96 100644 --- a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Plus.json +++ b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune3plus_buildplate_model.stl", - "bed_texture": "elegoo_neptune3plus_buildplate_texture.png", + "bed_texture": "elegoo_neptune3plus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Pro.json b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Pro.json index d62d7986b1..ef0b165199 100644 --- a/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Pro.json +++ b/resources/profiles/Elegoo/machine/EN3SERIES/Elegoo Neptune 3 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune3pro_buildplate_model.stl", - "bed_texture": "elegoo_neptune3pro_buildplate_texture.png", + "bed_texture": "elegoo_neptune3pro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max.json index 47d34ceed0..a44e040874 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune4max_buildplate_model.stl", - "bed_texture": "elegoo_neptune_max_buildplate_texture.png", + "bed_texture": "elegoo_neptune4max_buildplate_texture.svg", "bed_exclude_area": [ "0x0" ], diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus.json index db972d20be..31cf8f02e2 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune4plus_buildplate_model.stl", - "bed_texture": "elegoo_neptune4plus_buildplate_texture.png", + "bed_texture": "elegoo_neptune4plus_buildplate_texture.svg", "bed_exclude_area": [ "0x0" ], diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro.json index 21a05d1f6a..8e432eecb7 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune4pro_buildplate_model.stl", - "bed_texture": "elegoo_neptune4pro_buildplate_texture.png", + "bed_texture": "elegoo_neptune4pro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Elegoo;Generic PETG @Elegoo;Generic ABS @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4.json b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4.json index 956b895dc5..2f08221ed7 100644 --- a/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4.json +++ b/resources/profiles/Elegoo/machine/EN4SERIES/Elegoo Neptune 4.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Elegoo", "bed_model": "elegoo_neptune4_buildplate_model.stl", - "bed_texture": "elegoo_neptune4_buildplate_texture.png", + "bed_texture": "elegoo_neptune4_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Elegoo;Generic PETG @Elegoo;Generic ABS @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/EOSGIGA/Elegoo OrangeStorm Giga.json b/resources/profiles/Elegoo/machine/EOSGIGA/Elegoo OrangeStorm Giga.json index c124278301..f43ce6ffd3 100644 --- a/resources/profiles/Elegoo/machine/EOSGIGA/Elegoo OrangeStorm Giga.json +++ b/resources/profiles/Elegoo/machine/EOSGIGA/Elegoo OrangeStorm Giga.json @@ -4,7 +4,7 @@ "model_id": "Elegoo-OrangeStorm-Giga", "nozzle_diameter": "0.4;0.6;0.8;1.0", "bed_model": "elegoo_orangestorm_giga_buildplate_model.stl", - "bed_texture": "elegoo_orangestorm_giga_buildplate_texture.png", + "bed_texture": "elegoo_orangestorm_giga_buildplate_texture.svg", "machine_tech": "FFF", "family": "Elegoo", "hotend_model": "", diff --git a/resources/profiles/Eryone.json b/resources/profiles/Eryone.json index 0d71cca6a4..c8645f54c4 100644 --- a/resources/profiles/Eryone.json +++ b/resources/profiles/Eryone.json @@ -1,6 +1,6 @@ { "name": "Eryone", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Eryone configurations", "machine_model_list": [ diff --git a/resources/profiles/Eryone/Eryone ER20 Klipper_cover.png b/resources/profiles/Eryone/Eryone ER20 Klipper_cover.png index cb0825efd1..9755dfb3af 100644 Binary files a/resources/profiles/Eryone/Eryone ER20 Klipper_cover.png and b/resources/profiles/Eryone/Eryone ER20 Klipper_cover.png differ diff --git a/resources/profiles/Eryone/Eryone ER20_cover.png b/resources/profiles/Eryone/Eryone ER20_cover.png index da8d109580..340930827d 100644 Binary files a/resources/profiles/Eryone/Eryone ER20_cover.png and b/resources/profiles/Eryone/Eryone ER20_cover.png differ diff --git a/resources/profiles/Eryone/Eryone ER20_texture.png b/resources/profiles/Eryone/Eryone ER20_texture.png deleted file mode 100644 index 863fae6fb2..0000000000 Binary files a/resources/profiles/Eryone/Eryone ER20_texture.png and /dev/null differ diff --git a/resources/profiles/Eryone/Eryone ER20_texture.svg b/resources/profiles/Eryone/Eryone ER20_texture.svg new file mode 100644 index 0000000000..df949940e2 --- /dev/null +++ b/resources/profiles/Eryone/Eryone ER20_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Eryone/Thinker_texture.png b/resources/profiles/Eryone/Thinker_texture.png deleted file mode 100644 index 863fae6fb2..0000000000 Binary files a/resources/profiles/Eryone/Thinker_texture.png and /dev/null differ diff --git a/resources/profiles/Eryone/Thinker_texture.svg b/resources/profiles/Eryone/Thinker_texture.svg new file mode 100644 index 0000000000..34ab3eae99 --- /dev/null +++ b/resources/profiles/Eryone/Thinker_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Eryone/X400_bed.stl b/resources/profiles/Eryone/X400_bed.stl index d689a88033..5e208ba6c9 100644 Binary files a/resources/profiles/Eryone/X400_bed.stl and b/resources/profiles/Eryone/X400_bed.stl differ diff --git a/resources/profiles/Eryone/eryone_er20_buildplate_model.stl b/resources/profiles/Eryone/eryone_er20_buildplate_model.stl index 5cfa70484f..76b07872e7 100644 Binary files a/resources/profiles/Eryone/eryone_er20_buildplate_model.stl and b/resources/profiles/Eryone/eryone_er20_buildplate_model.stl differ diff --git a/resources/profiles/Eryone/machine/ER20/Eryone ER20.json b/resources/profiles/Eryone/machine/ER20/Eryone ER20.json index 4a4b82c2c7..26d223d2f1 100644 --- a/resources/profiles/Eryone/machine/ER20/Eryone ER20.json +++ b/resources/profiles/Eryone/machine/ER20/Eryone ER20.json @@ -1,6 +1,6 @@ { "bed_model": "eryone_er20_buildplate_model.stl", - "bed_texture": "Eryone ER20_texture.png", + "bed_texture": "Eryone ER20_texture.svg", "family": "Eryone", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper.json b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper.json index 3b80869882..2dcf3d7882 100644 --- a/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper.json +++ b/resources/profiles/Eryone/machine/ER20_Klipper/Eryone ER20 Klipper.json @@ -1,6 +1,6 @@ { "bed_model": "eryone_er20_buildplate_model.stl", - "bed_texture": "Eryone ER20_texture.png", + "bed_texture": "Eryone ER20_texture.svg", "default_bed_type": "Textured PEI Plate", "family": "Eryone", "hotend_model": "", diff --git a/resources/profiles/Eryone/machine/Thinker X400.json b/resources/profiles/Eryone/machine/Thinker X400.json index 0106df2278..8293d5693e 100644 --- a/resources/profiles/Eryone/machine/Thinker X400.json +++ b/resources/profiles/Eryone/machine/Thinker X400.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Eryone", "bed_model": "X400_bed.stl", - "bed_texture": "Thinker_texture.png", + "bed_texture": "Thinker_texture.svg", "hotend_model": "", "default_materials": "Eryone PLA;Eryone ABS;Eryone ASA;Eryone PETG;Eryone Silk PLA;Eryone TPU;Eryone ABS-CF;Eryone ASA-CF;Eryone PA;Eryone PA-CF;Eryone PA-GF;Eryone PETG-CF;Eryone PLA-CF;Eryone PP;Eryone PP-CF" } diff --git a/resources/profiles/FLSun.json b/resources/profiles/FLSun.json index 21fc53ac6d..17439d0851 100644 --- a/resources/profiles/FLSun.json +++ b/resources/profiles/FLSun.json @@ -1,6 +1,6 @@ { "name": "FLSun", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "FLSun configurations", "machine_model_list": [ diff --git a/resources/profiles/FLSun/FLSun_S1_buildplate_texture.svg b/resources/profiles/FLSun/FLSun_S1_buildplate_texture.svg index fcd7630b35..ca4675ec60 100644 --- a/resources/profiles/FLSun/FLSun_S1_buildplate_texture.svg +++ b/resources/profiles/FLSun/FLSun_S1_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/FLSun/FLSun_T1_buildplate_texture.svg b/resources/profiles/FLSun/FLSun_T1_buildplate_texture.svg index f21e08a474..dd56685402 100644 --- a/resources/profiles/FLSun/FLSun_T1_buildplate_texture.svg +++ b/resources/profiles/FLSun/FLSun_T1_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/FLSun/flsun_SR_buildplate_texture.svg b/resources/profiles/FLSun/flsun_SR_buildplate_texture.svg index 70be17936b..a682c60d0b 100644 --- a/resources/profiles/FLSun/flsun_SR_buildplate_texture.svg +++ b/resources/profiles/FLSun/flsun_SR_buildplate_texture.svg @@ -1,54 +1 @@ - - - - - - - image/svg+xml - - - - - - - + \ No newline at end of file diff --git a/resources/profiles/FLSun/flsun_T1_buildplate_model.stl b/resources/profiles/FLSun/flsun_T1_buildplate_model.stl index bddb4c6e87..70ba84806c 100644 Binary files a/resources/profiles/FLSun/flsun_T1_buildplate_model.stl and b/resources/profiles/FLSun/flsun_T1_buildplate_model.stl differ diff --git a/resources/profiles/FLSun/flsun_q5_buildplate_texture.png b/resources/profiles/FLSun/flsun_q5_buildplate_texture.png deleted file mode 100644 index c31ce5736f..0000000000 Binary files a/resources/profiles/FLSun/flsun_q5_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/FLSun/flsun_q5_buildplate_texture.svg b/resources/profiles/FLSun/flsun_q5_buildplate_texture.svg new file mode 100644 index 0000000000..1c28909a4f --- /dev/null +++ b/resources/profiles/FLSun/flsun_q5_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/FLSun/flsun_qqspro_buildplate_texture.png b/resources/profiles/FLSun/flsun_qqspro_buildplate_texture.png deleted file mode 100644 index ba5ffad8b9..0000000000 Binary files a/resources/profiles/FLSun/flsun_qqspro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/FLSun/flsun_qqspro_buildplate_texture.svg b/resources/profiles/FLSun/flsun_qqspro_buildplate_texture.svg new file mode 100644 index 0000000000..4449713734 --- /dev/null +++ b/resources/profiles/FLSun/flsun_qqspro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/FLSun/flsun_s1_buildplate_model.stl b/resources/profiles/FLSun/flsun_s1_buildplate_model.stl index 7d8fefeb3d..736212ea17 100644 Binary files a/resources/profiles/FLSun/flsun_s1_buildplate_model.stl and b/resources/profiles/FLSun/flsun_s1_buildplate_model.stl differ diff --git a/resources/profiles/FLSun/flsun_v400_buildplate_texture.svg b/resources/profiles/FLSun/flsun_v400_buildplate_texture.svg index e9f47564c1..54beeb1c85 100644 --- a/resources/profiles/FLSun/flsun_v400_buildplate_texture.svg +++ b/resources/profiles/FLSun/flsun_v400_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/FLSun/machine/FLSun Q5.json b/resources/profiles/FLSun/machine/FLSun Q5.json index 13a34b6f85..f7825cb4fa 100644 --- a/resources/profiles/FLSun/machine/FLSun Q5.json +++ b/resources/profiles/FLSun/machine/FLSun Q5.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "FLSun", "bed_model": "flsun_q5_buildplate_model.stl", - "bed_texture": "flsun_q5_buildplate_texture.png", + "bed_texture": "flsun_q5_buildplate_texture.svg", "hotend_model": "", "default_materials": "FLSun Generic ABS;FLSun Generic PLA;FLSun Generic PLA-CF;FLSun Generic PETG;FLSun Generic TPU;FLSun Generic ASA;FLSun Generic PC;FLSun Generic PVA;FLSun Generic PA;FLSun Generic PA-CF" } diff --git a/resources/profiles/FLSun/machine/FLSun QQ-S Pro.json b/resources/profiles/FLSun/machine/FLSun QQ-S Pro.json index 4c3769cec7..3b3cf86676 100644 --- a/resources/profiles/FLSun/machine/FLSun QQ-S Pro.json +++ b/resources/profiles/FLSun/machine/FLSun QQ-S Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "FLSun", "bed_model": "flsun_qqspro_buildplate_model.stl", - "bed_texture": "flsun_qqspro_buildplate_texture.png", + "bed_texture": "flsun_qqspro_buildplate_texture.svg", "hotend_model": "", "default_materials": "FLSun Generic ABS;FLSun Generic PLA;FLSun Generic PLA-CF;FLSun Generic PETG;FLSun Generic TPU;FLSun Generic ASA;FLSun Generic PC;FLSun Generic PVA;FLSun Generic PA;FLSun Generic PA-CF" } diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index 0905255f7a..b53a32b74f 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -1,7 +1,7 @@ { "name": "Flashforge", "url": "", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Flashforge configurations", "machine_model_list": [ diff --git a/resources/profiles/Flashforge/Flashforge AD5X_cover.png b/resources/profiles/Flashforge/Flashforge AD5X_cover.png index dbe2aba9d0..70831c60f5 100644 Binary files a/resources/profiles/Flashforge/Flashforge AD5X_cover.png and b/resources/profiles/Flashforge/Flashforge AD5X_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Adventurer 3 Series_cover.png b/resources/profiles/Flashforge/Flashforge Adventurer 3 Series_cover.png index d82ba4325a..677c453da5 100644 Binary files a/resources/profiles/Flashforge/Flashforge Adventurer 3 Series_cover.png and b/resources/profiles/Flashforge/Flashforge Adventurer 3 Series_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Adventurer 4 Series_cover.png b/resources/profiles/Flashforge/Flashforge Adventurer 4 Series_cover.png index 2c233ad822..3f8a095d1c 100644 Binary files a/resources/profiles/Flashforge/Flashforge Adventurer 4 Series_cover.png and b/resources/profiles/Flashforge/Flashforge Adventurer 4 Series_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Adventurer 5M Pro_cover.png b/resources/profiles/Flashforge/Flashforge Adventurer 5M Pro_cover.png index 051ab70c55..eb3ff3da1e 100644 Binary files a/resources/profiles/Flashforge/Flashforge Adventurer 5M Pro_cover.png and b/resources/profiles/Flashforge/Flashforge Adventurer 5M Pro_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Adventurer 5M_cover.png b/resources/profiles/Flashforge/Flashforge Adventurer 5M_cover.png index 2e776b9688..2a1d2deb84 100644 Binary files a/resources/profiles/Flashforge/Flashforge Adventurer 5M_cover.png and b/resources/profiles/Flashforge/Flashforge Adventurer 5M_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Artemis_cover.png b/resources/profiles/Flashforge/Flashforge Artemis_cover.png index fea4762aa9..8c0e603506 100644 Binary files a/resources/profiles/Flashforge/Flashforge Artemis_cover.png and b/resources/profiles/Flashforge/Flashforge Artemis_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Guider 2s_cover.png b/resources/profiles/Flashforge/Flashforge Guider 2s_cover.png index 64c590fa90..c16ce454f0 100644 Binary files a/resources/profiles/Flashforge/Flashforge Guider 2s_cover.png and b/resources/profiles/Flashforge/Flashforge Guider 2s_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Guider 3 Ultra_cover.png b/resources/profiles/Flashforge/Flashforge Guider 3 Ultra_cover.png index f7b3df8498..5ab73c8f45 100644 Binary files a/resources/profiles/Flashforge/Flashforge Guider 3 Ultra_cover.png and b/resources/profiles/Flashforge/Flashforge Guider 3 Ultra_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Guider4 Pro_cover.png b/resources/profiles/Flashforge/Flashforge Guider4 Pro_cover.png index a23b67506c..c9d264922f 100644 Binary files a/resources/profiles/Flashforge/Flashforge Guider4 Pro_cover.png and b/resources/profiles/Flashforge/Flashforge Guider4 Pro_cover.png differ diff --git a/resources/profiles/Flashforge/Flashforge Guider4_cover.png b/resources/profiles/Flashforge/Flashforge Guider4_cover.png index 61de2728eb..88ba622984 100644 Binary files a/resources/profiles/Flashforge/Flashforge Guider4_cover.png and b/resources/profiles/Flashforge/Flashforge Guider4_cover.png differ diff --git a/resources/profiles/Flashforge/flashforge_ad5x_buildplate_texture.png b/resources/profiles/Flashforge/flashforge_ad5x_buildplate_texture.png deleted file mode 100644 index 35d0eeaa14..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_ad5x_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_ad5x_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_ad5x_buildplate_texture.svg new file mode 100644 index 0000000000..b22690a068 --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_ad5x_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/flashforge_adventurer3_buildplate_texture.png b/resources/profiles/Flashforge/flashforge_adventurer3_buildplate_texture.png deleted file mode 100644 index f3eeaa67ca..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_adventurer3_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_adventurer3_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_adventurer3_buildplate_texture.svg new file mode 100644 index 0000000000..1c1a78e580 --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_adventurer3_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/flashforge_adventurer5m_buildplate_texture.png b/resources/profiles/Flashforge/flashforge_adventurer5m_buildplate_texture.png deleted file mode 100644 index 2657da085b..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_adventurer5m_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_adventurer5m_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_adventurer5m_buildplate_texture.svg new file mode 100644 index 0000000000..1e1781faa1 --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_adventurer5m_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/flashforge_adventurer5mpro_buildplate_texture.png b/resources/profiles/Flashforge/flashforge_adventurer5mpro_buildplate_texture.png deleted file mode 100644 index 2657da085b..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_adventurer5mpro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_adventurer5mpro_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_adventurer5mpro_buildplate_texture.svg new file mode 100644 index 0000000000..aec851df67 --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_adventurer5mpro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/flashforge_artemis_buildplate_model.stl b/resources/profiles/Flashforge/flashforge_artemis_buildplate_model.stl new file mode 100644 index 0000000000..ceae87a86f Binary files /dev/null and b/resources/profiles/Flashforge/flashforge_artemis_buildplate_model.stl differ diff --git a/resources/profiles/Flashforge/flashforge_artemis_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_artemis_buildplate_texture.svg new file mode 100644 index 0000000000..7ac1b53e51 --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_artemis_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/flashforge_g2s_buildplate_model.stl b/resources/profiles/Flashforge/flashforge_g2s_buildplate_model.stl index a9632ef29d..78a0ecdc38 100644 Binary files a/resources/profiles/Flashforge/flashforge_g2s_buildplate_model.stl and b/resources/profiles/Flashforge/flashforge_g2s_buildplate_model.stl differ diff --git a/resources/profiles/Flashforge/flashforge_g2s_buildplate_texture.png b/resources/profiles/Flashforge/flashforge_g2s_buildplate_texture.png deleted file mode 100644 index 2ced3df87c..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_g2s_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_g2s_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_g2s_buildplate_texture.svg new file mode 100644 index 0000000000..b7ed62c247 --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_g2s_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/flashforge_g3u_buildplate_texture.png b/resources/profiles/Flashforge/flashforge_g3u_buildplate_texture.png deleted file mode 100644 index 2ced3df87c..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_g3u_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_g3u_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_g3u_buildplate_texture.svg new file mode 100644 index 0000000000..37116ab1b5 --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_g3u_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/flashforge_g4_buildplate_model.stl b/resources/profiles/Flashforge/flashforge_g4_buildplate_model.stl deleted file mode 100644 index a7ae3970f7..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_g4_buildplate_model.stl and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_g4pro_buildplate_texture.png b/resources/profiles/Flashforge/flashforge_g4pro_buildplate_texture.png deleted file mode 100644 index ced7703f45..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_g4pro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_g4pro_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_g4pro_buildplate_texture.svg new file mode 100644 index 0000000000..ba470b1b1c --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_g4pro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/machine/Flashforge AD5X.json b/resources/profiles/Flashforge/machine/Flashforge AD5X.json index 967854c10f..3ed31ba385 100644 --- a/resources/profiles/Flashforge/machine/Flashforge AD5X.json +++ b/resources/profiles/Flashforge/machine/Flashforge AD5X.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", - "bed_texture": "flashforge_ad5x_buildplate_texture.png", + "bed_texture": "flashforge_ad5x_buildplate_texture.svg", "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", "url": "", "default_materials": "Flashforge Generic ABS;Flashforge Generic PETG;Flashforge Generic PLA" diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 3 Series.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 3 Series.json index eb19cd29a7..055382574c 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 3 Series.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 3 Series.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_adventurer3_series_buildplate_model.stl", - "bed_texture": "flashforge_adventurer3_buildplate_texture.png", + "bed_texture": "flashforge_adventurer3_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "", "default_materials": "Flashforge ABS;Flashforge PETG;Flashforge PLA" diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 4 Series.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 4 Series.json index a9628e3abb..29fc1e2a4b 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 4 Series.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 4 Series.json @@ -7,7 +7,7 @@ "family": "Flashforge", "host_type": "Flashforge", "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", - "bed_texture": "flashforge_adventurer5mpro_buildplate_texture.png", + "bed_texture": "flashforge_adventurer5mpro_buildplate_texture.svg", "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", "default_filament_profile": "Generic ABS @Flashforge AD4;Generic PETG @Flashforge AD4;Generic PLA @Flashforge AD4;Generic PLA High Speed @Flashforge AD4;Generic TPU @Flashforge AD4" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json index 3d6ba6d9ba..fbc164e0e0 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", - "bed_texture": "flashforge_adventurer5m_buildplate_texture.png", + "bed_texture": "flashforge_adventurer5m_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", "default_materials": "Flashforge Generic ABS;Flashforge Generic PETG;Flashforge Generic PLA" diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json index 7914068bbd..c0822d3d73 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", - "bed_texture": "flashforge_adventurer5m_buildplate_texture.png", + "bed_texture": "flashforge_adventurer5m_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", "default_materials": "Flashforge Generic ABS;Flashforge Generic PETG;Flashforge Generic PLA" diff --git a/resources/profiles/Flashforge/machine/Flashforge Artemis.json b/resources/profiles/Flashforge/machine/Flashforge Artemis.json index 2a6f71cde6..7bab45b82a 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Artemis.json +++ b/resources/profiles/Flashforge/machine/Flashforge Artemis.json @@ -6,8 +6,8 @@ "machine_tech": "FFF", "family": "Flashforge", "host_type": "Flashforge", - "bed_model": "", - "bed_texture": "", + "bed_model": "flashforge_artemis_buildplate_model.stl", + "bed_texture": "flashforge_artemis_buildplate_texture.svg", "hotend_model": "", "default_filament_profile": "Flashforge Generic PETG; Flashforge Generic PLA" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 2s.json b/resources/profiles/Flashforge/machine/Flashforge Guider 2s.json index b71f3051d1..38c0f3c667 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 2s.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 2s.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_g2s_buildplate_model.stl", - "bed_texture": "flashforge_g2s_buildplate_texture.png", + "bed_texture": "flashforge_g2s_buildplate_texture.svg", "hotend_model": "", "default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json index 6797efd30d..a3bc7d0b68 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_g3u_buildplate_model.stl", - "bed_texture": "flashforge_g3u_buildplate_texture.png", + "bed_texture": "flashforge_g3u_buildplate_texture.svg", "hotend_model": "", "default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro.json index d3363cc1da..14ce7cead3 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_g4pro_buildplate_model.stl", - "bed_texture": "flashforge_g4pro_buildplate_texture.png", + "bed_texture": "flashforge_g4pro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4.json b/resources/profiles/Flashforge/machine/Flashforge Guider4.json index b757f7fa8a..7b5248e14b 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_g4pro_buildplate_model.stl", - "bed_texture": "flashforge_g4pro_buildplate_texture.png", + "bed_texture": "flashforge_g4pro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1" } diff --git a/resources/profiles/FlyingBear/FlyingBear Ghost7-bed.stl b/resources/profiles/FlyingBear/FlyingBear Ghost7-bed.stl index 95b640f42d..cbad4596c3 100644 Binary files a/resources/profiles/FlyingBear/FlyingBear Ghost7-bed.stl and b/resources/profiles/FlyingBear/FlyingBear Ghost7-bed.stl differ diff --git a/resources/profiles/Geeetech/Geeetech_buildplate_texture.svg b/resources/profiles/Geeetech/Geeetech_buildplate_texture.svg index feb67485a8..396bb5535d 100644 --- a/resources/profiles/Geeetech/Geeetech_buildplate_texture.svg +++ b/resources/profiles/Geeetech/Geeetech_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Ginger Additive.json b/resources/profiles/Ginger Additive.json index f1fe6fc7c2..a54bdc3b1f 100644 --- a/resources/profiles/Ginger Additive.json +++ b/resources/profiles/Ginger Additive.json @@ -1,6 +1,6 @@ { "name": "Ginger Additive", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "1", "description": "Ginger configuration", "machine_model_list": [ diff --git a/resources/profiles/Ginger Additive/Ginger_One_texture.png b/resources/profiles/Ginger Additive/Ginger_One_texture.png deleted file mode 100644 index 74230459cb..0000000000 Binary files a/resources/profiles/Ginger Additive/Ginger_One_texture.png and /dev/null differ diff --git a/resources/profiles/Ginger Additive/Ginger_One_texture.svg b/resources/profiles/Ginger Additive/Ginger_One_texture.svg new file mode 100644 index 0000000000..b77ec7262d --- /dev/null +++ b/resources/profiles/Ginger Additive/Ginger_One_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Ginger Additive/machine/Ginger G1.json b/resources/profiles/Ginger Additive/machine/Ginger G1.json index 1eb9333957..54756fd549 100644 --- a/resources/profiles/Ginger Additive/machine/Ginger G1.json +++ b/resources/profiles/Ginger Additive/machine/Ginger G1.json @@ -7,6 +7,6 @@ "machine_tech": "FGF", "family": "Ginger", "bed_model": "Ginger_G1.stl", - "bed_texture": "Ginger_One_texture.png", + "bed_texture": "Ginger_One_texture.svg", "default_materials": "Ginger Generic PETG;Ginger Generic PLA" } diff --git a/resources/profiles/InfiMech.json b/resources/profiles/InfiMech.json index c02e959aaa..7131aa62be 100644 --- a/resources/profiles/InfiMech.json +++ b/resources/profiles/InfiMech.json @@ -1,6 +1,6 @@ { "name": "InfiMech", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "1", "description": "InfiMech configurations", "machine_model_list": [ diff --git a/resources/profiles/InfiMech/InfiMech EX+APS-bed.stl b/resources/profiles/InfiMech/InfiMech EX+APS-bed.stl deleted file mode 100644 index 95b640f42d..0000000000 Binary files a/resources/profiles/InfiMech/InfiMech EX+APS-bed.stl and /dev/null differ diff --git a/resources/profiles/InfiMech/InfiMech EX+APS-texture.png b/resources/profiles/InfiMech/InfiMech EX+APS-texture.png deleted file mode 100644 index 0b23f2de5a..0000000000 Binary files a/resources/profiles/InfiMech/InfiMech EX+APS-texture.png and /dev/null differ diff --git a/resources/profiles/InfiMech/InfiMech EX-bed.stl b/resources/profiles/InfiMech/InfiMech EX-bed.stl index 95b640f42d..c61b64a913 100644 Binary files a/resources/profiles/InfiMech/InfiMech EX-bed.stl and b/resources/profiles/InfiMech/InfiMech EX-bed.stl differ diff --git a/resources/profiles/InfiMech/InfiMech EX-texture.png b/resources/profiles/InfiMech/InfiMech EX-texture.png deleted file mode 100644 index 0b23f2de5a..0000000000 Binary files a/resources/profiles/InfiMech/InfiMech EX-texture.png and /dev/null differ diff --git a/resources/profiles/InfiMech/InfiMech EX-texture.svg b/resources/profiles/InfiMech/InfiMech EX-texture.svg new file mode 100644 index 0000000000..a29e1b1ff2 --- /dev/null +++ b/resources/profiles/InfiMech/InfiMech EX-texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/InfiMech/InfiMech TX-bed_HSN.stl b/resources/profiles/InfiMech/InfiMech TX-bed_HSN.stl deleted file mode 100644 index 05ea70db46..0000000000 Binary files a/resources/profiles/InfiMech/InfiMech TX-bed_HSN.stl and /dev/null differ diff --git a/resources/profiles/InfiMech/InfiMech TX-texture.png b/resources/profiles/InfiMech/InfiMech TX-texture.png deleted file mode 100644 index 0942aba2cf..0000000000 Binary files a/resources/profiles/InfiMech/InfiMech TX-texture.png and /dev/null differ diff --git a/resources/profiles/InfiMech/InfiMech TX-texture.svg b/resources/profiles/InfiMech/InfiMech TX-texture.svg new file mode 100644 index 0000000000..dcbba8be67 --- /dev/null +++ b/resources/profiles/InfiMech/InfiMech TX-texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/InfiMech/InfiMech TX-texture_HSN.png b/resources/profiles/InfiMech/InfiMech TX-texture_HSN.png deleted file mode 100644 index 0942aba2cf..0000000000 Binary files a/resources/profiles/InfiMech/InfiMech TX-texture_HSN.png and /dev/null differ diff --git a/resources/profiles/InfiMech/machine/EX+APS/InfiMech EX+APS.json b/resources/profiles/InfiMech/machine/EX+APS/InfiMech EX+APS.json index 1810035a8e..c8a0e82521 100644 --- a/resources/profiles/InfiMech/machine/EX+APS/InfiMech EX+APS.json +++ b/resources/profiles/InfiMech/machine/EX+APS/InfiMech EX+APS.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4", "machine_tech": "FFF", "family": "InfiMechDesign", - "bed_model": "InfiMech EX+APS-bed.stl", - "bed_texture": "InfiMech EX+APS-texture.png", + "bed_model": "InfiMech EX-bed.stl", + "bed_texture": "InfiMech EX-texture.svg", "hotend_model": "", "default_materials": "InfiMech ABS @EX+APS;InfiMech PA-CF @EX+APS;InfiMech PC @EX+APS;InfiMech PETG @EX+APS;InfiMech PLA Basic @EX+APS;InfiMech PLA Hyper @EX+APS;InfiMech TPU Basic @EX+APS" } diff --git a/resources/profiles/InfiMech/machine/EX/InfiMech EX.json b/resources/profiles/InfiMech/machine/EX/InfiMech EX.json index f5c398534b..a4e2841b8d 100644 --- a/resources/profiles/InfiMech/machine/EX/InfiMech EX.json +++ b/resources/profiles/InfiMech/machine/EX/InfiMech EX.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "InfiMechDesign", "bed_model": "InfiMech EX-bed.stl", - "bed_texture": "InfiMech EX-texture.png", + "bed_texture": "InfiMech EX-texture.svg", "hotend_model": "", "default_materials": "InfiMech ABS @EX;InfiMech PA-CF @EX;InfiMech PC @EX;InfiMech PETG @EX;InfiMech PLA Basic @EX;InfiMech PLA Hyper @EX;InfiMech TPU Basic @EX" } diff --git a/resources/profiles/InfiMech/machine/HSN/InfiMech TX Hardened Steel Nozzle.json b/resources/profiles/InfiMech/machine/HSN/InfiMech TX Hardened Steel Nozzle.json index e5daa5f940..fff3371aba 100644 --- a/resources/profiles/InfiMech/machine/HSN/InfiMech TX Hardened Steel Nozzle.json +++ b/resources/profiles/InfiMech/machine/HSN/InfiMech TX Hardened Steel Nozzle.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4", "machine_tech": "FFF", "family": "InfiMechDesign", - "bed_model": "InfiMech TX-bed_HSN.stl", - "bed_texture": "InfiMech TX-texture_HSN.png", + "bed_model": "InfiMech TX-bed.stl", + "bed_texture": "InfiMech TX-texture.svg", "hotend_model": "", "default_materials": "InfiMech Generic ABS;InfiMech Generic PA-CF;InfiMech Generic PC;InfiMech Generic PETG;InfiMech Generic PLA;InfiMech Generic TPU" } diff --git a/resources/profiles/InfiMech/machine/InfiMech TX.json b/resources/profiles/InfiMech/machine/InfiMech TX.json index 04d78f9813..abb93dfe09 100644 --- a/resources/profiles/InfiMech/machine/InfiMech TX.json +++ b/resources/profiles/InfiMech/machine/InfiMech TX.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "InfiMechDesign", "bed_model": "InfiMech TX-bed.stl", - "bed_texture": "InfiMech TX-texture.png", + "bed_texture": "InfiMech TX-texture.svg", "hotend_model": "", "default_materials": "InfiMech Generic ABS;InfiMech Generic PA-CF;InfiMech Generic PC;InfiMech Generic PETG;InfiMech Generic PLA;InfiMech Generic TPU" } diff --git a/resources/profiles/LONGER.json b/resources/profiles/LONGER.json index 87a527b3dd..86572785da 100644 --- a/resources/profiles/LONGER.json +++ b/resources/profiles/LONGER.json @@ -1,6 +1,6 @@ { "name": "LONGER", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "LONGER configurations", "machine_model_list": [ diff --git a/resources/profiles/LONGER/LONGER LK10 Plus_cover.png b/resources/profiles/LONGER/LONGER LK10 Plus_cover.png index 937bbeb430..cb8d570caf 100644 Binary files a/resources/profiles/LONGER/LONGER LK10 Plus_cover.png and b/resources/profiles/LONGER/LONGER LK10 Plus_cover.png differ diff --git a/resources/profiles/LONGER/LONGER LK10_cover.png b/resources/profiles/LONGER/LONGER LK10_cover.png index 1d986c6ee7..1793541560 100644 Binary files a/resources/profiles/LONGER/LONGER LK10_cover.png and b/resources/profiles/LONGER/LONGER LK10_cover.png differ diff --git a/resources/profiles/LONGER/longer_lk10_buildplate_model.stl b/resources/profiles/LONGER/longer_lk10_buildplate_model.stl index 3c5fa0537a..9e48670c7e 100644 Binary files a/resources/profiles/LONGER/longer_lk10_buildplate_model.stl and b/resources/profiles/LONGER/longer_lk10_buildplate_model.stl differ diff --git a/resources/profiles/LONGER/longer_lk10_buildplate_texture.png b/resources/profiles/LONGER/longer_lk10_buildplate_texture.png deleted file mode 100644 index 98ea489689..0000000000 Binary files a/resources/profiles/LONGER/longer_lk10_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/LONGER/longer_lk10_buildplate_texture.svg b/resources/profiles/LONGER/longer_lk10_buildplate_texture.svg new file mode 100644 index 0000000000..81d96267dc --- /dev/null +++ b/resources/profiles/LONGER/longer_lk10_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/LONGER/longer_lk10plus_buildplate_model.stl b/resources/profiles/LONGER/longer_lk10plus_buildplate_model.stl index 7c77420b83..a39a346157 100644 Binary files a/resources/profiles/LONGER/longer_lk10plus_buildplate_model.stl and b/resources/profiles/LONGER/longer_lk10plus_buildplate_model.stl differ diff --git a/resources/profiles/LONGER/longer_lk10plus_buildplate_texture.png b/resources/profiles/LONGER/longer_lk10plus_buildplate_texture.png deleted file mode 100644 index cb7665ebd0..0000000000 Binary files a/resources/profiles/LONGER/longer_lk10plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/LONGER/longer_lk10plus_buildplate_texture.svg b/resources/profiles/LONGER/longer_lk10plus_buildplate_texture.svg new file mode 100644 index 0000000000..4a59ea38ed --- /dev/null +++ b/resources/profiles/LONGER/longer_lk10plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/LONGER/machine/LONGER LK10 Plus.json b/resources/profiles/LONGER/machine/LONGER LK10 Plus.json index 6da9806a52..609ed74444 100644 --- a/resources/profiles/LONGER/machine/LONGER LK10 Plus.json +++ b/resources/profiles/LONGER/machine/LONGER LK10 Plus.json @@ -7,7 +7,7 @@ "family": "LONGER", "printer_settings_id": "LONGER", "bed_model": "longer_lk10plus_buildplate_model.stl", - "bed_texture": "longer_lk10plus_buildplate_texture.png", + "bed_texture": "longer_lk10plus_buildplate_texture.svg", "bed_exclude_area": [ "0x0" ], diff --git a/resources/profiles/LONGER/machine/LONGER LK10.json b/resources/profiles/LONGER/machine/LONGER LK10.json index 9a080d03ab..7bc3ab48d4 100644 --- a/resources/profiles/LONGER/machine/LONGER LK10.json +++ b/resources/profiles/LONGER/machine/LONGER LK10.json @@ -7,7 +7,7 @@ "family": "LONGER", "printer_settings_id": "LONGER", "bed_model": "longer_lk10_buildplate_model.stl", - "bed_texture": "longer_lk10_buildplate_texture.png", + "bed_texture": "longer_lk10_buildplate_texture.svg", "bed_exclude_area": [ "0x0" ], diff --git a/resources/profiles/Lulzbot.json b/resources/profiles/Lulzbot.json index ba4885f952..0f2d77c79e 100644 --- a/resources/profiles/Lulzbot.json +++ b/resources/profiles/Lulzbot.json @@ -1,7 +1,7 @@ { "name": "Lulzbot", "url": "https://ohai.lulzbot.com/group/taz-6/", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Lulzbot configurations", "machine_model_list": [ diff --git a/resources/profiles/Lulzbot/Taz_Pro_Dual_printbed.png b/resources/profiles/Lulzbot/Taz_Pro_Dual_printbed.png deleted file mode 100644 index 2344c234e6..0000000000 Binary files a/resources/profiles/Lulzbot/Taz_Pro_Dual_printbed.png and /dev/null differ diff --git a/resources/profiles/Lulzbot/Taz_Pro_Dual_printbed.svg b/resources/profiles/Lulzbot/Taz_Pro_Dual_printbed.svg new file mode 100644 index 0000000000..e3293d78fe --- /dev/null +++ b/resources/profiles/Lulzbot/Taz_Pro_Dual_printbed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Lulzbot/lulzbot_logo.png b/resources/profiles/Lulzbot/lulzbot_logo.png deleted file mode 100644 index f7fd0f88df..0000000000 Binary files a/resources/profiles/Lulzbot/lulzbot_logo.png and /dev/null differ diff --git a/resources/profiles/Lulzbot/lulzbot_logo.svg b/resources/profiles/Lulzbot/lulzbot_logo.svg new file mode 100644 index 0000000000..94f70493cd --- /dev/null +++ b/resources/profiles/Lulzbot/lulzbot_logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5.json index 4e777fc490..c00c1cc2e3 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Lulzbot", "bed_model": "taz_4_or_5_build_plate.stl", - "bed_texture": "lulzbot_logo.png", + "bed_texture": "lulzbot_logo.svg", "hotend_model": "", "default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" } diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz 6.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz 6.json index 8d40250825..fdf3c0b056 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz 6.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz 6.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Lulzbot", "bed_model": "taz_6_build_plate.stl", - "bed_texture": "lulzbot_logo.png", + "bed_texture": "lulzbot_logo.svg", "hotend_model": "", "default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" } diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual.json index 0f8103bcf7..b5157e0925 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Lulzbot", "bed_model": "taz_pro_dual_build_plate.stl", - "bed_texture": "Taz_Pro_Dual_printbed.png", + "bed_texture": "Taz_Pro_Dual_printbed.svg", "hotend_model": "", "default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" } diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro S.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro S.json index a32ed1ed43..ebb151d2b0 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro S.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro S.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Lulzbot", "bed_model": "taz_pro_dual_build_plate.stl", - "bed_texture": "lulzbot_logo.png", + "bed_texture": "lulzbot_logo.svg", "hotend_model": "", "extruder_clearance_radius": "62", "extruder_clearance_height_to_rod": "36", diff --git a/resources/profiles/Lulzbot/taz_4_or_5_build_plate.stl b/resources/profiles/Lulzbot/taz_4_or_5_build_plate.stl index 2364a9e934..5207e78d2b 100644 Binary files a/resources/profiles/Lulzbot/taz_4_or_5_build_plate.stl and b/resources/profiles/Lulzbot/taz_4_or_5_build_plate.stl differ diff --git a/resources/profiles/M3D.json b/resources/profiles/M3D.json index 067da31b01..d8bbdd1e56 100644 --- a/resources/profiles/M3D.json +++ b/resources/profiles/M3D.json @@ -1,6 +1,6 @@ { "name": "M3D", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Configuration for M3D printers", "machine_model_list": [ diff --git a/resources/profiles/M3D/M3D Enabler D8500 MM Model_bed_model.stl b/resources/profiles/M3D/M3D Enabler D8500 MM Model_bed_model.stl new file mode 100644 index 0000000000..61bc03695b Binary files /dev/null and b/resources/profiles/M3D/M3D Enabler D8500 MM Model_bed_model.stl differ diff --git a/resources/profiles/M3D/M3D Enabler D8500 MM Model_bed_texture.svg b/resources/profiles/M3D/M3D Enabler D8500 MM Model_bed_texture.svg new file mode 100644 index 0000000000..540f20952b --- /dev/null +++ b/resources/profiles/M3D/M3D Enabler D8500 MM Model_bed_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/M3D/M3D Enabler D8500 MM Model_cover.png b/resources/profiles/M3D/M3D Enabler D8500 MM Model_cover.png index 50020d51b7..0a57d39546 100644 Binary files a/resources/profiles/M3D/M3D Enabler D8500 MM Model_cover.png and b/resources/profiles/M3D/M3D Enabler D8500 MM Model_cover.png differ diff --git a/resources/profiles/M3D/machine/M3D Enabler D8500 MM Model.json b/resources/profiles/M3D/machine/M3D Enabler D8500 MM Model.json index 3402acc0a2..941348c128 100644 --- a/resources/profiles/M3D/machine/M3D Enabler D8500 MM Model.json +++ b/resources/profiles/M3D/machine/M3D Enabler D8500 MM Model.json @@ -5,8 +5,8 @@ "family": "M3D", "machine_tech": "FFF", "nozzle_diameter": "0.4", - "bed_model": "model/M3D_bed_model.stl", - "bed_texture": "model/M3D_bed_texture.png", + "bed_model": "M3D Enabler D8500 MM Model_bed_model.stl", + "bed_texture": "M3D Enabler D8500 MM Model_bed_texture.svg", "default_materials": "Generic PLA @system", "scan_folder": "1" } diff --git a/resources/profiles/M3D/model/M3D_bed_model.stl b/resources/profiles/M3D/model/M3D_bed_model.stl deleted file mode 100644 index 8ed24335dd..0000000000 Binary files a/resources/profiles/M3D/model/M3D_bed_model.stl and /dev/null differ diff --git a/resources/profiles/M3D/model/M3D_bed_texture.png b/resources/profiles/M3D/model/M3D_bed_texture.png deleted file mode 100644 index bd0e6b8b80..0000000000 Binary files a/resources/profiles/M3D/model/M3D_bed_texture.png and /dev/null differ diff --git a/resources/profiles/MagicMaker.json b/resources/profiles/MagicMaker.json index 53ebbeade5..c537d91a9c 100644 --- a/resources/profiles/MagicMaker.json +++ b/resources/profiles/MagicMaker.json @@ -1,6 +1,6 @@ { "name": "MagicMaker", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "MagicMaker configurations", "machine_model_list": [ diff --git a/resources/profiles/MagicMaker/120_buildplate_model.stl b/resources/profiles/MagicMaker/120_buildplate_model.stl index 2c4ecb81ee..1863933e04 100644 Binary files a/resources/profiles/MagicMaker/120_buildplate_model.stl and b/resources/profiles/MagicMaker/120_buildplate_model.stl differ diff --git a/resources/profiles/MagicMaker/125_buildplate_model.stl b/resources/profiles/MagicMaker/125_buildplate_model.stl index e3e9f08071..23ecda3c68 100644 Binary files a/resources/profiles/MagicMaker/125_buildplate_model.stl and b/resources/profiles/MagicMaker/125_buildplate_model.stl differ diff --git a/resources/profiles/MagicMaker/150_buildplate_model.stl b/resources/profiles/MagicMaker/150_buildplate_model.stl index 6b8b197d4c..ab7e751fed 100644 Binary files a/resources/profiles/MagicMaker/150_buildplate_model.stl and b/resources/profiles/MagicMaker/150_buildplate_model.stl differ diff --git a/resources/profiles/MagicMaker/160_buildplate_model.stl b/resources/profiles/MagicMaker/160_buildplate_model.stl index be6b21436c..aa4d8a174b 100644 Binary files a/resources/profiles/MagicMaker/160_buildplate_model.stl and b/resources/profiles/MagicMaker/160_buildplate_model.stl differ diff --git a/resources/profiles/MagicMaker/220210_buildplate_model.stl b/resources/profiles/MagicMaker/220210_buildplate_model.stl index 5afb83c333..4d86d56f08 100644 Binary files a/resources/profiles/MagicMaker/220210_buildplate_model.stl and b/resources/profiles/MagicMaker/220210_buildplate_model.stl differ diff --git a/resources/profiles/MagicMaker/220_buildplate_model.stl b/resources/profiles/MagicMaker/220_buildplate_model.stl index 01f43ca845..2210b93a5a 100644 Binary files a/resources/profiles/MagicMaker/220_buildplate_model.stl and b/resources/profiles/MagicMaker/220_buildplate_model.stl differ diff --git a/resources/profiles/MagicMaker/250_buildplate_model.stl b/resources/profiles/MagicMaker/250_buildplate_model.stl index 0b6d7de9b3..c2ac2b8b98 100644 Binary files a/resources/profiles/MagicMaker/250_buildplate_model.stl and b/resources/profiles/MagicMaker/250_buildplate_model.stl differ diff --git a/resources/profiles/MagicMaker/310_buildplate_model.stl b/resources/profiles/MagicMaker/310_buildplate_model.stl index 21c407a49f..eb78d090cc 100644 Binary files a/resources/profiles/MagicMaker/310_buildplate_model.stl and b/resources/profiles/MagicMaker/310_buildplate_model.stl differ diff --git a/resources/profiles/MagicMaker/MM hj_buildplate_model.stl b/resources/profiles/MagicMaker/MM hj_buildplate_model.stl deleted file mode 100644 index ab78d2fc4b..0000000000 Binary files a/resources/profiles/MagicMaker/MM hj_buildplate_model.stl and /dev/null differ diff --git a/resources/profiles/MagicMaker/MM_buildplate_texture.png b/resources/profiles/MagicMaker/MM_buildplate_texture.png deleted file mode 100644 index 56a2cc04e1..0000000000 Binary files a/resources/profiles/MagicMaker/MM_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/MagicMaker/MM_buildplate_texture.svg b/resources/profiles/MagicMaker/MM_buildplate_texture.svg new file mode 100644 index 0000000000..83042e4fe8 --- /dev/null +++ b/resources/profiles/MagicMaker/MM_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/MagicMaker/machine/MM BoneKing.json b/resources/profiles/MagicMaker/machine/MM BoneKing.json index be2ded1031..a7b80100be 100644 --- a/resources/profiles/MagicMaker/machine/MM BoneKing.json +++ b/resources/profiles/MagicMaker/machine/MM BoneKing.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "magicmaker", "bed_model": "310_buildplate_model.stl", - "bed_texture": "MM_buildplate_texture.png", + "bed_texture": "MM_buildplate_texture.svg", "hotend_model": "MM_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System;Generic PC @System;Generic PA @System;MM Generic PEEK" } diff --git a/resources/profiles/MagicMaker/machine/MM hj SK.json b/resources/profiles/MagicMaker/machine/MM hj SK.json index f6b7f622f2..4ac3d3261c 100644 --- a/resources/profiles/MagicMaker/machine/MM hj SK.json +++ b/resources/profiles/MagicMaker/machine/MM hj SK.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "magicmaker", "bed_model": "220210_buildplate_model.stl", - "bed_texture": "MM_buildplate_texture.png", + "bed_texture": "MM_buildplate_texture.svg", "hotend_model": "MM_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/MagicMaker/machine/MM hqs SF.json b/resources/profiles/MagicMaker/machine/MM hqs SF.json index 5e7e1ed6f2..8adc3b1abb 100644 --- a/resources/profiles/MagicMaker/machine/MM hqs SF.json +++ b/resources/profiles/MagicMaker/machine/MM hqs SF.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "magicmaker", "bed_model": "220210_buildplate_model.stl", - "bed_texture": "MM_buildplate_texture.png", + "bed_texture": "MM_buildplate_texture.svg", "hotend_model": "MM_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/MagicMaker/machine/MM hqs hj.json b/resources/profiles/MagicMaker/machine/MM hqs hj.json index 170cefa287..328bd27869 100644 --- a/resources/profiles/MagicMaker/machine/MM hqs hj.json +++ b/resources/profiles/MagicMaker/machine/MM hqs hj.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "magicmaker", "bed_model": "220210_buildplate_model.stl", - "bed_texture": "MM_buildplate_texture.png", + "bed_texture": "MM_buildplate_texture.svg", "hotend_model": "MM_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/MagicMaker/machine/MM slb.json b/resources/profiles/MagicMaker/machine/MM slb.json index 26fef789ba..381574dba3 100644 --- a/resources/profiles/MagicMaker/machine/MM slb.json +++ b/resources/profiles/MagicMaker/machine/MM slb.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "magicmaker", "bed_model": "125_buildplate_model.stl", - "bed_texture": "MM_buildplate_texture.png", + "bed_texture": "MM_buildplate_texture.svg", "hotend_model": "MM_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System" } diff --git a/resources/profiles/Mellow.json b/resources/profiles/Mellow.json index 4f8447cbb3..1db75c75aa 100644 --- a/resources/profiles/Mellow.json +++ b/resources/profiles/Mellow.json @@ -1,6 +1,6 @@ { "name": "Mellow", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Mellow Printer Profiles", "machine_model_list": [ diff --git a/resources/profiles/Mellow/machine/M1.json b/resources/profiles/Mellow/machine/M1.json index 0085f4d0a7..7116a2ad27 100644 --- a/resources/profiles/Mellow/machine/M1.json +++ b/resources/profiles/Mellow/machine/M1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Mellow", "bed_model": "M1_bed_model.stl", - "bed_texture": "mellow_bed_texture.png", + "bed_texture": "mellow_bed_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Mellow/mellow_bed_texture.png b/resources/profiles/Mellow/mellow_bed_texture.png deleted file mode 100644 index a615566b12..0000000000 Binary files a/resources/profiles/Mellow/mellow_bed_texture.png and /dev/null differ diff --git a/resources/profiles/Mellow/mellow_bed_texture.svg b/resources/profiles/Mellow/mellow_bed_texture.svg new file mode 100644 index 0000000000..cbc4eafa87 --- /dev/null +++ b/resources/profiles/Mellow/mellow_bed_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/OpenEYE.json b/resources/profiles/OpenEYE.json index e5a917d2e5..62861b96ef 100644 --- a/resources/profiles/OpenEYE.json +++ b/resources/profiles/OpenEYE.json @@ -1,7 +1,7 @@ { "name": "OpenEYE", "url": "http://www.openeye.tech", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "OpenEYE Printers Configurations", "machine_model_list": [ diff --git a/resources/profiles/OpenEYE/OpenEYE Peacock V2_cover.png b/resources/profiles/OpenEYE/OpenEYE Peacock V2_cover.png index 394f42c693..1fe5f70466 100644 Binary files a/resources/profiles/OpenEYE/OpenEYE Peacock V2_cover.png and b/resources/profiles/OpenEYE/OpenEYE Peacock V2_cover.png differ diff --git a/resources/profiles/OpenEYE/Plate.stl b/resources/profiles/OpenEYE/Plate.stl index c57b67b0aa..f2bc5da7df 100644 Binary files a/resources/profiles/OpenEYE/Plate.stl and b/resources/profiles/OpenEYE/Plate.stl differ diff --git a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2.json index 513f19c101..b64ae1f072 100644 --- a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2.json +++ b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2.json @@ -4,7 +4,7 @@ "nozzle_diameter": "0.4;0.2;0.6;0.8", "url": "http://www.openeye.tech", "bed_model": "Plate.stl", - "bed_texture": "pei.png", + "bed_texture": "", "default_bed_type": "Textured PEI Plate", "family": "OpenEYE", "machine_tech": "FFF", diff --git a/resources/profiles/OpenEYE/pei.png b/resources/profiles/OpenEYE/pei.png deleted file mode 100644 index 30c64391b8..0000000000 Binary files a/resources/profiles/OpenEYE/pei.png and /dev/null differ diff --git a/resources/profiles/OpenEYE/peo.png b/resources/profiles/OpenEYE/peo.png deleted file mode 100644 index b3d70117d7..0000000000 Binary files a/resources/profiles/OpenEYE/peo.png and /dev/null differ diff --git a/resources/profiles/OpenEYE/pet.png b/resources/profiles/OpenEYE/pet.png deleted file mode 100644 index 0679d1bf93..0000000000 Binary files a/resources/profiles/OpenEYE/pet.png and /dev/null differ diff --git a/resources/profiles/Peopoly.json b/resources/profiles/Peopoly.json index b9acf6ae37..6f5ecc7917 100644 --- a/resources/profiles/Peopoly.json +++ b/resources/profiles/Peopoly.json @@ -1,6 +1,6 @@ { "name": "Peopoly", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Peopoly configurations", "machine_model_list": [ diff --git a/resources/profiles/Peopoly/machine/Peopoly Magneto X.json b/resources/profiles/Peopoly/machine/Peopoly Magneto X.json index 5571be7312..031c3b2484 100644 --- a/resources/profiles/Peopoly/machine/Peopoly Magneto X.json +++ b/resources/profiles/Peopoly/machine/Peopoly Magneto X.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Peopoly", "bed_model": "magnetox_model.stl", - "bed_texture": "magnetox_model_texture.png", + "bed_texture": "magnetox_model_texture.svg", "hotend_model": "", "default_materials": "Peopoly Generic PLA" } diff --git a/resources/profiles/Peopoly/magnetox_model-400x300.stl b/resources/profiles/Peopoly/magnetox_model-400x300.stl index 785d79cca6..cdd3d46f74 100644 Binary files a/resources/profiles/Peopoly/magnetox_model-400x300.stl and b/resources/profiles/Peopoly/magnetox_model-400x300.stl differ diff --git a/resources/profiles/Peopoly/magnetox_model-400x300_texture.svg b/resources/profiles/Peopoly/magnetox_model-400x300_texture.svg new file mode 100644 index 0000000000..8f8bb897c6 --- /dev/null +++ b/resources/profiles/Peopoly/magnetox_model-400x300_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Peopoly/magnetox_model-back.stl b/resources/profiles/Peopoly/magnetox_model-back.stl deleted file mode 100644 index 0a5bbec7d4..0000000000 Binary files a/resources/profiles/Peopoly/magnetox_model-back.stl and /dev/null differ diff --git a/resources/profiles/Peopoly/magnetox_model.stl b/resources/profiles/Peopoly/magnetox_model.stl index 66ba36cfba..1c5df7ceb2 100644 Binary files a/resources/profiles/Peopoly/magnetox_model.stl and b/resources/profiles/Peopoly/magnetox_model.stl differ diff --git a/resources/profiles/Peopoly/magnetox_model_texture-400x300.png b/resources/profiles/Peopoly/magnetox_model_texture-400x300.png deleted file mode 100644 index b33eebdd43..0000000000 Binary files a/resources/profiles/Peopoly/magnetox_model_texture-400x300.png and /dev/null differ diff --git a/resources/profiles/Peopoly/magnetox_model_texture.png b/resources/profiles/Peopoly/magnetox_model_texture.png deleted file mode 100644 index 41963628bc..0000000000 Binary files a/resources/profiles/Peopoly/magnetox_model_texture.png and /dev/null differ diff --git a/resources/profiles/Peopoly/magnetox_model_texture.svg b/resources/profiles/Peopoly/magnetox_model_texture.svg new file mode 100644 index 0000000000..37f3aca441 --- /dev/null +++ b/resources/profiles/Peopoly/magnetox_model_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Phrozen/Phrozen Arco_buildplate_texture.svg b/resources/profiles/Phrozen/Phrozen Arco_buildplate_texture.svg index 38279a2f20..486a7cd6c4 100644 --- a/resources/profiles/Phrozen/Phrozen Arco_buildplate_texture.svg +++ b/resources/profiles/Phrozen/Phrozen Arco_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Positron3D/ThePositron_bed_texture.svg b/resources/profiles/Positron3D/ThePositron_bed_texture.svg index d9ade25459..b978740820 100644 --- a/resources/profiles/Positron3D/ThePositron_bed_texture.svg +++ b/resources/profiles/Positron3D/ThePositron_bed_texture.svg @@ -1,86 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/resources/profiles/Prusa/Prusa CORE One L HF_cover.png b/resources/profiles/Prusa/Prusa CORE One L HF_cover.png index a9cf960bd6..c97c60e4ac 100644 Binary files a/resources/profiles/Prusa/Prusa CORE One L HF_cover.png and b/resources/profiles/Prusa/Prusa CORE One L HF_cover.png differ diff --git a/resources/profiles/Prusa/Prusa CORE One L_cover.png b/resources/profiles/Prusa/Prusa CORE One L_cover.png index a9cf960bd6..d96da979fa 100644 Binary files a/resources/profiles/Prusa/Prusa CORE One L_cover.png and b/resources/profiles/Prusa/Prusa CORE One L_cover.png differ diff --git a/resources/profiles/Prusa/Prusa XL.svg b/resources/profiles/Prusa/Prusa XL.svg index eed839c6a9..02d4d21b77 100644 --- a/resources/profiles/Prusa/Prusa XL.svg +++ b/resources/profiles/Prusa/Prusa XL.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Prusa/coreone.svg b/resources/profiles/Prusa/coreone.svg index 0764d01894..c6b2aefa04 100644 --- a/resources/profiles/Prusa/coreone.svg +++ b/resources/profiles/Prusa/coreone.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Prusa/coreonel.svg b/resources/profiles/Prusa/coreonel.svg index ca653911d8..e0440447f1 100644 --- a/resources/profiles/Prusa/coreonel.svg +++ b/resources/profiles/Prusa/coreonel.svg @@ -1,89 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/profiles/Prusa/coreonel_bed.stl b/resources/profiles/Prusa/coreonel_bed.stl index bf4b1c8d9e..e19459e24e 100644 Binary files a/resources/profiles/Prusa/coreonel_bed.stl and b/resources/profiles/Prusa/coreonel_bed.stl differ diff --git a/resources/profiles/Prusa/mini.svg b/resources/profiles/Prusa/mini.svg index 959a4ded3a..22d4837f53 100644 --- a/resources/profiles/Prusa/mini.svg +++ b/resources/profiles/Prusa/mini.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Prusa/miniis.svg b/resources/profiles/Prusa/miniis.svg index 959a4ded3a..22d4837f53 100644 --- a/resources/profiles/Prusa/miniis.svg +++ b/resources/profiles/Prusa/miniis.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Prusa/mk3.5.svg b/resources/profiles/Prusa/mk3.5.svg index f1e4c37429..6f413a19b2 100644 --- a/resources/profiles/Prusa/mk3.5.svg +++ b/resources/profiles/Prusa/mk3.5.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Prusa/mk3.svg b/resources/profiles/Prusa/mk3.svg index f74843ffd8..66ac1699cf 100644 --- a/resources/profiles/Prusa/mk3.svg +++ b/resources/profiles/Prusa/mk3.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Prusa/mk4.svg b/resources/profiles/Prusa/mk4.svg index 40950a2a2a..6f57c53e63 100644 --- a/resources/profiles/Prusa/mk4.svg +++ b/resources/profiles/Prusa/mk4.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Prusa/mk4is.svg b/resources/profiles/Prusa/mk4is.svg index 29ba0f55f5..6f57c53e63 100644 --- a/resources/profiles/Prusa/mk4is.svg +++ b/resources/profiles/Prusa/mk4is.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Prusa/mk4s.svg b/resources/profiles/Prusa/mk4s.svg index f20ed33e0c..60f8ee69f4 100644 --- a/resources/profiles/Prusa/mk4s.svg +++ b/resources/profiles/Prusa/mk4s.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index 05c7296750..63d5f9c371 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -1,6 +1,6 @@ { "name": "Qidi", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ diff --git a/resources/profiles/Qidi/Qidi Q1 Pro_cover.png b/resources/profiles/Qidi/Qidi Q1 Pro_cover.png index 3c3240da88..a068f3c3dd 100644 Binary files a/resources/profiles/Qidi/Qidi Q1 Pro_cover.png and b/resources/profiles/Qidi/Qidi Q1 Pro_cover.png differ diff --git a/resources/profiles/Qidi/Qidi Q2C_cover.png b/resources/profiles/Qidi/Qidi Q2C_cover.png index e2ce1c2584..14d2c113dc 100644 Binary files a/resources/profiles/Qidi/Qidi Q2C_cover.png and b/resources/profiles/Qidi/Qidi Q2C_cover.png differ diff --git a/resources/profiles/Qidi/Qidi Q2_cover.png b/resources/profiles/Qidi/Qidi Q2_cover.png index 03143cf0f0..715b732c30 100644 Binary files a/resources/profiles/Qidi/Qidi Q2_cover.png and b/resources/profiles/Qidi/Qidi Q2_cover.png differ diff --git a/resources/profiles/Qidi/Qidi X-CF Pro_cover.png b/resources/profiles/Qidi/Qidi X-CF Pro_cover.png index df2d13260d..2d29d8d555 100644 Binary files a/resources/profiles/Qidi/Qidi X-CF Pro_cover.png and b/resources/profiles/Qidi/Qidi X-CF Pro_cover.png differ diff --git a/resources/profiles/Qidi/Qidi X-Max 3_cover.png b/resources/profiles/Qidi/Qidi X-Max 3_cover.png index b3e96f1800..9c74554f49 100644 Binary files a/resources/profiles/Qidi/Qidi X-Max 3_cover.png and b/resources/profiles/Qidi/Qidi X-Max 3_cover.png differ diff --git a/resources/profiles/Qidi/Qidi X-Max 4_cover.png b/resources/profiles/Qidi/Qidi X-Max 4_cover.png index 343b8c696b..10947cf7da 100644 Binary files a/resources/profiles/Qidi/Qidi X-Max 4_cover.png and b/resources/profiles/Qidi/Qidi X-Max 4_cover.png differ diff --git a/resources/profiles/Qidi/Qidi X-Max_cover.png b/resources/profiles/Qidi/Qidi X-Max_cover.png index 5943304ec0..897ea08516 100644 Binary files a/resources/profiles/Qidi/Qidi X-Max_cover.png and b/resources/profiles/Qidi/Qidi X-Max_cover.png differ diff --git a/resources/profiles/Qidi/Qidi X-Plus 3_cover.png b/resources/profiles/Qidi/Qidi X-Plus 3_cover.png index 76a3d4fd11..cf5192e943 100644 Binary files a/resources/profiles/Qidi/Qidi X-Plus 3_cover.png and b/resources/profiles/Qidi/Qidi X-Plus 3_cover.png differ diff --git a/resources/profiles/Qidi/Qidi X-Plus 4_cover.png b/resources/profiles/Qidi/Qidi X-Plus 4_cover.png index a186796362..a655e9c9fe 100644 Binary files a/resources/profiles/Qidi/Qidi X-Plus 4_cover.png and b/resources/profiles/Qidi/Qidi X-Plus 4_cover.png differ diff --git a/resources/profiles/Qidi/Qidi X-Plus_cover.png b/resources/profiles/Qidi/Qidi X-Plus_cover.png index 6b665890ce..db8ccf3021 100644 Binary files a/resources/profiles/Qidi/Qidi X-Plus_cover.png and b/resources/profiles/Qidi/Qidi X-Plus_cover.png differ diff --git a/resources/profiles/Qidi/Qidi X-Smart 3_cover.png b/resources/profiles/Qidi/Qidi X-Smart 3_cover.png index bba6624ee4..f6588cd8a0 100644 Binary files a/resources/profiles/Qidi/Qidi X-Smart 3_cover.png and b/resources/profiles/Qidi/Qidi X-Smart 3_cover.png differ diff --git a/resources/profiles/Qidi/X-Max 4_bed.stl b/resources/profiles/Qidi/X-Max 4_bed.stl deleted file mode 100644 index f066c18d88..0000000000 Binary files a/resources/profiles/Qidi/X-Max 4_bed.stl and /dev/null differ diff --git a/resources/profiles/Qidi/X-Max 4_bed.svg b/resources/profiles/Qidi/X-Max 4_bed.svg deleted file mode 100644 index be7328c467..0000000000 --- a/resources/profiles/Qidi/X-Max 4_bed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro.json index eb797ce6b9..d6102cf61f 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_Q1Pro_buildplate_model.stl", - "bed_texture": "qidi_Q1Pro_buildplate_texture.png", + "bed_texture": "qidi_Q1Pro_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", "default_materials": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle;QIDI ASA @Qidi Q1 Pro 0.4 nozzle;QIDI ASA @Qidi Q1 Pro 0.2 nozzle;QIDI ASA @Qidi Q1 Pro 0.6 nozzle;QIDI ASA @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle" } diff --git a/resources/profiles/Qidi/machine/Qidi Q2.json b/resources/profiles/Qidi/machine/Qidi Q2.json index aaae0f922b..d7f9e8bf62 100644 --- a/resources/profiles/Qidi/machine/Qidi Q2.json +++ b/resources/profiles/Qidi/machine/Qidi Q2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_q2_buildplate_model.stl", - "bed_texture": "qidi_q2_buildplate_texture.png", + "bed_texture": "qidi_q2_buildplate_texture.svg", "hotend_model": "X-Series_gen3_hotend.stl", "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PLA Rapido Matte;QIDI ASA;QIDI PET-CF" } diff --git a/resources/profiles/Qidi/machine/Qidi Q2C.json b/resources/profiles/Qidi/machine/Qidi Q2C.json index f649a6a84e..cdc45e8f5e 100644 --- a/resources/profiles/Qidi/machine/Qidi Q2C.json +++ b/resources/profiles/Qidi/machine/Qidi Q2C.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_q2c_buildplate_model.stl", - "bed_texture": "qidi_q2c_buildplate_texture.png", + "bed_texture": "qidi_q2c_buildplate_texture.svg", "hotend_model": "X-Series_gen3_hotend.stl", "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PLA Rapido Matte;QIDI ASA;QIDI PET-CF" } diff --git a/resources/profiles/Qidi/machine/Qidi X-CF Pro.json b/resources/profiles/Qidi/machine/Qidi X-CF Pro.json index fcfe056c9d..b70c4bc480 100644 --- a/resources/profiles/Qidi/machine/Qidi X-CF Pro.json +++ b/resources/profiles/Qidi/machine/Qidi X-CF Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_xcfpro_buildplate_model.stl", - "bed_texture": "qidi_xcfpro_buildplate_texture.png", + "bed_texture": "qidi_xcfpro_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen2_hotend.stl", "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU 95A" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3.json b/resources/profiles/Qidi/machine/Qidi X-Max 3.json index 490098c50f..56fc955601 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_xmax3_buildplate_model.stl", - "bed_texture": "qidi_xmax3_buildplate_texture.png", + "bed_texture": "qidi_xmax3_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json index d70e0e96e7..70740a10dd 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 4 0.4 nozzle.json @@ -57,7 +57,7 @@ "machine_max_speed_y": [ "800" ], - "machine_start_gcode": ";===== PRINT_PHASE_INIT =====\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nSET_PRINT_MAIN_STATUS MAIN_STATUS=print_start\nM220 S100\nM221 S100\nSET_INPUT_SHAPER SHAPER_TYPE_X=mzv\nSET_INPUT_SHAPER SHAPER_TYPE_Y=mzv\nDISABLE_ALL_SENSOR\nM1002 R1\nM107\nCLEAR_PAUSE\nM140 S[bed_temperature_initial_layer_single]\nM141 S[chamber_temperature]\nG29.0\nSET_PRINT_SUB_STATUS SUB_STATUS=tool_head_reset\nG28\n\n;===== BOX_PREPAR =====\nSET_PRINT_SUB_STATUS SUB_STATUS=change_filament\nBOX_PRINT_START EXTRUDER=[initial_no_support_extruder] HOTENDTEMP={nozzle_temperature_range_high[initial_tool]}\nM400\nEXTRUSION_AND_FLUSH HOTEND=[nozzle_temperature_initial_layer]\n\n;===== CLEAR_NOZZLE =====\nSET_PRINT_SUB_STATUS SUB_STATUS=flush_filament\nG1 Z20 F480\nMOVE_TO_TRASH\nG1 Y403.5 F2000\n{if chamber_temperature[0] == 0}\nM106 P3 S[during_print_exhaust_fan_speed]\n{else}\nM106 P3 S0\n{endif}\nM1004\nM106 S0\nM109 S[nozzle_temperature_initial_layer]\nG92 E0\nM83\nG1 E5 F80\nG1 E250 F300\nM400\nM106 S255\nG1 E-3 F1000\nM104 S140\nSET_PRINT_SUB_STATUS SUB_STATUS=clear_nozzle\nM109.1 S{nozzle_temperature_initial_layer[0]-30}\nM204 S10000\nG1 Y403 F2000\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 Y395 F6000\nG1 X188\nG1 Z-0.2 F480\nM106 S255\nM109.1 S150\nG91\nG1 X15 F200\nG1 Y2\nG1 X-15\nG1 Y-2\nG1 X15\nG90\nG2 I0.5 J0.5 F480\nG2 I0.5 J0.5\nG2 I0.5 J0.5\nG1 Z10\nG1 Y383 F12000\nG1 X116\nG1 Y403\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 X195 Y195\nM106 S0\nSET_PRINT_SUB_STATUS SUB_STATUS=wait_bed_temp\nM190 S[bed_temperature_initial_layer_single]\nSET_PRINT_SUB_STATUS SUB_STATUS=wait_chamber_temp\nM191 S[chamber_temperature]\nG1 Y0 F15000\nG1 X15\nG1 X3 F5000\nG4 P1000\nG1 X4 F1000\nG1 X3 F5000\nG4 P1000\nG1 E-4 F1800\nG1 X15 F3000\nG1 X20 Y20 F15000\nSET_PRINT_SUB_STATUS SUB_STATUS=z_tilt_adjust\nZ_TILT_ADJUST\nSET_PRINT_SUB_STATUS SUB_STATUS=auto_bed_adjust\nG29\nM1002 A1\nG1 X195 Y195 Z10 F20000\nG92_ Z{10 - ((nozzle_temperature_initial_layer[initial_tool] - 130) / 14 - 5.0) / 100}\nG0 Y1\nM109 S[nozzle_temperature_initial_layer]\nENABLE_ALL_SENSOR\n\n;===== PRINT_START =====\n; LAYER_HEIGHT: 0.2\nT[initial_tool]\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperature]\nG4 P3000\nprobe samples=1\nG91\nG0 Z0.6 F480\nG90\nG1 X175 Y1 F20000\nG1 E5 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 X215 E20 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 Z1 F480\nSET_PRINT_MAIN_STATUS MAIN_STATUS=printing", + "machine_start_gcode": ";===== PRINT_PHASE_INIT =====\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nSET_PRINT_MAIN_STATUS MAIN_STATUS=print_start\nM220 S100\nM221 S100\nSET_INPUT_SHAPER SHAPER_TYPE_X=mzv\nSET_INPUT_SHAPER SHAPER_TYPE_Y=mzv\nDISABLE_ALL_SENSOR\nM1002 R1\nM107\nCLEAR_PAUSE\nM140 S[bed_temperature_initial_layer_single]\nM141 S[chamber_temperature]\nG29.0\nSET_PRINT_SUB_STATUS SUB_STATUS=tool_head_reset\nG28\n\n;===== BOX_PREPAR =====\nSET_PRINT_SUB_STATUS SUB_STATUS=change_filament\nBOX_PRINT_START EXTRUDER=[initial_no_support_extruder] HOTENDTEMP={nozzle_temperature_range_high[initial_tool]}\nM400\nEXTRUSION_AND_FLUSH HOTEND=[nozzle_temperature_initial_layer]\n\n;===== CLEAR_NOZZLE =====\nSET_PRINT_SUB_STATUS SUB_STATUS=flush_filament\nG1 Z20 F480\nMOVE_TO_TRASH\nG1 Y403.5 F2000\n{if chamber_temperature[0] == 0}\nM106 P3 S[during_print_exhaust_fan_speed]\n{else}\nM106 P3 S0\n{endif}\nM1004\nM106 S0\nM109 S[nozzle_temperature_initial_layer]\nG92 E0\nM83\nG1 E5 F80\nG1 E250 F300\nM400\nM106 S255\nG1 E-3 F1000\nM104 S140\nSET_PRINT_SUB_STATUS SUB_STATUS=clear_nozzle\nM109.1 S{nozzle_temperature_initial_layer[0]-30}\nM204 S10000\nG1 Y403 F2000\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 Y395 F6000\nG1 X188\nG1 Z-0.2 F480\nM106 S255\nM109.1 S150\nG91\nG1 X15 F200\nG1 Y2\nG1 X-15\nG1 Y-2\nG1 X15\nG90\nG2 I0.5 J0.5 F480\nG2 I0.5 J0.5\nG2 I0.5 J0.5\nG1 Z10\nG1 Y383 F12000\nG1 X116\nG1 Y403\nG1 X163 F8000\nG1 X145 F5000\nG1 X163 F8000\nG1 X145 F5000\nG1 X175 F6000\nG1 X163\nG1 X175\nG1 X163\nG1 X175\nG1 X163\nG1 X180 F10000\nG1 X195 Y195\nM106 S0\nSET_PRINT_SUB_STATUS SUB_STATUS=wait_bed_temp\nM190 S[bed_temperature_initial_layer_single]\nSET_PRINT_SUB_STATUS SUB_STATUS=wait_chamber_temp\nM191 S[chamber_temperature]\nG1 Y0 F15000\nG1 X15\nG1 X3 F5000\nG4 P1000\nG1 X4 F1000\nG1 X3 F5000\nG4 P1000\nG1 E-4 F1800\nG1 X15 F3000\nG1 X20 Y20 F15000\nSET_PRINT_SUB_STATUS SUB_STATUS=z_tilt_adjust\nZ_TILT_ADJUST\nSET_PRINT_SUB_STATUS SUB_STATUS=auto_bed_adjust\nG29\nM1002 A1\nG1 X195 Y195 Z10 F20000\nG92_ Z{10 - ((nozzle_temperature_initial_layer[initial_tool] - 130) / 14 - 5.0) / 100}\nG0 Y1\nM109 S[nozzle_temperature_initial_layer]\nENABLE_ALL_SENSOR\n\n;===== PRINT_START =====\n; LAYER_HEIGHT: 0.2\nT[initial_tool]\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperature]\nG4 P3000\nprobe samples=1\nG91\nG0 Z0.6 F480\nG90\nG1 X175 Y1 F20000\nG1 E5 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 X215 E20 F{filament_max_volumetric_speed[initial_no_support_extruder]/2/2.4053*60}\nG1 Z1 F480\nSET_PRINT_MAIN_STATUS MAIN_STATUS=printing", "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 4.json b/resources/profiles/Qidi/machine/Qidi X-Max 4.json index 31187dab7a..4d67f77537 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 4.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 4.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4;0.2;0.6;0.8", "machine_tech": "FFF", "family": "Qidi", - "bed_model": "X-Max 4_bed.stl", - "bed_texture": "X-Max 4_bed.svg", + "bed_model": "qidi_xmax4_buildplate_model.stl", + "bed_texture": "qidi_xmax4_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", "default_materials": "Generic ABS @Qidi X-Max 4 0.4 nozzle;Generic PLA @Qidi X-Max 4 0.4 nozzle;QIDI ABS Odorless @Qidi X-Max 4 0.4 nozzle;QIDI ABS Rapido @Qidi X-Max 4 0.4 nozzle;QIDI PLA Rapido @Qidi X-Max 4 0.4 nozzle;QIDI PLA Rapido Matte @Qidi X-Max 4 0.4 nozzle;QIDI PLA-CF @Qidi X-Max 4 0.4 nozzle;Generic PLA Silk @Qidi X-Max 4 0.4 nozzle;QIDI PLA Rapido Silk @Qidi X-Max 4 0.4 nozzle;QIDI ASA @Qidi X-Max 4 0.4 nozzle;QIDI PETG Basic @Qidi X-Max 4 0.4 nozzle;QIDI PETG Rapido @Qidi X-Max 4 0.4 nozzle;QIDI PETG Tough @Qidi X-Max 4 0.4 nozzle;QIDI PETG Translucent @Qidi X-Max 4 0.4 nozzle;QIDI PLA Basic @Qidi X-Max 4 0.4 nozzle;QIDI PLA Matte Basic @Qidi X-Max 4 0.4 nozzle;Generic PETG @Qidi X-Max 4 0.4 nozzle" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Max.json b/resources/profiles/Qidi/machine/Qidi X-Max.json index 740055f1e2..ac917aa5b7 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_xmax_buildplate_model.stl", - "bed_texture": "qidi_xmax_buildplate_texture.png", + "bed_texture": "qidi_xmax_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen2_hotend.stl", "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU 95A" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3.json index 21ade58ef2..535fc25aef 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_xplus3_buildplate_model.stl", - "bed_texture": "qidi_xplus3_buildplate_texture.png", + "bed_texture": "qidi_xplus3_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 4.json b/resources/profiles/Qidi/machine/Qidi X-Plus 4.json index 34612a0636..82702cb7dc 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 4.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 4.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_xplus4_buildplate_model.stl", - "bed_texture": "qidi_xplus4_buildplate_texture.png", + "bed_texture": "qidi_xplus4_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PLA Rapido Matte;QIDI ASA;Qidi Generic PETG" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus.json b/resources/profiles/Qidi/machine/Qidi X-Plus.json index 22074389f1..5aa0917d5e 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_xplus_buildplate_model.stl", - "bed_texture": "qidi_xplus_buildplate_texture.png", + "bed_texture": "qidi_xplus_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen2_hotend.stl", "default_materials": "Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3.json index 3efa7d8f92..78cd91d3e4 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "qidi_xsmart3_buildplate_model.stl", - "bed_texture": "qidi_xsmart3_buildplate_texture.png", + "bed_texture": "qidi_xsmart3_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA" } diff --git a/resources/profiles/Qidi/qidi_Q1Pro_buildplate_texture.png b/resources/profiles/Qidi/qidi_Q1Pro_buildplate_texture.png deleted file mode 100644 index 759c134e94..0000000000 Binary files a/resources/profiles/Qidi/qidi_Q1Pro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_Q1Pro_buildplate_texture.svg b/resources/profiles/Qidi/qidi_Q1Pro_buildplate_texture.svg new file mode 100644 index 0000000000..7c2aa9a2ad --- /dev/null +++ b/resources/profiles/Qidi/qidi_Q1Pro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_q2_buildplate_model.stl b/resources/profiles/Qidi/qidi_q2_buildplate_model.stl index 27b48ed50c..e02028d51b 100644 Binary files a/resources/profiles/Qidi/qidi_q2_buildplate_model.stl and b/resources/profiles/Qidi/qidi_q2_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_q2_buildplate_texture.png b/resources/profiles/Qidi/qidi_q2_buildplate_texture.png deleted file mode 100644 index 39fc69670b..0000000000 Binary files a/resources/profiles/Qidi/qidi_q2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_q2_buildplate_texture.svg b/resources/profiles/Qidi/qidi_q2_buildplate_texture.svg new file mode 100644 index 0000000000..c777950ae1 --- /dev/null +++ b/resources/profiles/Qidi/qidi_q2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_q2c_buildplate_model.stl b/resources/profiles/Qidi/qidi_q2c_buildplate_model.stl index ca300b0cec..37d597f228 100644 Binary files a/resources/profiles/Qidi/qidi_q2c_buildplate_model.stl and b/resources/profiles/Qidi/qidi_q2c_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_q2c_buildplate_texture.png b/resources/profiles/Qidi/qidi_q2c_buildplate_texture.png deleted file mode 100644 index 7778895c9c..0000000000 Binary files a/resources/profiles/Qidi/qidi_q2c_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_q2c_buildplate_texture.svg b/resources/profiles/Qidi/qidi_q2c_buildplate_texture.svg new file mode 100644 index 0000000000..e479f84234 --- /dev/null +++ b/resources/profiles/Qidi/qidi_q2c_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_xcfpro_buildplate_model.stl b/resources/profiles/Qidi/qidi_xcfpro_buildplate_model.stl index c6120a6536..a0568771f9 100644 Binary files a/resources/profiles/Qidi/qidi_xcfpro_buildplate_model.stl and b/resources/profiles/Qidi/qidi_xcfpro_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_xcfpro_buildplate_texture.png b/resources/profiles/Qidi/qidi_xcfpro_buildplate_texture.png deleted file mode 100644 index 549ccab670..0000000000 Binary files a/resources/profiles/Qidi/qidi_xcfpro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_xcfpro_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xcfpro_buildplate_texture.svg new file mode 100644 index 0000000000..b21f71471c --- /dev/null +++ b/resources/profiles/Qidi/qidi_xcfpro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_xmax3_buildplate_model.stl b/resources/profiles/Qidi/qidi_xmax3_buildplate_model.stl index ee8fc101a4..97e59d2ddc 100644 Binary files a/resources/profiles/Qidi/qidi_xmax3_buildplate_model.stl and b/resources/profiles/Qidi/qidi_xmax3_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_xmax3_buildplate_texture.png b/resources/profiles/Qidi/qidi_xmax3_buildplate_texture.png deleted file mode 100644 index 8269d86142..0000000000 Binary files a/resources/profiles/Qidi/qidi_xmax3_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_xmax3_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xmax3_buildplate_texture.svg new file mode 100644 index 0000000000..8e78ffba6d --- /dev/null +++ b/resources/profiles/Qidi/qidi_xmax3_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_xmax4_buildplate_model.stl b/resources/profiles/Qidi/qidi_xmax4_buildplate_model.stl new file mode 100644 index 0000000000..65cae7f796 Binary files /dev/null and b/resources/profiles/Qidi/qidi_xmax4_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_xmax4_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xmax4_buildplate_texture.svg new file mode 100644 index 0000000000..9aa53dc7a2 --- /dev/null +++ b/resources/profiles/Qidi/qidi_xmax4_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_xmax_buildplate_model.stl b/resources/profiles/Qidi/qidi_xmax_buildplate_model.stl index c6120a6536..a0568771f9 100644 Binary files a/resources/profiles/Qidi/qidi_xmax_buildplate_model.stl and b/resources/profiles/Qidi/qidi_xmax_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_xmax_buildplate_texture.png b/resources/profiles/Qidi/qidi_xmax_buildplate_texture.png deleted file mode 100644 index 549ccab670..0000000000 Binary files a/resources/profiles/Qidi/qidi_xmax_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_xmax_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xmax_buildplate_texture.svg new file mode 100644 index 0000000000..b21f71471c --- /dev/null +++ b/resources/profiles/Qidi/qidi_xmax_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_xplus3_buildplate_model.stl b/resources/profiles/Qidi/qidi_xplus3_buildplate_model.stl index 6371cee8d5..6aeb7794e8 100644 Binary files a/resources/profiles/Qidi/qidi_xplus3_buildplate_model.stl and b/resources/profiles/Qidi/qidi_xplus3_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_xplus3_buildplate_texture.png b/resources/profiles/Qidi/qidi_xplus3_buildplate_texture.png deleted file mode 100644 index 9a74ba68e8..0000000000 Binary files a/resources/profiles/Qidi/qidi_xplus3_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_xplus3_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xplus3_buildplate_texture.svg new file mode 100644 index 0000000000..5c21b43e14 --- /dev/null +++ b/resources/profiles/Qidi/qidi_xplus3_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_xplus4_buildplate_texture.png b/resources/profiles/Qidi/qidi_xplus4_buildplate_texture.png deleted file mode 100644 index c953c14270..0000000000 Binary files a/resources/profiles/Qidi/qidi_xplus4_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_xplus4_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xplus4_buildplate_texture.svg new file mode 100644 index 0000000000..ce565cbc0b --- /dev/null +++ b/resources/profiles/Qidi/qidi_xplus4_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_xplus_buildplate_model.stl b/resources/profiles/Qidi/qidi_xplus_buildplate_model.stl index 0f58d752d7..8071a23913 100644 Binary files a/resources/profiles/Qidi/qidi_xplus_buildplate_model.stl and b/resources/profiles/Qidi/qidi_xplus_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_xplus_buildplate_texture.png b/resources/profiles/Qidi/qidi_xplus_buildplate_texture.png deleted file mode 100644 index 17d70472b5..0000000000 Binary files a/resources/profiles/Qidi/qidi_xplus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_xplus_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xplus_buildplate_texture.svg new file mode 100644 index 0000000000..cb8805b5d1 --- /dev/null +++ b/resources/profiles/Qidi/qidi_xplus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Qidi/qidi_xsmart3_buildplate_model.stl b/resources/profiles/Qidi/qidi_xsmart3_buildplate_model.stl index 6215174913..6da0ec7f99 100644 Binary files a/resources/profiles/Qidi/qidi_xsmart3_buildplate_model.stl and b/resources/profiles/Qidi/qidi_xsmart3_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_xsmart3_buildplate_texture.png b/resources/profiles/Qidi/qidi_xsmart3_buildplate_texture.png deleted file mode 100644 index fdfa680171..0000000000 Binary files a/resources/profiles/Qidi/qidi_xsmart3_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Qidi/qidi_xsmart3_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xsmart3_buildplate_texture.svg new file mode 100644 index 0000000000..3fb1ad6d7f --- /dev/null +++ b/resources/profiles/Qidi/qidi_xsmart3_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/RH3D/E3NG v1.2S_cover.png b/resources/profiles/RH3D/E3NG v1.2S_cover.png index f9295a206c..03bb5a9e42 100644 Binary files a/resources/profiles/RH3D/E3NG v1.2S_cover.png and b/resources/profiles/RH3D/E3NG v1.2S_cover.png differ diff --git a/resources/profiles/RH3D/E3NG-bed-texture.svg b/resources/profiles/RH3D/E3NG-bed-texture.svg index 0848bd0098..2cc13e29ad 100644 --- a/resources/profiles/RH3D/E3NG-bed-texture.svg +++ b/resources/profiles/RH3D/E3NG-bed-texture.svg @@ -1,221 +1 @@ - - - - + \ No newline at end of file diff --git a/resources/profiles/RH3D/E3NG-bed.stl b/resources/profiles/RH3D/E3NG-bed.stl index 788c86ec60..4607169e33 100644 Binary files a/resources/profiles/RH3D/E3NG-bed.stl and b/resources/profiles/RH3D/E3NG-bed.stl differ diff --git a/resources/profiles/Raise3D.json b/resources/profiles/Raise3D.json index 010c0de8ee..086b030a27 100644 --- a/resources/profiles/Raise3D.json +++ b/resources/profiles/Raise3D.json @@ -1,7 +1,7 @@ { "name": "Raise3D", "url": "", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Raise3D configurations", "machine_model_list": [ diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus.json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus.json index b01f15ce51..07fc7c6491 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus.json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Raise3D", "bed_model": "raise3d_pro3plus_buildplate_model.stl", - "bed_texture": "raise3d_pro3plus_buildplate_texture.png", + "bed_texture": "raise3d_pro3plus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ASA @System;Generic PETG @System;Generic PLA @System;Generic PVA @System;Generic TPU @System" } diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3.json b/resources/profiles/Raise3D/machine/Raise3D Pro3.json index e08181d619..e8fa83c832 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3.json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Raise3D", "bed_model": "raise3d_pro3_buildplate_model.stl", - "bed_texture": "raise3d_pro3_buildplate_texture.png", + "bed_texture": "raise3d_pro3_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ASA @System;Generic PETG @System;Generic PLA @System;Generic PVA @System;Generic TPU @System" } diff --git a/resources/profiles/Raise3D/raise3d_pro3_buildplate_texture.png b/resources/profiles/Raise3D/raise3d_pro3_buildplate_texture.png deleted file mode 100644 index 5e0cf6566e..0000000000 Binary files a/resources/profiles/Raise3D/raise3d_pro3_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Raise3D/raise3d_pro3_buildplate_texture.svg b/resources/profiles/Raise3D/raise3d_pro3_buildplate_texture.svg new file mode 100644 index 0000000000..8839bf4f26 --- /dev/null +++ b/resources/profiles/Raise3D/raise3d_pro3_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Raise3D/raise3d_pro3plus_buildplate_texture.png b/resources/profiles/Raise3D/raise3d_pro3plus_buildplate_texture.png deleted file mode 100644 index 5e0cf6566e..0000000000 Binary files a/resources/profiles/Raise3D/raise3d_pro3plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Raise3D/raise3d_pro3plus_buildplate_texture.svg b/resources/profiles/Raise3D/raise3d_pro3plus_buildplate_texture.svg new file mode 100644 index 0000000000..8839bf4f26 --- /dev/null +++ b/resources/profiles/Raise3D/raise3d_pro3plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/RolohaunDesign.json b/resources/profiles/RolohaunDesign.json index fba99bfbba..492cd391e1 100644 --- a/resources/profiles/RolohaunDesign.json +++ b/resources/profiles/RolohaunDesign.json @@ -1,6 +1,6 @@ { "name": "RolohaunDesign", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "RolohaunDesign Printer Profiles", "machine_model_list": [ diff --git a/resources/profiles/RolohaunDesign/Rolohaun Delta Flyer Refit_cover.png b/resources/profiles/RolohaunDesign/Rolohaun Delta Flyer Refit_cover.png index 62e276dbb3..ccc2622b1c 100644 Binary files a/resources/profiles/RolohaunDesign/Rolohaun Delta Flyer Refit_cover.png and b/resources/profiles/RolohaunDesign/Rolohaun Delta Flyer Refit_cover.png differ diff --git a/resources/profiles/RolohaunDesign/Rook MK1 LDO_cover.png b/resources/profiles/RolohaunDesign/Rook MK1 LDO_cover.png index 3a70f86a29..dfa26ae600 100644 Binary files a/resources/profiles/RolohaunDesign/Rook MK1 LDO_cover.png and b/resources/profiles/RolohaunDesign/Rook MK1 LDO_cover.png differ diff --git a/resources/profiles/RolohaunDesign/bedtexture-rook-green-120.png b/resources/profiles/RolohaunDesign/bedtexture-rook-green-120.png deleted file mode 100644 index 7f3c389a09..0000000000 Binary files a/resources/profiles/RolohaunDesign/bedtexture-rook-green-120.png and /dev/null differ diff --git a/resources/profiles/RolohaunDesign/bedtexture-rook-green-120.svg b/resources/profiles/RolohaunDesign/bedtexture-rook-green-120.svg new file mode 100644 index 0000000000..3f3afd2f03 --- /dev/null +++ b/resources/profiles/RolohaunDesign/bedtexture-rook-green-120.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/RolohaunDesign/machine/Rolohaun Delta Flyer Refit.json b/resources/profiles/RolohaunDesign/machine/Rolohaun Delta Flyer Refit.json index 26942a36b2..5ce97371f7 100644 --- a/resources/profiles/RolohaunDesign/machine/Rolohaun Delta Flyer Refit.json +++ b/resources/profiles/RolohaunDesign/machine/Rolohaun Delta Flyer Refit.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "RolohaunDesign", "bed_model": "", - "bed_texture": "bedtexture-rook-green-120.png", + "bed_texture": "bedtexture-rook-green-120.svg", "hotend_model": "", "default_materials": "Generic PLA @System;Generic PETG @System" } diff --git a/resources/profiles/RolohaunDesign/machine/Rook MK1 LDO.json b/resources/profiles/RolohaunDesign/machine/Rook MK1 LDO.json index 69c43636ce..1363e8bd79 100644 --- a/resources/profiles/RolohaunDesign/machine/Rook MK1 LDO.json +++ b/resources/profiles/RolohaunDesign/machine/Rook MK1 LDO.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "RolohaunDesign", "bed_model": "", - "bed_texture": "bedtexture-rook-green-120.png", + "bed_texture": "bedtexture-rook-green-120.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Snapmaker/Snapmaker A250 Dual_texture.svg b/resources/profiles/Snapmaker/Snapmaker A250 Dual_texture.svg index 5c5fe4ffc2..a6454122d9 100644 --- a/resources/profiles/Snapmaker/Snapmaker A250 Dual_texture.svg +++ b/resources/profiles/Snapmaker/Snapmaker A250 Dual_texture.svg @@ -1,11 +1 @@ - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Snapmaker/Snapmaker A250_bed.stl b/resources/profiles/Snapmaker/Snapmaker A250_bed.stl index 9016f9c4f5..89d8add6bb 100644 Binary files a/resources/profiles/Snapmaker/Snapmaker A250_bed.stl and b/resources/profiles/Snapmaker/Snapmaker A250_bed.stl differ diff --git a/resources/profiles/Snapmaker/Snapmaker A250_texture.svg b/resources/profiles/Snapmaker/Snapmaker A250_texture.svg index d19cd036c8..a5c22d543f 100644 --- a/resources/profiles/Snapmaker/Snapmaker A250_texture.svg +++ b/resources/profiles/Snapmaker/Snapmaker A250_texture.svg @@ -1,11 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/resources/profiles/Snapmaker/Snapmaker A350 Dual_texture.svg b/resources/profiles/Snapmaker/Snapmaker A350 Dual_texture.svg index bdc061158c..52dcb9376a 100644 --- a/resources/profiles/Snapmaker/Snapmaker A350 Dual_texture.svg +++ b/resources/profiles/Snapmaker/Snapmaker A350 Dual_texture.svg @@ -1,11 +1 @@ - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Snapmaker/Snapmaker A350_bed.stl b/resources/profiles/Snapmaker/Snapmaker A350_bed.stl index 761efa2fc5..11d3225305 100644 Binary files a/resources/profiles/Snapmaker/Snapmaker A350_bed.stl and b/resources/profiles/Snapmaker/Snapmaker A350_bed.stl differ diff --git a/resources/profiles/Snapmaker/Snapmaker A350_texture.svg b/resources/profiles/Snapmaker/Snapmaker A350_texture.svg index 92a346e0c1..a7b5fa2d65 100644 --- a/resources/profiles/Snapmaker/Snapmaker A350_texture.svg +++ b/resources/profiles/Snapmaker/Snapmaker A350_texture.svg @@ -1,10 +1 @@ - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Snapmaker/Snapmaker Artisan_texture.svg b/resources/profiles/Snapmaker/Snapmaker Artisan_texture.svg index 1027b2ea93..45130989e1 100644 --- a/resources/profiles/Snapmaker/Snapmaker Artisan_texture.svg +++ b/resources/profiles/Snapmaker/Snapmaker Artisan_texture.svg @@ -1,9 +1 @@ - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Snapmaker/Snapmaker J1_texture.svg b/resources/profiles/Snapmaker/Snapmaker J1_texture.svg index a9d6034b50..9134323aa8 100644 --- a/resources/profiles/Snapmaker/Snapmaker J1_texture.svg +++ b/resources/profiles/Snapmaker/Snapmaker J1_texture.svg @@ -1,36 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/profiles/Snapmaker/Snapmaker U1_bed.stl b/resources/profiles/Snapmaker/Snapmaker U1_bed.stl index f1c58f2e1e..fcffb86f88 100644 Binary files a/resources/profiles/Snapmaker/Snapmaker U1_bed.stl and b/resources/profiles/Snapmaker/Snapmaker U1_bed.stl differ diff --git a/resources/profiles/Snapmaker/Snapmaker U1_bed.svg b/resources/profiles/Snapmaker/Snapmaker U1_bed.svg deleted file mode 100644 index b12ad10a5e..0000000000 --- a/resources/profiles/Snapmaker/Snapmaker U1_bed.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/resources/profiles/Snapmaker/Snapmaker U1_texture.svg b/resources/profiles/Snapmaker/Snapmaker U1_texture.svg new file mode 100644 index 0000000000..e1de73fac6 --- /dev/null +++ b/resources/profiles/Snapmaker/Snapmaker U1_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol.json b/resources/profiles/Sovol.json index e8d2d608f0..393c7c7374 100644 --- a/resources/profiles/Sovol.json +++ b/resources/profiles/Sovol.json @@ -1,7 +1,7 @@ { "name": "Sovol", "url": "", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Sovol configurations", "machine_model_list": [ diff --git a/resources/profiles/Sovol/Sovol SV01 Pro_cover.png b/resources/profiles/Sovol/Sovol SV01 Pro_cover.png index 3b5e26b111..a57baa519a 100644 Binary files a/resources/profiles/Sovol/Sovol SV01 Pro_cover.png and b/resources/profiles/Sovol/Sovol SV01 Pro_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV01_cover.png b/resources/profiles/Sovol/Sovol SV01_cover.png index 404585f66f..868a4ad18d 100644 Binary files a/resources/profiles/Sovol/Sovol SV01_cover.png and b/resources/profiles/Sovol/Sovol SV01_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV02_cover.png b/resources/profiles/Sovol/Sovol SV02_cover.png index 6065bb7012..c578601d07 100644 Binary files a/resources/profiles/Sovol/Sovol SV02_cover.png and b/resources/profiles/Sovol/Sovol SV02_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV05_cover.png b/resources/profiles/Sovol/Sovol SV05_cover.png index bc42266626..cd256a8c44 100644 Binary files a/resources/profiles/Sovol/Sovol SV05_cover.png and b/resources/profiles/Sovol/Sovol SV05_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV06 ACE_cover.png b/resources/profiles/Sovol/Sovol SV06 ACE_cover.png index dc409c917c..735ce86a78 100644 Binary files a/resources/profiles/Sovol/Sovol SV06 ACE_cover.png and b/resources/profiles/Sovol/Sovol SV06 ACE_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV06 Plus ACE_cover.png b/resources/profiles/Sovol/Sovol SV06 Plus ACE_cover.png index 73047b20fe..2b4d3faf56 100644 Binary files a/resources/profiles/Sovol/Sovol SV06 Plus ACE_cover.png and b/resources/profiles/Sovol/Sovol SV06 Plus ACE_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV06 Plus_cover.png b/resources/profiles/Sovol/Sovol SV06 Plus_cover.png index 6f8dc21ddf..880dba4a80 100644 Binary files a/resources/profiles/Sovol/Sovol SV06 Plus_cover.png and b/resources/profiles/Sovol/Sovol SV06 Plus_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV06_cover.png b/resources/profiles/Sovol/Sovol SV06_cover.png index 2fe0ebc8be..969d972e59 100644 Binary files a/resources/profiles/Sovol/Sovol SV06_cover.png and b/resources/profiles/Sovol/Sovol SV06_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV07 Plus_cover.png b/resources/profiles/Sovol/Sovol SV07 Plus_cover.png index badf7aa160..a541ec2d1d 100644 Binary files a/resources/profiles/Sovol/Sovol SV07 Plus_cover.png and b/resources/profiles/Sovol/Sovol SV07 Plus_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV07_cover.png b/resources/profiles/Sovol/Sovol SV07_cover.png index 47daf4bae3..dd8866a2bd 100644 Binary files a/resources/profiles/Sovol/Sovol SV07_cover.png and b/resources/profiles/Sovol/Sovol SV07_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV08 MAX_cover.png b/resources/profiles/Sovol/Sovol SV08 MAX_cover.png index 9d10449acc..35dc2546d2 100644 Binary files a/resources/profiles/Sovol/Sovol SV08 MAX_cover.png and b/resources/profiles/Sovol/Sovol SV08 MAX_cover.png differ diff --git a/resources/profiles/Sovol/Sovol SV08_cover.png b/resources/profiles/Sovol/Sovol SV08_cover.png index edaaf0f010..df9141873c 100644 Binary files a/resources/profiles/Sovol/Sovol SV08_cover.png and b/resources/profiles/Sovol/Sovol SV08_cover.png differ diff --git a/resources/profiles/Sovol/Sovol Zero_cover.png b/resources/profiles/Sovol/Sovol Zero_cover.png index ff351b2005..e2eab23fed 100644 Binary files a/resources/profiles/Sovol/Sovol Zero_cover.png and b/resources/profiles/Sovol/Sovol Zero_cover.png differ diff --git a/resources/profiles/Sovol/machine/Sovol SV01 Pro.json b/resources/profiles/Sovol/machine/Sovol SV01 Pro.json index 599826b057..ba158567e9 100644 --- a/resources/profiles/Sovol/machine/Sovol SV01 Pro.json +++ b/resources/profiles/Sovol/machine/Sovol SV01 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv01pro_buildplate_model.stl", - "bed_texture": "sovol_sv01pro_buildplate_texture.png", + "bed_texture": "sovol_sv01pro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Sovol/machine/Sovol SV01.json b/resources/profiles/Sovol/machine/Sovol SV01.json index 023bbff5ac..e70d4f410a 100644 --- a/resources/profiles/Sovol/machine/Sovol SV01.json +++ b/resources/profiles/Sovol/machine/Sovol SV01.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv01pro_buildplate_model.stl", - "bed_texture": "sovol_sv01pro_buildplate_texture.png", + "bed_texture": "sovol_sv01pro_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Sovol/machine/Sovol SV02.json b/resources/profiles/Sovol/machine/Sovol SV02.json index 24b182bd6b..e6206761ea 100644 --- a/resources/profiles/Sovol/machine/Sovol SV02.json +++ b/resources/profiles/Sovol/machine/Sovol SV02.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv02_buildplate_model.stl", - "bed_texture": "sovol_sv02_buildplate_texture.png", + "bed_texture": "sovol_sv02_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Sovol/machine/Sovol SV05.json b/resources/profiles/Sovol/machine/Sovol SV05.json index 7f2dd65846..4603348d52 100644 --- a/resources/profiles/Sovol/machine/Sovol SV05.json +++ b/resources/profiles/Sovol/machine/Sovol SV05.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv05_buildplate_model.stl", - "bed_texture": "sovol_sv05_buildplate_texture.png", + "bed_texture": "sovol_sv05_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Sovol/machine/Sovol SV06 ACE.json b/resources/profiles/Sovol/machine/Sovol SV06 ACE.json index 28832dbe05..fe28ebc823 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 ACE.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 ACE.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv06_ace_buildplate_model.stl", - "bed_texture": "sovol_sv06_ace_buildplate_texture.png", + "bed_texture": "sovol_sv06_ace_buildplate_texture.svg", "hotend_model": "", "default_materials": "Sovol SV06 ACE PLA" } diff --git a/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE.json b/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE.json index eeb3f978e4..8ec61bab90 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv06plus_ace_buildplate_model.stl", - "bed_texture": "sovol_sv06plus_ace_buildplate_texture.png", + "bed_texture": "sovol_sv06plus_ace_buildplate_texture.svg", "hotend_model": "", "default_materials": "Sovol SV06 Plus ACE PLA" } diff --git a/resources/profiles/Sovol/machine/Sovol SV06 Plus.json b/resources/profiles/Sovol/machine/Sovol SV06 Plus.json index 41ca05e5ca..ccfe70d105 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 Plus.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv06plus_buildplate_model.stl", - "bed_texture": "sovol_sv06plus_buildplate_texture.png", + "bed_texture": "sovol_sv06plus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Sovol/machine/Sovol SV06.json b/resources/profiles/Sovol/machine/Sovol SV06.json index ab1c8773c5..ad3019f571 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06.json +++ b/resources/profiles/Sovol/machine/Sovol SV06.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv06_buildplate_model.stl", - "bed_texture": "sovol_sv06_buildplate_texture.png", + "bed_texture": "sovol_sv06_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System;Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic ASA @System;Generic TPU @System;" } diff --git a/resources/profiles/Sovol/machine/Sovol SV07 Plus.json b/resources/profiles/Sovol/machine/Sovol SV07 Plus.json index cccb1267ec..640e7a9175 100644 --- a/resources/profiles/Sovol/machine/Sovol SV07 Plus.json +++ b/resources/profiles/Sovol/machine/Sovol SV07 Plus.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv07plus_buildplate_model.stl", - "bed_texture": "sovol_sv07plus_buildplate_texture.png", + "bed_texture": "sovol_sv07plus_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Sovol/machine/Sovol SV07.json b/resources/profiles/Sovol/machine/Sovol SV07.json index 472676cca1..2ac60556da 100644 --- a/resources/profiles/Sovol/machine/Sovol SV07.json +++ b/resources/profiles/Sovol/machine/Sovol SV07.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv07_buildplate_model.stl", - "bed_texture": "sovol_sv07_buildplate_texture.png", + "bed_texture": "sovol_sv07_buildplate_texture.svg", "hotend_model": "", "default_materials": "Sovol SV07 PLA" } diff --git a/resources/profiles/Sovol/machine/Sovol SV08 MAX.json b/resources/profiles/Sovol/machine/Sovol SV08 MAX.json index 08099e803f..92a92a9a1d 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 MAX.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv08_max_buildplate_model.stl", - "bed_texture": "sovol_sv08_max_buildplate_texture.png", + "bed_texture": "sovol_sv08_max_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA;Generic PLA Silk;Generic ABS;Generic PETG;Polymaker PETG;SUNLU PETG;Generic TPU;Generic PC" } diff --git a/resources/profiles/Sovol/machine/Sovol SV08.json b/resources/profiles/Sovol/machine/Sovol SV08.json index 910ac8d9b4..2d861f5ef4 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08.json +++ b/resources/profiles/Sovol/machine/Sovol SV08.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_sv08_buildplate_model.stl", - "bed_texture": "sovol_sv08_buildplate_texture.png", + "bed_texture": "sovol_sv08_buildplate_texture.svg", "hotend_model": "", "default_materials": "Sovol SV08 PLA;Sovol SV08 PLA @SV08 0.2 nozzle;Sovol SV08 ABS;Sovol SV08 PETG;Sovol SV08 TPU" } diff --git a/resources/profiles/Sovol/machine/Sovol Zero.json b/resources/profiles/Sovol/machine/Sovol Zero.json index 3807b8ed62..c1ccc64b84 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero.json +++ b/resources/profiles/Sovol/machine/Sovol Zero.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_zero_buildplate_model.stl", - "bed_texture": "sovol_zero_buildplate_texture.png", + "bed_texture": "sovol_zero_buildplate_texture.svg", "hotend_model": "", "default_materials": "Sovol Zero PLA Basic;Sovol Zero PLA Basic HS Nozzle;Sovol Zero PLA Silk;Sovol Zero PLA Silk HS Nozzle;Sovol Zero ABS;Sovol Zero PETG;Sovol Zero PETG HS Nozzle;Sovol Zero TPU;Sovol Zero PC" } diff --git a/resources/profiles/Sovol/sovol_buildplate_texture.png b/resources/profiles/Sovol/sovol_buildplate_texture.png deleted file mode 100644 index f4333808ed..0000000000 Binary files a/resources/profiles/Sovol/sovol_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv01pro_buildplate_model.stl b/resources/profiles/Sovol/sovol_sv01pro_buildplate_model.stl index 837cd8dc5a..9b18dc74b6 100644 Binary files a/resources/profiles/Sovol/sovol_sv01pro_buildplate_model.stl and b/resources/profiles/Sovol/sovol_sv01pro_buildplate_model.stl differ diff --git a/resources/profiles/Sovol/sovol_sv01pro_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv01pro_buildplate_texture.png deleted file mode 100644 index 5926ddf074..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv01pro_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv01pro_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv01pro_buildplate_texture.svg new file mode 100644 index 0000000000..0bf1b3847e --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv01pro_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv02_buildplate_model.stl b/resources/profiles/Sovol/sovol_sv02_buildplate_model.stl index 5c8575feb2..9b18dc74b6 100644 Binary files a/resources/profiles/Sovol/sovol_sv02_buildplate_model.stl and b/resources/profiles/Sovol/sovol_sv02_buildplate_model.stl differ diff --git a/resources/profiles/Sovol/sovol_sv02_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv02_buildplate_texture.png deleted file mode 100644 index 5926ddf074..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv02_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv02_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv02_buildplate_texture.svg new file mode 100644 index 0000000000..0bf1b3847e --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv02_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv05_buildplate_model.stl b/resources/profiles/Sovol/sovol_sv05_buildplate_model.stl index 254f7b8ebc..b0430b0b7d 100644 Binary files a/resources/profiles/Sovol/sovol_sv05_buildplate_model.stl and b/resources/profiles/Sovol/sovol_sv05_buildplate_model.stl differ diff --git a/resources/profiles/Sovol/sovol_sv05_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv05_buildplate_texture.png deleted file mode 100644 index bef64231af..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv05_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv05_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv05_buildplate_texture.svg new file mode 100644 index 0000000000..3efee6fd96 --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv05_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv06_ace_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv06_ace_buildplate_texture.png deleted file mode 100644 index 70a3df3484..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv06_ace_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv06_ace_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv06_ace_buildplate_texture.svg new file mode 100644 index 0000000000..0c237202b1 --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv06_ace_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv06_buildplate_model.stl b/resources/profiles/Sovol/sovol_sv06_buildplate_model.stl index 254f7b8ebc..b0430b0b7d 100644 Binary files a/resources/profiles/Sovol/sovol_sv06_buildplate_model.stl and b/resources/profiles/Sovol/sovol_sv06_buildplate_model.stl differ diff --git a/resources/profiles/Sovol/sovol_sv06_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv06_buildplate_texture.png deleted file mode 100644 index bef64231af..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv06_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv06_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv06_buildplate_texture.svg new file mode 100644 index 0000000000..3efee6fd96 --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv06_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv06plus_ace_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv06plus_ace_buildplate_texture.png deleted file mode 100644 index 12035cf5a5..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv06plus_ace_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv06plus_ace_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv06plus_ace_buildplate_texture.svg new file mode 100644 index 0000000000..6af3e48bca --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv06plus_ace_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv06plus_buildplate_model.stl b/resources/profiles/Sovol/sovol_sv06plus_buildplate_model.stl index d6a101982d..218510bd72 100644 Binary files a/resources/profiles/Sovol/sovol_sv06plus_buildplate_model.stl and b/resources/profiles/Sovol/sovol_sv06plus_buildplate_model.stl differ diff --git a/resources/profiles/Sovol/sovol_sv06plus_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv06plus_buildplate_texture.png deleted file mode 100644 index de2a60c068..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv06plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv06plus_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv06plus_buildplate_texture.svg new file mode 100644 index 0000000000..084094d1ae --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv06plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv07_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv07_buildplate_texture.png deleted file mode 100644 index bef64231af..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv07_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv07_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv07_buildplate_texture.svg new file mode 100644 index 0000000000..aa68a3655a --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv07_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv07plus_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv07plus_buildplate_texture.png deleted file mode 100644 index bef64231af..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv07plus_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv07plus_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv07plus_buildplate_texture.svg new file mode 100644 index 0000000000..a1beed0295 --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv07plus_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv08_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv08_buildplate_texture.png deleted file mode 100644 index 69290b6069..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv08_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv08_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv08_buildplate_texture.svg new file mode 100644 index 0000000000..f79b42002d --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv08_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.png b/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.png deleted file mode 100644 index c178195877..0000000000 Binary files a/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.svg b/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.svg new file mode 100644 index 0000000000..2a610e9f74 --- /dev/null +++ b/resources/profiles/Sovol/sovol_sv08_max_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Sovol/sovol_zero_buildplate_texture.png b/resources/profiles/Sovol/sovol_zero_buildplate_texture.png deleted file mode 100644 index bde52447da..0000000000 Binary files a/resources/profiles/Sovol/sovol_zero_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Sovol/sovol_zero_buildplate_texture.svg b/resources/profiles/Sovol/sovol_zero_buildplate_texture.svg new file mode 100644 index 0000000000..0e2b7acac3 --- /dev/null +++ b/resources/profiles/Sovol/sovol_zero_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Tronxy.json b/resources/profiles/Tronxy.json index 5151078b22..9f7f49d3a6 100644 --- a/resources/profiles/Tronxy.json +++ b/resources/profiles/Tronxy.json @@ -1,6 +1,6 @@ { "name": "Tronxy", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Tronxy configurations", "machine_model_list": [ diff --git a/resources/profiles/Tronxy/Tronxy X5SA 400 Marlin Firmware_cover.png b/resources/profiles/Tronxy/Tronxy X5SA 400 Marlin Firmware_cover.png index 6cddf4612b..e3fa0d33ef 100644 Binary files a/resources/profiles/Tronxy/Tronxy X5SA 400 Marlin Firmware_cover.png and b/resources/profiles/Tronxy/Tronxy X5SA 400 Marlin Firmware_cover.png differ diff --git a/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json b/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json index 1491c476d1..1f6b98679f 100644 --- a/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json +++ b/resources/profiles/Tronxy/machine/Tronxy X5SA 400 Marlin Firmware.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "TronxyDesign", "bed_model": "", - "bed_texture": "tronxy_logo.png", + "bed_texture": "tronxy_logo.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" } diff --git a/resources/profiles/Tronxy/tronxy_logo.png b/resources/profiles/Tronxy/tronxy_logo.png deleted file mode 100644 index 2e07fd818f..0000000000 Binary files a/resources/profiles/Tronxy/tronxy_logo.png and /dev/null differ diff --git a/resources/profiles/Tronxy/tronxy_logo.svg b/resources/profiles/Tronxy/tronxy_logo.svg new file mode 100644 index 0000000000..adaf21bb52 --- /dev/null +++ b/resources/profiles/Tronxy/tronxy_logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Tronxy/tronxy_v0_logo.png b/resources/profiles/Tronxy/tronxy_v0_logo.png deleted file mode 100644 index 090fefa01a..0000000000 Binary files a/resources/profiles/Tronxy/tronxy_v0_logo.png and /dev/null differ diff --git a/resources/profiles/Voron/voron_logo.svg b/resources/profiles/Voron/voron_logo.svg index a8d6d69f1f..83dc1393bb 100644 --- a/resources/profiles/Voron/voron_logo.svg +++ b/resources/profiles/Voron/voron_logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Voron/voron_switchwire_logo.svg b/resources/profiles/Voron/voron_switchwire_logo.svg index 18774fd21e..e3ccf27994 100644 --- a/resources/profiles/Voron/voron_switchwire_logo.svg +++ b/resources/profiles/Voron/voron_switchwire_logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Voxelab.json b/resources/profiles/Voxelab.json index 1a31ca5a9e..0bf0ff33df 100644 --- a/resources/profiles/Voxelab.json +++ b/resources/profiles/Voxelab.json @@ -1,7 +1,7 @@ { "name": "Voxelab", "url": "", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Voxelab configurations", "machine_model_list": [ diff --git a/resources/profiles/Voxelab/Voxelab Aquila X2_cover.png b/resources/profiles/Voxelab/Voxelab Aquila X2_cover.png index 19810fc647..2643e20442 100644 Binary files a/resources/profiles/Voxelab/Voxelab Aquila X2_cover.png and b/resources/profiles/Voxelab/Voxelab Aquila X2_cover.png differ diff --git a/resources/profiles/Voxelab/machine/Voxelab Aquila X2.json b/resources/profiles/Voxelab/machine/Voxelab Aquila X2.json index 54aa932ccf..1c84c4611f 100644 --- a/resources/profiles/Voxelab/machine/Voxelab Aquila X2.json +++ b/resources/profiles/Voxelab/machine/Voxelab Aquila X2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Voxelab", "bed_model": "voxelab_aquilax2_buildplate_model.stl", - "bed_texture": "voxelab_aquilax2_buildplate_texture.png", + "bed_texture": "voxelab_aquilax2_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Voxelab/voxelab_aquilax2_buildplate_texture.png b/resources/profiles/Voxelab/voxelab_aquilax2_buildplate_texture.png deleted file mode 100644 index 091ab56946..0000000000 Binary files a/resources/profiles/Voxelab/voxelab_aquilax2_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Voxelab/voxelab_aquilax2_buildplate_texture.svg b/resources/profiles/Voxelab/voxelab_aquilax2_buildplate_texture.svg new file mode 100644 index 0000000000..362f01df71 --- /dev/null +++ b/resources/profiles/Voxelab/voxelab_aquilax2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Vzbot/VzBot_PS_bed_235.svg b/resources/profiles/Vzbot/VzBot_PS_bed_235.svg index 483b77d151..deefe79cad 100644 --- a/resources/profiles/Vzbot/VzBot_PS_bed_235.svg +++ b/resources/profiles/Vzbot/VzBot_PS_bed_235.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Vzbot/VzBot_PS_bed_330.svg b/resources/profiles/Vzbot/VzBot_PS_bed_330.svg index a50f1b8f2e..4a2ea2dd2a 100644 --- a/resources/profiles/Vzbot/VzBot_PS_bed_330.svg +++ b/resources/profiles/Vzbot/VzBot_PS_bed_330.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/WEMAKE3D.json b/resources/profiles/WEMAKE3D.json index 0e38a52521..a265934921 100644 --- a/resources/profiles/WEMAKE3D.json +++ b/resources/profiles/WEMAKE3D.json @@ -1,6 +1,6 @@ { "name": "WEMAKE3D", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "WEMAKE3D configurations", "machine_model_list": [ diff --git a/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_model.stl b/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_model.stl index 2801809141..82aec3f42d 100644 Binary files a/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_model.stl and b/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_model.stl differ diff --git a/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_texture.png b/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_texture.png deleted file mode 100644 index 96e9f69a3f..0000000000 Binary files a/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_texture.svg b/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_texture.svg new file mode 100644 index 0000000000..5a23488a0a --- /dev/null +++ b/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_cover.png b/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_cover.png index 231757cc16..88f55aebd5 100644 Binary files a/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_cover.png and b/resources/profiles/WEMAKE3D/WEMAKE3D PhoenixProV1_cover.png differ diff --git a/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_model.stl b/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_model.stl index 6a89c4f640..1309cb9149 100644 Binary files a/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_model.stl and b/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_model.stl differ diff --git a/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_texture.png b/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_texture.png deleted file mode 100644 index b8fbb2b82d..0000000000 Binary files a/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_texture.svg b/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_texture.svg new file mode 100644 index 0000000000..d501f8eadb --- /dev/null +++ b/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_cover.png b/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_cover.png index a33152fab9..a60bd0610e 100644 Binary files a/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_cover.png and b/resources/profiles/WEMAKE3D/WEMAKE3D TinyBotV1_cover.png differ diff --git a/resources/profiles/WEMAKE3D/machine/WEMAKE3D PhoenixProV1.json b/resources/profiles/WEMAKE3D/machine/WEMAKE3D PhoenixProV1.json index 9e1aed68b7..7b07ee5745 100644 --- a/resources/profiles/WEMAKE3D/machine/WEMAKE3D PhoenixProV1.json +++ b/resources/profiles/WEMAKE3D/machine/WEMAKE3D PhoenixProV1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "WEMAKE3D", "bed_model": "WEMAKE3D PhoenixProV1_buildplate_model.stl", - "bed_texture": "WEMAKE3D PhoenixProV1_buildplate_texture.png", + "bed_texture": "WEMAKE3D PhoenixProV1_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/WEMAKE3D/machine/WEMAKE3D TinyBotV1.json b/resources/profiles/WEMAKE3D/machine/WEMAKE3D TinyBotV1.json index 3a2123454a..8d6a6ece4d 100644 --- a/resources/profiles/WEMAKE3D/machine/WEMAKE3D TinyBotV1.json +++ b/resources/profiles/WEMAKE3D/machine/WEMAKE3D TinyBotV1.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "WEMAKE3D", "bed_model": "WEMAKE3D TinyBotV1_buildplate_model.stl", - "bed_texture": "WEMAKE3D TinyBotV1_buildplate_texture.png", + "bed_texture": "WEMAKE3D TinyBotV1_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PETG @System;Generic PLA @System" } diff --git a/resources/profiles/Wanhao.json b/resources/profiles/Wanhao.json index 0d2008b9a5..8babf55f20 100644 --- a/resources/profiles/Wanhao.json +++ b/resources/profiles/Wanhao.json @@ -1,6 +1,6 @@ { "name": "Wanhao", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "0", "description": "Wanhao configurations", "machine_model_list": [ diff --git a/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_model.stl b/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_model.stl new file mode 100644 index 0000000000..b6896ccc57 Binary files /dev/null and b/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_model.stl differ diff --git a/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_texture.png b/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_texture.png deleted file mode 100644 index 7e4e305ab7..0000000000 Binary files a/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_texture.svg b/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_texture.svg new file mode 100644 index 0000000000..4618bf1935 --- /dev/null +++ b/resources/profiles/Wanhao/Wanhao_D12-300_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Wanhao/machine/Wanhao D12-300.json b/resources/profiles/Wanhao/machine/Wanhao D12-300.json index 51164a2ac6..90d7328feb 100644 --- a/resources/profiles/Wanhao/machine/Wanhao D12-300.json +++ b/resources/profiles/Wanhao/machine/Wanhao D12-300.json @@ -6,8 +6,8 @@ "nozzle_diameter": "0.4", "machine_tech": "FFF", "family": "Wanhao", - "bed_model": "", - "bed_texture": "Wanhao_D12-300_buildplate_texture.png", + "bed_model": "Wanhao_D12-300_buildplate_model.stl", + "bed_texture": "Wanhao_D12-300_buildplate_texture.svg", "hotend_model": "Wanhao D12-300_hotend.stl", "default_materials": "Generic PLA @System;Generic PETG @System;Generic TPU @System;" } diff --git a/resources/profiles/WonderMaker/wm_buildplate_model.stl b/resources/profiles/WonderMaker/wm_buildplate_model.stl index 9c5497b190..bcefefdad8 100755 Binary files a/resources/profiles/WonderMaker/wm_buildplate_model.stl and b/resources/profiles/WonderMaker/wm_buildplate_model.stl differ diff --git a/resources/profiles/Z-Bolt.json b/resources/profiles/Z-Bolt.json index b403d480a3..75292a6d8d 100644 --- a/resources/profiles/Z-Bolt.json +++ b/resources/profiles/Z-Bolt.json @@ -1,7 +1,7 @@ { "name": "Z-Bolt", "url": "", - "version": "02.03.02.50", + "version": "02.03.02.70", "force_update": "0", "description": "Z-Bolt configurations", "machine_model_list": [ diff --git a/resources/profiles/Z-Bolt/Z-Bolt_buildplate_texture.png b/resources/profiles/Z-Bolt/Z-Bolt_buildplate_texture.png deleted file mode 100644 index d2db60c6c3..0000000000 Binary files a/resources/profiles/Z-Bolt/Z-Bolt_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Z-Bolt/Z-Bolt_buildplate_texture.svg b/resources/profiles/Z-Bolt/Z-Bolt_buildplate_texture.svg new file mode 100644 index 0000000000..9b7fc4dab8 --- /dev/null +++ b/resources/profiles/Z-Bolt/Z-Bolt_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual.json index a03f2bdd54..261e2c0ae6 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S1000_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt", "thumbnails": "144x144/PNG,900x900/PNG", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000.json index 47d8e12e29..b56abc143c 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S1000_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt", "thumbnails": "144x144/PNG,900x900/PNG", diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual.json index 786c25384c..74fa3d418a 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S300_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300.json index 5327dc72a4..3eeabf1506 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S300_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual.json index 1e238efd52..f5624b982c 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S400_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400.json index fe896a426d..682aed2e71 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S400_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual.json index f1aa3ea6ad..21681ee61f 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S600_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600.json index 404b443746..1d533080ea 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S600_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual.json index ac024b6edd..1e307832a5 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Z-Bolt", "bed_model": "Z-Bolt_S800_buildplate_model.stl", - "bed_texture": "Z-Bolt_buildplate_texture.png", + "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt", "thumbnails": "144x144/PNG,900x900/PNG", diff --git a/resources/profiles/iQ.json b/resources/profiles/iQ.json index ae1d362031..c0b2570558 100644 --- a/resources/profiles/iQ.json +++ b/resources/profiles/iQ.json @@ -1,6 +1,6 @@ { "name": "innovatiQ", - "version": "02.03.02.60", + "version": "02.03.02.70", "force_update": "1", "description": "innovatiQ configuration", "machine_model_list": [ diff --git a/resources/profiles/iQ/TiQ2_texture.png b/resources/profiles/iQ/TiQ2_texture.png deleted file mode 100644 index 6881e88959..0000000000 Binary files a/resources/profiles/iQ/TiQ2_texture.png and /dev/null differ diff --git a/resources/profiles/iQ/TiQ2_texture.svg b/resources/profiles/iQ/TiQ2_texture.svg new file mode 100644 index 0000000000..eb4c36c68d --- /dev/null +++ b/resources/profiles/iQ/TiQ2_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/iQ/TiQ8_texture.png b/resources/profiles/iQ/TiQ8_texture.png deleted file mode 100644 index 2a45ad00c7..0000000000 Binary files a/resources/profiles/iQ/TiQ8_texture.png and /dev/null differ diff --git a/resources/profiles/iQ/TiQ8_texture.svg b/resources/profiles/iQ/TiQ8_texture.svg new file mode 100644 index 0000000000..e54cfe4323 --- /dev/null +++ b/resources/profiles/iQ/TiQ8_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/iQ/machine/TiQ2.json b/resources/profiles/iQ/machine/TiQ2.json index 405fef0fbe..36c04edf6e 100644 --- a/resources/profiles/iQ/machine/TiQ2.json +++ b/resources/profiles/iQ/machine/TiQ2.json @@ -6,6 +6,6 @@ "machine_tech": "FFF", "family": "TiQ", "bed_model": "TiQ2.stl", - "bed_texture": "TiQ2_texture.png", + "bed_texture": "TiQ2_texture.svg", "default_materials": "Fiberthree PACF Pro P1 @iQ TiQ2 0.4 Nozzle" } diff --git a/resources/profiles/iQ/machine/TiQ8.json b/resources/profiles/iQ/machine/TiQ8.json index 4f1e671702..21d9c23413 100644 --- a/resources/profiles/iQ/machine/TiQ8.json +++ b/resources/profiles/iQ/machine/TiQ8.json @@ -6,6 +6,6 @@ "machine_tech": "FFF", "family": "TiQ", "bed_model": "TiQ8.stl", - "bed_texture": "TiQ8_texture.png", + "bed_texture": "TiQ8_texture.svg", "default_materials": "Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle" } diff --git a/resources/profiles/re3D.json b/resources/profiles/re3D.json index 46194fbfd3..6cc1e1ae87 100644 --- a/resources/profiles/re3D.json +++ b/resources/profiles/re3D.json @@ -1,6 +1,6 @@ { "name": "re3D", - "version": "02.01.01.00", + "version": "02.01.01.10", "force_update": "0", "description": "re3D configurations", "machine_model_list": [ diff --git a/resources/profiles/re3D/GB-HOTEND.stl b/resources/profiles/re3D/GB-HOTEND.stl index b312be0938..8ddadfd923 100644 Binary files a/resources/profiles/re3D/GB-HOTEND.stl and b/resources/profiles/re3D/GB-HOTEND.stl differ diff --git a/resources/profiles/re3D/GBX-HOTEND-COVER.stl b/resources/profiles/re3D/GBX-HOTEND-COVER.stl deleted file mode 100644 index def9eb4570..0000000000 Binary files a/resources/profiles/re3D/GBX-HOTEND-COVER.stl and /dev/null differ diff --git a/resources/profiles/re3D/GBX-HOTEND-COVERED.STL b/resources/profiles/re3D/GBX-HOTEND-COVERED.STL deleted file mode 100644 index 1405598c40..0000000000 Binary files a/resources/profiles/re3D/GBX-HOTEND-COVERED.STL and /dev/null differ diff --git a/resources/profiles/re3D/GBX-HOTEND-NOZZLE.stl b/resources/profiles/re3D/GBX-HOTEND-NOZZLE.stl deleted file mode 100644 index 3518924955..0000000000 Binary files a/resources/profiles/re3D/GBX-HOTEND-NOZZLE.stl and /dev/null differ diff --git a/resources/profiles/re3D/GBX-HOTEND.stl b/resources/profiles/re3D/GBX-HOTEND.stl index 5d1ab7c9ce..9e24cf718d 100644 Binary files a/resources/profiles/re3D/GBX-HOTEND.stl and b/resources/profiles/re3D/GBX-HOTEND.stl differ diff --git a/resources/profiles/re3D/Gigabot 4_buildplate_texture.png b/resources/profiles/re3D/Gigabot 4_buildplate_texture.png deleted file mode 100644 index f4affabe58..0000000000 Binary files a/resources/profiles/re3D/Gigabot 4_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json index 7e5d535623..f14de38eb2 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "re3D", "bed_model": "", - "bed_texture": "Gigabot 4_buildplate_texture.png", + "bed_texture": "re3D Gigabot 4 XLT_buildplate_texture.svg", "hotend_model": "GB-HOTEND.stl", "default_materials": "re3D PLA;re3D PETG;re3D PC;" } diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4.json b/resources/profiles/re3D/machine/re3D Gigabot 4.json index 420119fc27..53abd9b459 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "re3D", "bed_model": "", - "bed_texture": "Gigabot 4_buildplate_texture.png", + "bed_texture": "re3D Gigabot 4_buildplate_texture.svg", "hotend_model": "GB-HOTEND.stl", "default_materials": "re3D PLA;re3D PETG;re3D PC;" } diff --git a/resources/profiles/re3D/machine/re3D Gigabot X2 XLT.json b/resources/profiles/re3D/machine/re3D Gigabot X2 XLT.json index bb0324f427..c208bb1ab1 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot X2 XLT.json +++ b/resources/profiles/re3D/machine/re3D Gigabot X2 XLT.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "re3D", "bed_model": "", - "bed_texture": "Gigabot 4_buildplate_texture.png", + "bed_texture": "re3D Gigabot X2 XLT_buildplate_texture.svg", "hotend_model": "GBX-HOTEND.stl", "default_materials": "re3D rPP;re3D Greengate rPETG;" } diff --git a/resources/profiles/re3D/machine/re3D Gigabot X2.json b/resources/profiles/re3D/machine/re3D Gigabot X2.json index 53a5cd810c..d21307184a 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot X2.json +++ b/resources/profiles/re3D/machine/re3D Gigabot X2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "re3D", "bed_model": "", - "bed_texture": "Gigabot 4_buildplate_texture.png", - "hotend_model": "GBX-HOTEND-NOZZLE.stl", + "bed_texture": "re3D Gigabot X2_buildplate_texture.svg", + "hotend_model": "GBX-HOTEND.stl", "default_materials": "re3D rPP;re3D Greengate rPETG;" } diff --git a/resources/profiles/re3D/machine/re3D Terabot 4.json b/resources/profiles/re3D/machine/re3D Terabot 4.json index e9450b8a79..294a3bbf8b 100644 --- a/resources/profiles/re3D/machine/re3D Terabot 4.json +++ b/resources/profiles/re3D/machine/re3D Terabot 4.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "re3D", "bed_model": "", - "bed_texture": "Gigabot 4_buildplate_texture.png", + "bed_texture": "re3D Terabot 4_buildplate_texture.svg", "hotend_model": "GB-HOTEND.stl", "default_materials": "re3D PLA;re3D PETG;re3D PC;" } diff --git a/resources/profiles/re3D/machine/re3D Terabot X2.json b/resources/profiles/re3D/machine/re3D Terabot X2.json index 4490ea8a7e..6ae22cc2e1 100644 --- a/resources/profiles/re3D/machine/re3D Terabot X2.json +++ b/resources/profiles/re3D/machine/re3D Terabot X2.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "re3D", "bed_model": "", - "bed_texture": "Gigabot 4_buildplate_texture.png", + "bed_texture": "re3D Terabot X2_buildplate_texture.svg", "hotend_model": "GBX-HOTEND.stl", "default_materials": "re3D rPP;re3D Greengate rPETG;" } diff --git a/resources/profiles/re3D/re3D Gigabot 4 XLT_buildplate_texture.svg b/resources/profiles/re3D/re3D Gigabot 4 XLT_buildplate_texture.svg new file mode 100644 index 0000000000..c05d5387bf --- /dev/null +++ b/resources/profiles/re3D/re3D Gigabot 4 XLT_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/re3D/re3D Gigabot 4 XLT_cover.png b/resources/profiles/re3D/re3D Gigabot 4 XLT_cover.png index 4e2e58d890..3ae924b834 100644 Binary files a/resources/profiles/re3D/re3D Gigabot 4 XLT_cover.png and b/resources/profiles/re3D/re3D Gigabot 4 XLT_cover.png differ diff --git a/resources/profiles/re3D/re3D Gigabot 4_buildplate_texture.svg b/resources/profiles/re3D/re3D Gigabot 4_buildplate_texture.svg new file mode 100644 index 0000000000..002115ed22 --- /dev/null +++ b/resources/profiles/re3D/re3D Gigabot 4_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/re3D/re3D Gigabot 4_cover.png b/resources/profiles/re3D/re3D Gigabot 4_cover.png index 59eb8b3657..bf6b83c108 100644 Binary files a/resources/profiles/re3D/re3D Gigabot 4_cover.png and b/resources/profiles/re3D/re3D Gigabot 4_cover.png differ diff --git a/resources/profiles/re3D/re3D Gigabot X2 XLT_buildplate_texture.svg b/resources/profiles/re3D/re3D Gigabot X2 XLT_buildplate_texture.svg new file mode 100644 index 0000000000..88b7a52f2b --- /dev/null +++ b/resources/profiles/re3D/re3D Gigabot X2 XLT_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/re3D/re3D Gigabot X2 XLT_cover.png b/resources/profiles/re3D/re3D Gigabot X2 XLT_cover.png index b7a3f5853a..20353de0d8 100644 Binary files a/resources/profiles/re3D/re3D Gigabot X2 XLT_cover.png and b/resources/profiles/re3D/re3D Gigabot X2 XLT_cover.png differ diff --git a/resources/profiles/re3D/re3D Gigabot X2_buildplate_texture.svg b/resources/profiles/re3D/re3D Gigabot X2_buildplate_texture.svg new file mode 100644 index 0000000000..a66159804d --- /dev/null +++ b/resources/profiles/re3D/re3D Gigabot X2_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/re3D/re3D Gigabot X2_cover.png b/resources/profiles/re3D/re3D Gigabot X2_cover.png index d2a433ff9a..6f9f0fa8e8 100644 Binary files a/resources/profiles/re3D/re3D Gigabot X2_cover.png and b/resources/profiles/re3D/re3D Gigabot X2_cover.png differ diff --git a/resources/profiles/re3D/re3D Terabot 4_buildplate_texture.svg b/resources/profiles/re3D/re3D Terabot 4_buildplate_texture.svg new file mode 100644 index 0000000000..4710e83645 --- /dev/null +++ b/resources/profiles/re3D/re3D Terabot 4_buildplate_texture.svg @@ -0,0 +1 @@ +Terabot 4 915x915 \ No newline at end of file diff --git a/resources/profiles/re3D/re3D Terabot 4_cover.png b/resources/profiles/re3D/re3D Terabot 4_cover.png index 671f34359c..160d118e7f 100644 Binary files a/resources/profiles/re3D/re3D Terabot 4_cover.png and b/resources/profiles/re3D/re3D Terabot 4_cover.png differ diff --git a/resources/profiles/re3D/re3D Terabot X2_buildplate_texture.svg b/resources/profiles/re3D/re3D Terabot X2_buildplate_texture.svg new file mode 100644 index 0000000000..c94adcfa3e --- /dev/null +++ b/resources/profiles/re3D/re3D Terabot X2_buildplate_texture.svg @@ -0,0 +1 @@ +Terabot X2 879x908 \ No newline at end of file diff --git a/resources/profiles/re3D/re3D Terabot X2_cover.png b/resources/profiles/re3D/re3D Terabot X2_cover.png index 2f80773248..374d4fa185 100644 Binary files a/resources/profiles/re3D/re3D Terabot X2_cover.png and b/resources/profiles/re3D/re3D Terabot X2_cover.png differ diff --git a/src/libslic3r/Arachne/WallToolPaths.cpp b/src/libslic3r/Arachne/WallToolPaths.cpp index d875b04486..0a59619560 100644 --- a/src/libslic3r/Arachne/WallToolPaths.cpp +++ b/src/libslic3r/Arachne/WallToolPaths.cpp @@ -54,6 +54,12 @@ WallToolPathsParams make_paths_params(const int layer_id, const PrintObjectConfi input_params.wall_distribution_count = print_object_config.wall_distribution_count.value; input_params.is_top_or_bottom_layer = false; // Set to default value + + if (const auto& wall_maximum_resolution_opt = print_object_config.wall_maximum_resolution) + input_params.wall_maximum_resolution = scaled(wall_maximum_resolution_opt.value); + + if (const auto& wall_maximum_deviation_opt = print_object_config.wall_maximum_deviation) + input_params.wall_maximum_deviation = scaled(wall_maximum_deviation_opt.value); } return input_params; @@ -125,7 +131,11 @@ void simplify(Polygon &thiss, const int64_t smallest_line_segment_squared, const accumulated_area_removed += removed_area_next; const int64_t length2 = (current - previous).cast().squaredNorm(); - if (length2 < scaled(25.)) { + + // Orca: + // Checking if the segment's length is smaller than 5 microns (0.005mm). + // The value of `length2` is scaled and squared, so we need to compare it with the squared value of 5 microns + if (length2 < Slic3r::sqr(scaled(0.005))) { // We're allowed to always delete segments of less than 5 micron. continue; } @@ -143,6 +153,7 @@ void simplify(Polygon &thiss, const int64_t smallest_line_segment_squared, const //h^2 = (L / b)^2 [square it] //h^2 = L^2 / b^2 [factor the divisor] const int64_t height_2 = double(area_removed_so_far) * double(area_removed_so_far) / double(base_length_2); + // Orca: The value of `height_2` is squared, so we need to compare it with the squared value if ((height_2 <= Slic3r::sqr(scaled(0.005)) //Almost exactly colinear (barring rounding errors). && Line::distance_to_infinite(current, previous, next) <= scaled(0.005))) // make sure that height_2 is not small because of cancellation of positive and negative areas continue; @@ -473,8 +484,8 @@ const std::vector &WallToolPaths::generate() if (this->inset_count < 1) return toolpaths; - const coord_t smallest_segment = Slic3r::Arachne::meshfix_maximum_resolution(); - const coord_t allowed_distance = Slic3r::Arachne::meshfix_maximum_deviation(); + const coord_t smallest_segment = m_params.wall_maximum_resolution; + const coord_t allowed_distance = m_params.wall_maximum_deviation; const coord_t epsilon_offset = (allowed_distance / 2) - 1; const double transitioning_angle = Geometry::deg2rad(m_params.wall_transition_angle); const coord_t discretization_step_size = scaled(0.8); @@ -547,7 +558,7 @@ const std::vector &WallToolPaths::generate() separateOutInnerContour(); - simplifyToolPaths(toolpaths); + simplifyToolPaths(toolpaths, m_params); removeEmptyToolPaths(toolpaths); assert(std::is_sorted(toolpaths.cbegin(), toolpaths.cend(), @@ -688,16 +699,21 @@ void WallToolPaths::removeSmallLines(std::vector &toolpaths) } } -void WallToolPaths::simplifyToolPaths(std::vector &toolpaths) +void WallToolPaths::simplifyToolPaths(std::vector& toolpaths, const WallToolPathsParams& params) { - for (size_t toolpaths_idx = 0; toolpaths_idx < toolpaths.size(); ++toolpaths_idx) + const int64_t maximum_resolution = params.wall_maximum_resolution; + const int64_t maximum_deviation = params.wall_maximum_deviation; + + const int64_t smallest_line_segment_squared = maximum_resolution * maximum_resolution; + const int64_t allowed_error_distance_squared = maximum_deviation * maximum_deviation; + + const int64_t maximum_extrusion_area_deviation = Slic3r::Arachne::meshfix_maximum_extrusion_area_deviation(); // unit: μm² + + for (VariableWidthLines& lines : toolpaths) { - const int64_t maximum_resolution = Slic3r::Arachne::meshfix_maximum_resolution(); - const int64_t maximum_deviation = Slic3r::Arachne::meshfix_maximum_deviation(); - const int64_t maximum_extrusion_area_deviation = Slic3r::Arachne::meshfix_maximum_extrusion_area_deviation(); // unit: μm² - for (auto& line : toolpaths[toolpaths_idx]) + for (ExtrusionLine& line : lines) { - line.simplify(maximum_resolution * maximum_resolution, maximum_deviation * maximum_deviation, maximum_extrusion_area_deviation); + line.simplify(smallest_line_segment_squared, allowed_error_distance_squared, maximum_extrusion_area_deviation); } } } diff --git a/src/libslic3r/Arachne/WallToolPaths.hpp b/src/libslic3r/Arachne/WallToolPaths.hpp index 457f7e7149..dde3dc785f 100644 --- a/src/libslic3r/Arachne/WallToolPaths.hpp +++ b/src/libslic3r/Arachne/WallToolPaths.hpp @@ -15,7 +15,7 @@ namespace Slic3r::Arachne { -constexpr bool fill_outline_gaps = true; +constexpr bool fill_outline_gaps = true; inline coord_t meshfix_maximum_resolution() { return scaled(0.5); } inline coord_t meshfix_maximum_deviation() { return scaled(0.025); } inline coord_t meshfix_maximum_extrusion_area_deviation() { return scaled(2.); } @@ -31,6 +31,9 @@ public: float wall_transition_filter_deviation; int wall_distribution_count; bool is_top_or_bottom_layer; + + coord_t wall_maximum_resolution = meshfix_maximum_resolution(); + coord_t wall_maximum_deviation = meshfix_maximum_deviation(); }; WallToolPathsParams make_paths_params(const int layer_id, const PrintObjectConfig &print_object_config, const PrintConfig &print_config); @@ -116,10 +119,11 @@ protected: /*! * Simplifies the variable-width toolpaths by calling the simplify on every line in the toolpath using the provided * settings. - * \param settings The settings as provided by the user + * \param toolpaths The toolpaths vector to simplify + * \param params The settings as provided by the user * \return */ - static void simplifyToolPaths(std::vector &toolpaths); + static void simplifyToolPaths(std::vector& toolpaths, const WallToolPathsParams& params); private: const Polygons& outline; //().squaredNorm(); - if (length2 < scaled(0.025)) + + // Orca: + // Checking if the segment's length is smaller than 5 microns (0.005mm). + // The value of `length2` is scaled and squared, so we need to compare it with the squared value of 5 microns + if (length2 < Slic3r::sqr(scaled(0.005))) { // We're allowed to always delete segments of less than 5 micron. The width in this case doesn't matter that much. continue; @@ -128,8 +132,9 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const //h^2 = L^2 / b^2 [factor the divisor] const auto height_2 = int64_t(double(area_removed_so_far) * double(area_removed_so_far) / double(base_length_2)); const int64_t extrusion_area_error = calculateExtrusionAreaDeviationError(previous, current, next); - if ((height_2 <= scaled(0.001) //Almost exactly colinear (barring rounding errors). - && Line::distance_to_infinite(current.p, previous.p, next.p) <= scaled(0.001)) // Make sure that height_2 is not small because of cancellation of positive and negative areas + // Orca: The value of `height_2` is squared, so we need to compare it with the squared value + if ((height_2 <= Slic3r::sqr(scaled(0.005)) // Almost exactly colinear (barring rounding errors). + && Line::distance_to_infinite(current.p, previous.p, next.p) <= scaled(0.005)) // Make sure that height_2 is not small because of cancellation of positive and negative areas // We shouldn't remove middle junctions of colinear segments if the area changed for the C-P segment is exceeding the maximum allowed && extrusion_area_error <= maximum_extrusion_area_deviation) { diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp index 7c449f8107..a77946cc9b 100644 --- a/src/libslic3r/Config.hpp +++ b/src/libslic3r/Config.hpp @@ -199,6 +199,7 @@ enum ConfigOptionType { enum ConfigOptionMode { comSimple = 0, comAdvanced, + comExpert, comDevelop, }; diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index aecf658a14..f9ead17ed5 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -1320,7 +1320,14 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: params.density = f->print_object_config->internal_bridge_density.get_abs_value(1.0); params.dont_adjust = true; } - // BBS: make fill + // Orca: Elefant foot compensation for solid layers above bottommost by infill density manipulation. + float elefant_density = f->print_object_config->elefant_foot_layers_density.get_abs_value(1.0); + if (!is_approx(elefant_density, 1.0f) && surface_fill.surface.is_solid_infill()) { + size_t elefant_layers = f->print_object_config->elefant_foot_compensation_layers.value; + if (f->layer_id > 0 && f->layer_id <= elefant_layers) + params.density = elefant_density * (elefant_layers - (f->layer_id - 1)) / elefant_layers; + } + // make fill f->fill_surface_extrusion(&surface_fill.surface, params, m_regions[surface_fill.region_id]->fills.entities); diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 554a5c57b5..d56cbc339a 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -4629,8 +4629,7 @@ LayerResult GCode::process_layer( break; } case CalibMode::Calib_Temp_Tower: { - auto offset = static_cast(print_z / 10.001) * 5; - gcode += writer().set_temperature(print.calib_params().start - offset); + gcode += writer().set_temperature(this->interpolate_value_across_layers(static_cast(print.calib_params().start), static_cast(print.calib_params().end), 5.0f)); break; } case CalibMode::Calib_VFA_Tower: { @@ -7232,14 +7231,29 @@ std::string GCode::extrusion_role_to_string_for_parser(const ExtrusionRole & rol } } -// Calculate the interpolated value for the current layer between start_value and end_value -float GCode::interpolate_value_across_layers(float start_value, float end_value) const { - if (m_layer_index == 1) { +// Calculate the interpolated value for the current layer between start_value and end_value. +// Step will create equal layers steps from first to last value. +// Step = 0 means gradual interpolation finishing at last value. +float GCode::interpolate_value_across_layers(float start_value, float end_value, float step) const +{ + if (m_layer_index <= 1) { return start_value; - } else { - float ratio = (m_layer_index - 2.0f) / (m_layer_count - 3.0f); - ratio = std::max(0.0f, std::min(1.0f, ratio)); // clamp - return start_value + ratio * (end_value - start_value); + } + else { + bool use_steps = step > 0.f; + if (use_steps) { + if (start_value > end_value) { + start_value += step; + } else { + end_value += step; + } + } + float ratio = m_layer_index / (m_layer_count - 1.f); + float value = start_value + ratio * (end_value - start_value); + if (use_steps) { + value = trunc(value / step) * step; + } + return value; } } diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index 265fc12305..6eed2f0e5e 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -237,8 +237,10 @@ public: bool enable_cooling_markers() const { return m_enable_cooling_markers; } std::string extrusion_role_to_string_for_parser(const ExtrusionRole &); - // Calculate the interpolated value for the current layer between start_value and end_value - float interpolate_value_across_layers(float start_value, float end_value) const; + // Calculate the interpolated value for the current layer between start_value and end_value. + // Step will create equal layers steps from first to last value. + // Step = 0 means gradual interpolation finishing at last value. + float interpolate_value_across_layers(float start_value, float end_value, float step = 0.0f) const; // For Perl bindings, to be used exclusively by unit tests. unsigned int layer_count() const { return m_layer_count; } diff --git a/src/libslic3r/GCode/ConflictChecker.cpp b/src/libslic3r/GCode/ConflictChecker.cpp index e8780a818c..e8f533be7c 100644 --- a/src/libslic3r/GCode/ConflictChecker.cpp +++ b/src/libslic3r/GCode/ConflictChecker.cpp @@ -220,7 +220,13 @@ ConflictComputeOpt ConflictChecker::find_inter_of_lines(const LineWithIDs &lines ConflictResultOpt ConflictChecker::find_inter_of_lines_in_diff_objs(PrintObjectPtrs objs, std::optional wtdptr) // find the first intersection point of lines in different objects { - if (objs.size() <= 1 && !wtdptr) { return {}; } + if (objs.empty() && !wtdptr) { return {}; } + + // Orca: check if we have enough items to potentially conflict (instances count) + size_t total_instances = 0; + for (auto obj : objs) total_instances += obj->instances().size(); + if (total_instances <= 1 && !wtdptr) return {}; + LinesBucketQueue conflictQueue; if (wtdptr.has_value()) { // wipe tower at 0 by default @@ -238,8 +244,19 @@ ConflictResultOpt ConflictChecker::find_inter_of_lines_in_diff_objs(PrintObjectP } for (PrintObject *obj : objs) { auto layers = getAllLayersExtrusionPathsFromObject(obj); - conflictQueue.emplace_back_bucket(std::move(layers.perimeters), obj, obj->instances().front().shift); - conflictQueue.emplace_back_bucket(std::move(layers.support), obj, obj->instances().front().shift); + // Orca: check for collisions between all instances + const auto& instances = obj->instances(); + for (size_t inst_idx = 0; inst_idx < instances.size(); ++inst_idx) { + const PrintInstance& inst = instances[inst_idx]; + const bool is_last_instance = inst_idx + 1 == instances.size(); + if (is_last_instance) { + conflictQueue.emplace_back_bucket(std::move(layers.perimeters), &inst, inst.shift); + conflictQueue.emplace_back_bucket(std::move(layers.support), &inst, inst.shift); + } else { + conflictQueue.emplace_back_bucket(ExtrusionLayers(layers.perimeters), &inst, inst.shift); + conflictQueue.emplace_back_bucket(ExtrusionLayers(layers.support), &inst, inst.shift); + } + } } std::vector layersLines; @@ -272,13 +289,18 @@ ConflictResultOpt ConflictChecker::find_inter_of_lines_in_diff_objs(PrintObjectP const FakeWipeTower *wtdp = wtdptr.value(); if (ptr1 == wtdp || ptr2 == wtdp) { if (ptr2 == wtdp) { std::swap(ptr1, ptr2); } - const PrintObject *obj2 = reinterpret_cast(ptr2); - return std::make_optional("WipeTower", obj2->model_object()->name, conflictPrintZ, nullptr, ptr2); + // ptr1 is now wipe tower, ptr2 is PrintInstance* + const PrintInstance *inst2 = reinterpret_cast(ptr2); + const PrintObject *obj2 = inst2->print_object; + return std::make_optional("WipeTower", obj2->model_object()->name, conflictPrintZ, nullptr, inst2); } } - const PrintObject *obj1 = reinterpret_cast(ptr1); - const PrintObject *obj2 = reinterpret_cast(ptr2); - return std::make_optional(obj1->model_object()->name, obj2->model_object()->name, conflictPrintZ, ptr1, ptr2); + + const PrintInstance *inst1 = reinterpret_cast(ptr1); + const PrintInstance *inst2 = reinterpret_cast(ptr2); + const PrintObject *obj1 = inst1->print_object; + const PrintObject *obj2 = inst2->print_object; + return std::make_optional(obj1->model_object()->name, obj2->model_object()->name, conflictPrintZ, inst1, inst2); } else return {}; } diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp index 10ecfd8827..63e47f3f73 100644 --- a/src/libslic3r/GCode/FanMover.cpp +++ b/src/libslic3r/GCode/FanMover.cpp @@ -33,7 +33,11 @@ const std::string& FanMover::process_gcode(const std::string& gcode, bool flush) if (flush) { while (!m_buffer.empty()) { - m_process_output += m_buffer.front().raw + "\n"; + BufferData &front = m_buffer.front(); + m_process_output += front.raw + "\n"; + // Orca: Keep the emitted fan state in sync when flushing buffered fan commands. + if (front.fan_speed >= 0) + m_front_buffer_fan_speed = front.fan_speed; remove_from_buffer(m_buffer.begin()); } } diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp index 26b2660b87..e05b422353 100644 --- a/src/libslic3r/PerimeterGenerator.cpp +++ b/src/libslic3r/PerimeterGenerator.cpp @@ -1729,8 +1729,12 @@ void PerimeterGenerator::process_no_bridge(Surfaces& all_surfaces, coord_t perim //compute our unsupported surface ExPolygons unsupported = diff_ex(last, *this->lower_slices, ApplySafetyOffset::Yes); if (!unsupported.empty()) { - //remove small overhangs - ExPolygons unsupported_filtered = offset2_ex(unsupported, double(-perimeter_spacing), double(perimeter_spacing)); + // remove small overhangs (when using chbFilled we need to be less aggressive in removing small overhangs, + // to avoid affecting bridging detection.) + const int outset_divisor = this->config->counterbore_hole_bridging.value == chbFilled ? 2 : 1; + ExPolygons unsupported_filtered = offset2_ex(unsupported, double(-perimeter_spacing), + double(perimeter_spacing) / outset_divisor); + if (!unsupported_filtered.empty()) { //to_draw.insert(to_draw.end(), last.begin(), last.end()); //extract only the useful part of the lower layer. The safety offset is really needed here. @@ -1773,7 +1777,7 @@ void PerimeterGenerator::process_no_bridge(Surfaces& all_surfaces, coord_t perim } } unsupported_filtered = intersection_ex(last, - offset2_ex(unsupported_filtered, double(-perimeter_spacing / 2), double(bridged_infill_margin + perimeter_spacing / 2))); + offset_ex(unsupported_filtered, 0.5 * double(bridged_infill_margin))); if (this->config->counterbore_hole_bridging.value == chbFilled) { for (ExPolygon& expol : unsupported_filtered) { //check if the holes won't be covered by the upper layer @@ -1825,6 +1829,12 @@ void PerimeterGenerator::process_no_bridge(Surfaces& all_surfaces, coord_t perim } //TODO: add other polys as holes inside this one (-margin) } else if (/*this->config->counterbore_hole_bridging.value == chbBridgesOverhangs || */this->config->counterbore_hole_bridging.value == chbBridges) { + // Partially bridged counterbore handling should not rewrite generic bridge islands + // because by doing so regular bridges will lose their overhang-wall perimeters. + if (surface->expolygon.holes.empty()) { + unsupported_filtered.clear(); // "Partially bridged" only applies to hole-bearing bridge islands. + continue; + } //simplify to avoid most of artefacts from printing lines. ExPolygons bridgeable_simplified; for (ExPolygon& poly : bridgeable) { diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 501ec19d1f..d86e0fdcfc 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -925,7 +925,7 @@ static std::vector s_Preset_print_options { "outer_wall_line_width", "sparse_infill_line_width", "internal_solid_infill_line_width", "skin_infill_line_width","skeleton_infill_line_width", "top_surface_line_width", "support_line_width", "infill_wall_overlap","top_bottom_infill_wall_overlap", "bridge_flow", "internal_bridge_flow", - "elefant_foot_compensation", "elefant_foot_compensation_layers", "xy_contour_compensation", "xy_hole_compensation", "resolution", "enable_prime_tower", "prime_tower_enable_framework", + "elefant_foot_compensation", "elefant_foot_compensation_layers", "elefant_foot_layers_density", "xy_contour_compensation", "xy_hole_compensation", "resolution", "enable_prime_tower", "prime_tower_enable_framework", "prime_tower_width", "prime_tower_brim_width", "prime_tower_skip_points", "prime_volume", "prime_tower_infill_gap", "prime_tower_flat_ironing", @@ -940,8 +940,9 @@ static std::vector s_Preset_print_options { "support_bottom_interface_spacing", "enable_overhang_speed", "slowdown_for_curled_perimeters", "overhang_1_4_speed", "overhang_2_4_speed", "overhang_3_4_speed", "overhang_4_4_speed", "initial_layer_infill_speed", "only_one_wall_top", "timelapse_type", - "wall_generator", "wall_transition_length", "wall_transition_filter_deviation", "wall_transition_angle", - "wall_distribution_count", "min_feature_size", "min_bead_width", "post_process", "process_change_extrusion_role_gcode", "min_length_factor", + "wall_generator", "wall_transition_length", "wall_transition_filter_deviation", "wall_transition_angle", + "wall_distribution_count", "min_feature_size", "min_bead_width", "post_process", "process_change_extrusion_role_gcode", + "min_length_factor", "wall_maximum_resolution", "wall_maximum_deviation", "small_perimeter_speed", "small_perimeter_threshold","bridge_angle","internal_bridge_angle", "filter_out_gap_fill", "travel_acceleration","inner_wall_acceleration", "min_width_top_surface", "default_jerk", "outer_wall_jerk", "inner_wall_jerk", "infill_jerk", "top_surface_jerk", "initial_layer_jerk","travel_jerk","default_junction_deviation", "top_solid_infill_flow_ratio","bottom_solid_infill_flow_ratio","only_one_wall_first_layer", "print_flow_ratio", "seam_gap", diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 067795d27a..b23b912436 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -615,7 +615,6 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print std::for_each(exclude_polys.begin(), exclude_polys.end(), [&print_origin](Polygon& p) { p.translate(scale_(print_origin.x()), scale_(print_origin.y())); }); - std::map map_model_object_to_convex_hull; struct print_instance_info { const PrintInstance *print_instance; @@ -650,27 +649,13 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print for (const PrintObject *print_object : print.objects()) { assert(! print_object->model_object()->instances.empty()); assert(! print_object->instances().empty()); - ObjectID model_object_id = print_object->model_object()->id(); - auto it_convex_hull = map_model_object_to_convex_hull.find(model_object_id); - // Get convex hull of all printable volumes assigned to this print object. - ModelInstance *model_instance0 = print_object->model_object()->instances.front(); - if (it_convex_hull == map_model_object_to_convex_hull.end()) { - // Calculate the convex hull of a printable object. - // Grow convex hull with the clearance margin. - // FIXME: Arrangement has different parameters for offsetting (jtMiter, limit 2) - // which causes that the warning will be showed after arrangement with the - // appropriate object distance. Even if I set this to jtMiter the warning still shows up. - it_convex_hull = map_model_object_to_convex_hull.emplace_hint(it_convex_hull, model_object_id, - print_object->model_object()->convex_hull_2d(Geometry::assemble_transform( - { 0.0, 0.0, model_instance0->get_offset().z() }, model_instance0->get_rotation(), model_instance0->get_scaling_factor(), model_instance0->get_mirror()))); - } - // Make a copy, so it may be rotated for instances. - Polygon convex_hull0 = it_convex_hull->second; - const double z_diff = Geometry::rotation_diff_z(model_instance0->get_rotation(), print_object->instances().front().model_instance->get_rotation()); - if (std::abs(z_diff) > EPSILON) - convex_hull0.rotate(z_diff); + + // Orca: check convex hull intersection for each instance individually to handle rotation/offset differences correctly // Now we check that no instance of convex_hull intersects any of the previously checked object instances. for (const PrintInstance &instance : print_object->instances()) { + Polygon convex_hull0 = print_object->model_object()->convex_hull_2d(Geometry::assemble_transform( + { 0.0, 0.0, instance.model_instance->get_offset().z() }, instance.model_instance->get_rotation(), instance.model_instance->get_scaling_factor(), instance.model_instance->get_mirror())); + Polygon convex_hull_no_offset = convex_hull0, convex_hull; auto tmp = offset(convex_hull_no_offset, obj_distance, jtRound, scale_(0.1)); if (!tmp.empty()) { // tmp may be empty due to clipper's bug, see STUDIO-2452 @@ -684,7 +669,9 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print if (!intersection(exclude_polys, convex_hull_no_offset).empty()) { if (single_object_exception.string.empty()) { single_object_exception.string = (boost::format(L("%1% is too close to exclusion area, there may be collisions when printing.")) %instance.model_instance->get_object()->name).str(); - single_object_exception.object = instance.model_instance->get_object(); + // single_object_exception.object = instance.model_instance->get_object(); + //ORCA: Pass ModelInstance instead of ModelObject + single_object_exception.object = instance.model_instance; } else { single_object_exception.string += "\n"+(boost::format(L("%1% is too close to exclusion area, there may be collisions when printing.")) %instance.model_instance->get_object()->name).str(); @@ -701,12 +688,16 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print bool has_exception = false; if (single_object_exception.string.empty()) { single_object_exception.string = (boost::format(L("%1% is too close to others, and collisions may be caused.")) %instance.model_instance->get_object()->name).str(); - single_object_exception.object = instance.model_instance->get_object(); + // single_object_exception.object = instance.model_instance->get_object(); + //ORCA: Pass ModelInstance instead of ModelObject for better selection + single_object_exception.object = instance.model_instance; has_exception = true; } else { single_object_exception.string += "\n"+(boost::format(L("%1% is too close to others, and collisions may be caused.")) %instance.model_instance->get_object()->name).str(); - single_object_exception.object = nullptr; + // single_object_exception.object = nullptr; + // ORCA: Keep the first object so jump works + // has_exception = true; has_exception = true; } @@ -953,33 +944,52 @@ static StringObjectException layered_print_cleareance_valid(const Print &print, wrapping_poly.points.emplace_back(scale_(pt.x() + print_origin.x()), scale_(pt.y() + print_origin.y())); } - std::map map_model_volume_to_convex_hull; Polygons convex_hulls_other; + // Orca: check convex hull intersection for each instance individually for (auto& inst : print_instances_ordered) { + Polygons current_instance_hulls; for (const ModelVolume *v : inst->print_object->model_object()->volumes) { if (!v->is_model_part()) continue; - auto it_convex_hull = map_model_volume_to_convex_hull.find(v); - if (it_convex_hull == map_model_volume_to_convex_hull.end()) { - auto volume_hull = v->get_convex_hull_2d(Geometry::assemble_transform(Vec3d::Zero(), inst->model_instance->get_rotation(), - inst->model_instance->get_scaling_factor(), inst->model_instance->get_mirror())); - volume_hull.translate(inst->shift - inst->print_object->center_offset()); + + auto volume_hull = v->get_convex_hull_2d(Geometry::assemble_transform(Vec3d::Zero(), inst->model_instance->get_rotation(), + inst->model_instance->get_scaling_factor(), inst->model_instance->get_mirror())); + volume_hull.translate(inst->shift - inst->print_object->center_offset()); - it_convex_hull = map_model_volume_to_convex_hull.emplace_hint(it_convex_hull, v, volume_hull); - } - Polygon &convex_hull = it_convex_hull->second; - Polygons convex_hulls_temp; - convex_hulls_temp.push_back(convex_hull); - if (!intersection(exclude_polys, convex_hull).empty()) { + if (!intersection(exclude_polys, volume_hull).empty()) { + // return {inst->model_instance->get_object()->name + L(" is too close to exclusion area, there may be collisions when printing.") + "\n", + // inst->model_instance->get_object()}; + //ORCA: Pass ModelInstance instead of ModelObject return {inst->model_instance->get_object()->name + L(" is too close to exclusion area, there may be collisions when printing.") + "\n", - inst->model_instance->get_object()}; + inst->model_instance}; } - if (print_config.enable_wrapping_detection.value && !intersection(wrapping_poly, convex_hull).empty()) { + if (print_config.enable_wrapping_detection.value && !intersection(wrapping_poly, volume_hull).empty()) { + // return {inst->model_instance->get_object()->name + L(" is too close to clumping detection area, there may be collisions when printing.") + "\n", + // inst->model_instance->get_object()}; + //ORCA: Pass ModelInstance instead of ModelObject return {inst->model_instance->get_object()->name + L(" is too close to clumping detection area, there may be collisions when printing.") + "\n", - inst->model_instance->get_object()}; + inst->model_instance}; } - convex_hulls_other.emplace_back(convex_hull); + current_instance_hulls.emplace_back(volume_hull); } + + if (!intersection(convex_hulls_other, current_instance_hulls).empty()) { + if (warning) { + if (warning->string.empty()) { + warning->string = (boost::format(L("%1% is too close to others, and collisions may be caused.")) % inst->model_instance->get_object()->name).str(); + // warning->object = inst->model_instance->get_object(); + //ORCA: Pass ModelInstance instead of ModelObject for better selection + warning->object = inst->model_instance; + } else { + warning->string += "\n" + (boost::format(L("%1% is too close to others, and collisions may be caused.")) % inst->model_instance->get_object()->name).str(); + // ORCA: Keep the first object so jump works + if (!warning->object) warning->object = inst->model_instance; + } + warning->is_warning = true; + warning->type = STRING_EXCEPT_OBJECT_COLLISION_IN_LAYER_PRINT; + } + } + append(convex_hulls_other, current_instance_hulls); } //BBS: add the wipe tower check logic @@ -4931,6 +4941,25 @@ ExtrusionLayers FakeWipeTower::getTrueExtrusionLayersFromWipeTower() const { ExtrusionLayers wtels; wtels.type = ExtrusionLayersType::WIPE_TOWER; + + //ORCA: Fallback for WipeTower2 if outer_wall is empty + if (outer_wall.empty()) { + auto fake_paths = getFakeExtrusionPathsFromWipeTower2(); + float current_z = 0.f; + for (auto& layer_paths : fake_paths) { + if (layer_paths.empty()) continue; + ExtrusionLayer el; + float lh = layer_paths.front().height; + el.height = lh; + el.bottom_z = current_z; + el.layer = nullptr; + el.paths = std::move(layer_paths); + wtels.push_back(std::move(el)); + current_z += lh; + } + return wtels; + } + std::vector layer_heights; layer_heights.reserve(outer_wall.size()); auto pre = outer_wall.begin(); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index ec501e959c..6f39a9e094 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -714,6 +714,18 @@ void PrintConfigDef::init_common_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionInt(1)); + def = this->add("elefant_foot_layers_density", coPercent); + def->label = L("Elefant foot layers density"); + def->category = L("Quality"); + def->tooltip = L("Density of internal solid infill for elefant foot layers compensation. " + "The initial value for the second layer is set. " + "Subsequent layers become linearly denser by the height specified in elefant_foot_compensation_layers. "); + def->sidetext = "%"; + def->min = 50; + def->max = 100; + def->mode = comExpert; + def->set_default_value(new ConfigOptionPercent(100)); + def = this->add("layer_height", coFloat); def->label = L("Layer height"); def->category = L("Quality"); @@ -2602,7 +2614,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Number of cooling moves"); def->tooltip = L("Filament is cooled by being moved back and forth in the " "cooling tubes. Specify desired number of these moves."); - def->max = 0; + def->min = 0; def->max = 20; def->mode = comAdvanced; def->set_default_value(new ConfigOptionInts { 4 }); @@ -6915,6 +6927,29 @@ void PrintConfigDef::init_fff_params() def->max = 25.0; def->set_default_value(new ConfigOptionFloat(0.5)); + def = this->add("wall_maximum_resolution", coFloat); + def->label = L("Maximum wall resolution"); + def->category = L("Quality"); + def->tooltip = L("This value determines the smallest wall line segment length in mm. " + "The smaller you set this value, the more accurate and precise the walls will be."); + def->sidetext = L("mm"); // millimeters, CIS languages need translation + def->mode = comExpert; + def->min = 0.005; + def->max = 0.5f; + def->set_default_value(new ConfigOptionFloat(0.5f)); + + def = this->add("wall_maximum_deviation", coFloat); + def->label = L("Maximum wall deviation"); + def->category = L("Quality"); + def->tooltip = L("The maximum deviation allowed when reducing the resolution for the 'Maximum wall resolution' setting. If you increase this, " + "the print will be less accurate, but the G-Code will be smaller. 'Maximum wall deviation' limits 'Maximum wall resolution', " + "so if the two conflict, 'Maximum wall deviation' takes precedence."); + def->sidetext = L("mm"); // millimeters, CIS languages need translation + def->mode = comExpert; + def->min = 0.005f; + def->max = 0.05f; + def->set_default_value(new ConfigOptionFloat(0.025f)); + def = this->add("initial_layer_min_bead_width", coPercent); def->label = L("First layer minimum wall width"); def->category = L("Quality"); @@ -11063,8 +11098,32 @@ bool has_skirt(const DynamicPrintConfig& cfg) || (opt_draft_shield && opt_draft_shield->getInt() != dsDisabled); } float get_real_skirt_dist(const DynamicPrintConfig& cfg) { - return has_skirt(cfg) ? cfg.opt_float("skirt_distance") : 0; + if (!has_skirt(cfg)) return 0.f; + + float dist = cfg.opt_float("skirt_distance"); + + int loops = cfg.opt_int("skirt_loops"); + auto opt_draft_shield = cfg.option("draft_shield"); + if (opt_draft_shield && opt_draft_shield->getInt() != dsDisabled && loops == 0) { + loops = 1; + } + + float width = cfg.opt_float("initial_layer_line_width"); + if (width <= 0.f) { + width = cfg.opt_float("line_width"); + } + if (width <= 0.f) { + auto* nd = cfg.opt("nozzle_diameter"); + if (nd && !nd->values.empty()) { + width = *std::max_element(nd->values.begin(), nd->values.end()); + } else { + width = 0.4f; + } + } + + return dist + loops * width; } + static bool is_XL_printer(const std::string& printer_notes) { return boost::algorithm::contains(printer_notes, "PRINTER_VENDOR_PRUSA3D") diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 3783b90f28..0e90ab5ac6 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -918,6 +918,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBool, bridge_no_support)) ((ConfigOptionFloat, elefant_foot_compensation)) ((ConfigOptionInt, elefant_foot_compensation_layers)) + ((ConfigOptionPercent, elefant_foot_layers_density)) ((ConfigOptionFloat, max_bridge_length)) ((ConfigOptionFloatOrPercent, line_width)) // Force the generation of solid shells between adjacent materials/volumes. @@ -1016,6 +1017,8 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionPercent, min_bead_width)) // Orca + ((ConfigOptionFloat, wall_maximum_resolution)) + ((ConfigOptionFloat, wall_maximum_deviation)) ((ConfigOptionFloat, make_overhang_printable_angle)) ((ConfigOptionFloat, make_overhang_printable_hole_size)) ((ConfigOptionFloat, tree_support_branch_distance_organic)) diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 6a10d432af..a08a7d74b0 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -1092,6 +1092,7 @@ bool PrintObject::invalidate_state_by_config_options( } else if ( opt_key == "elefant_foot_compensation" || opt_key == "elefant_foot_compensation_layers" + || opt_key == "elefant_foot_layers_density" || opt_key == "support_top_z_distance" || opt_key == "support_bottom_z_distance" || opt_key == "xy_hole_compensation" @@ -1289,6 +1290,8 @@ bool PrintObject::invalidate_state_by_config_options( || opt_key == "wall_transition_filter_deviation" || opt_key == "wall_transition_angle" || opt_key == "wall_distribution_count" + || opt_key == "wall_maximum_resolution" + || opt_key == "wall_maximum_deviation" || opt_key == "min_feature_size" || opt_key == "min_length_factor" || opt_key == "min_bead_width") { diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 4936c65aca..0a67c841ec 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -721,7 +721,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co toggle_line("brim_ears_detection_length", have_brim_ear); // Hide Elephant foot compensation layers if elefant_foot_compensation is not enabled - toggle_line("elefant_foot_compensation_layers", config->opt_float("elefant_foot_compensation") > 0); + toggle_line("elefant_foot_compensation_layers", config->opt_float("elefant_foot_compensation") > 0 || config->option("elefant_foot_layers_density")->get_abs_value(1.0f) < 1.0f); bool have_raft = config->opt_int("raft_layers") > 0; bool have_support_material = config->opt_bool("enable_support") || have_raft; @@ -882,8 +882,8 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co toggle_line("fuzzy_skin_persistence", (fuzzy_skin_noise_type == NoiseType::Perlin || fuzzy_skin_noise_type == NoiseType::Billow) && has_fuzzy_skin); bool have_arachne = config->opt_enum("wall_generator") == PerimeterGeneratorType::Arachne; - for (auto el : {"wall_transition_length", "wall_transition_filter_deviation", "wall_transition_angle", - "min_feature_size", "min_length_factor", "min_bead_width", "wall_distribution_count", "initial_layer_min_bead_width"}) + for (auto el : {"wall_transition_length", "wall_transition_filter_deviation", "wall_transition_angle", "min_feature_size", "min_length_factor", + "min_bead_width", "wall_distribution_count", "initial_layer_min_bead_width", "wall_maximum_resolution", "wall_maximum_deviation"}) toggle_line(el, have_arachne); toggle_field("detect_thin_wall", !have_arachne); diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp index 957b2b9d0e..73f8041a28 100644 --- a/src/slic3r/GUI/FilamentMapDialog.cpp +++ b/src/slic3r/GUI/FilamentMapDialog.cpp @@ -2,6 +2,7 @@ #include "PartPlate.hpp" #include "Widgets/Button.hpp" #include "Widgets/DialogButtons.hpp" +#include "Widgets/Label.hpp" #include "I18N.hpp" #include "GUI_App.hpp" #include "CapsuleButton.hpp" diff --git a/src/slic3r/GUI/FilamentMapPanel.hpp b/src/slic3r/GUI/FilamentMapPanel.hpp index d2b6ea21d6..ad5cefa459 100644 --- a/src/slic3r/GUI/FilamentMapPanel.hpp +++ b/src/slic3r/GUI/FilamentMapPanel.hpp @@ -4,7 +4,8 @@ #include "GUI.hpp" #include "DragDropPanel.hpp" -#include "Widgets/SwitchButton.hpp" +#include "wxExtensions.hpp" +#include "Widgets/Label.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 927796619b..fddffb7e35 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1047,6 +1047,8 @@ wxDEFINE_EVENT(EVT_CUSTOMEVT_TICKSCHANGED, wxCommandEvent); wxDEFINE_EVENT(EVT_GLCANVAS_RESET_LAYER_HEIGHT_PROFILE, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_ADAPTIVE_LAYER_HEIGHT_PROFILE, Event); wxDEFINE_EVENT(EVT_GLCANVAS_SMOOTH_LAYER_HEIGHT_PROFILE, HeightProfileSmoothEvent); +wxDEFINE_EVENT(EVT_GLCANVAS_PRINTABLE, SimpleEvent); + const double GLCanvas3D::DefaultCameraZoomToBoxMarginFactor = 1.25; const double GLCanvas3D::DefaultCameraZoomToBedMarginFactor = 2.00; @@ -3497,6 +3499,8 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) // } // break; //} + case 'v': + case 'V': { post_event(SimpleEvent(EVT_GLCANVAS_PRINTABLE)); break; } default: { evt.Skip(); break; } } } @@ -9698,6 +9702,7 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state) std::string text; ErrorType error = ErrorType::PLATER_WARNING; const ModelObject* conflictObj=nullptr; + const ModelInstance* conflictInst=nullptr; switch (warning) { case EWarning::GCodeConflict: { static std::string prevConflictText; @@ -9708,12 +9713,17 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state) std::string objName2 = m_gcode_viewer.m_conflict_result.value()._objName2; double height = m_gcode_viewer.m_conflict_result.value()._height; int layer = m_gcode_viewer.m_conflict_result.value().layer; + const PrintInstance *inst2 = reinterpret_cast(m_gcode_viewer.m_conflict_result.value()._obj2); + text = (boost::format(_u8L("Conflicts of G-code paths have been found at layer %d, Z = %.2lfmm. Please separate the conflicted objects farther (%s <-> %s).")) % layer % height % objName1 % objName2) .str(); prevConflictText = text; - const PrintObject *obj2 = reinterpret_cast(m_gcode_viewer.m_conflict_result.value()._obj2); - conflictObj = obj2->model_object(); + + if (inst2) { + if (inst2->model_instance) conflictInst = inst2->model_instance; + else if (inst2->print_object) conflictObj = inst2->print_object->model_object(); + } break; } case EWarning::ObjectOutside: text = _u8L("An object is laid over the plate boundaries."); break; @@ -9961,8 +9971,13 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state) } break; case SLICING_SERIOUS_WARNING: - if (state) - notification_manager.push_slicing_serious_warning_notification(text, conflictObj ? std::vector{conflictObj} : std::vector{}); + if (state) { + if (conflictInst) { + notification_manager.push_slicing_serious_warning_notification(text, std::vector{conflictInst}); + } else { + notification_manager.push_slicing_serious_warning_notification(text, conflictObj ? std::vector{conflictObj} : std::vector{}); + } + } else notification_manager.close_slicing_serious_warning_notification(text); break; diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 21ee9bfac8..2224c3a8aa 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -195,6 +195,7 @@ wxDECLARE_EVENT(EVT_CUSTOMEVT_TICKSCHANGED, wxCommandEvent); wxDECLARE_EVENT(EVT_GLCANVAS_RESET_LAYER_HEIGHT_PROFILE, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_ADAPTIVE_LAYER_HEIGHT_PROFILE, Event); wxDECLARE_EVENT(EVT_GLCANVAS_SMOOTH_LAYER_HEIGHT_PROFILE, HeightProfileSmoothEvent); +wxDECLARE_EVENT(EVT_GLCANVAS_PRINTABLE, SimpleEvent); class GLCanvas3D { diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index c79826733e..6ae2bede8c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1005,11 +1005,13 @@ void GUI_App::post_init() CallAfter([this] { bool cw_showed = this->config_wizard_startup(); - std::string http_url = get_http_url(app_config->get_country_code()); - std::string language = GUI::into_u8(current_language_code()); - std::string network_ver = Slic3r::NetworkAgent::get_version(); - bool sys_preset = app_config->get("sync_system_preset") == "true"; - this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr); + if (!app_config->get_stealth_mode()) { + std::string http_url = get_http_url(app_config->get_country_code()); + std::string language = GUI::into_u8(current_language_code()); + std::string network_ver = Slic3r::NetworkAgent::get_version(); + bool sys_preset = app_config->get("sync_system_preset") == "true"; + this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr); + } this->check_new_version_sf(); if (is_user_login() && !app_config->get_stealth_mode()) { @@ -1814,7 +1816,7 @@ bool GUI_App::hot_reload_network_plugin() << ", m_agent = " << (m_agent ? "valid" : "null") << ", version = " << loaded_version; - if (success && m_agent && m_device_manager) { + if (success && m_agent && m_device_manager && !app_config->get_stealth_mode()) { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": connecting to cloud server"; m_agent->connect_server(); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": re-subscribing to cloud printers"; @@ -2500,7 +2502,7 @@ std::map GUI_App::get_extra_header() std::map extra_headers; extra_headers.insert(std::make_pair("X-BBL-Client-Type", "slicer")); extra_headers.insert(std::make_pair("X-BBL-Client-Name", SLIC3R_APP_NAME)); - extra_headers.insert(std::make_pair("X-BBL-Client-Version", VersionInfo::convert_full_version(SLIC3R_VERSION))); + extra_headers.insert(std::make_pair("X-BBL-Client-Version", get_bbl_client_version())); #if defined(__WINDOWS__) #ifdef _M_X64 extra_headers.insert(std::make_pair("X-BBL-OS-Type", "windows")); @@ -2522,6 +2524,16 @@ std::map GUI_App::get_extra_header() return extra_headers; } +std::string GUI_App::get_bbl_client_version() +{ + if (BBLNetworkPlugin::instance().get_get_my_token() == nullptr) { + // Legacy Bambu plugin lacks bambu_network_get_my_token. Pin client + // version so the auth server keeps using the ?access_token= redirect. + return "01.10.01.50"; + } + return VersionInfo::convert_full_version(SLIC3R_VERSION); +} + //BBS void GUI_App::init_http_extra_header() { @@ -4925,6 +4937,10 @@ void GUI_App::on_update_machine_list(wxCommandEvent &evt) void GUI_App::on_user_login_handle(wxCommandEvent &evt) { if (!m_agent) { return; } + if (app_config->get_stealth_mode()) { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": stealth mode enabled, skipping cloud connection"; + return; + } int online_login = evt.GetInt(); m_agent->connect_server(); @@ -5683,6 +5699,11 @@ void GUI_App::on_check_privacy_update(wxCommandEvent& evt) void GUI_App::check_privacy_version(int online_login) { + if (app_config->get_stealth_mode()) { + request_user_handle(online_login); + return; + } + update_http_extra_header(); std::string query_params = "?policy/privacy=00.00.00.00"; std::string url = get_http_url(app_config->get_country_code()) + query_params; @@ -6572,31 +6593,59 @@ Tab* GUI_App::get_layer_tab() return model_tabs_list[2]; } -ConfigOptionMode GUI_App::get_mode() +namespace +{ +ConfigOptionMode saved_mode_from_string(const std::string& mode) +{ + return mode == "expert" ? comExpert : + mode == "advanced" ? comAdvanced : + mode == "develop" ? comAdvanced : + comSimple; +} + +std::string saved_mode_to_string(ConfigOptionMode mode) +{ + return mode == comExpert ? "expert" : + mode == comAdvanced ? "advanced" : + "simple"; +} + +std::string effective_mode_to_string(ConfigOptionMode mode) +{ + return mode == comDevelop ? "develop" : saved_mode_to_string(mode); +} +} + +ConfigOptionMode GUI_App::get_saved_mode() { if (!app_config->has("user_mode")) return comSimple; - //BBS - const auto mode = app_config->get("user_mode"); - return mode == "advanced" ? comAdvanced : - mode == "simple" ? comSimple : - mode == "develop" ? comDevelop : comSimple; + + return saved_mode_from_string(app_config->get("user_mode")); +} + +ConfigOptionMode GUI_App::get_mode() +{ + return app_config->get_bool("developer_mode") ? comDevelop : get_saved_mode(); +} + +std::string GUI_App::get_saved_mode_str() +{ + return saved_mode_to_string(get_saved_mode()); } std::string GUI_App::get_mode_str() { - if (!app_config->has("user_mode")) - return "simple"; - return app_config->get("user_mode"); + return effective_mode_to_string(get_mode()); } void GUI_App::save_mode(const /*ConfigOptionMode*/int mode) { - //BBS - const std::string mode_str = mode == comAdvanced ? "advanced" : - mode == comSimple ? "simple" : - mode == comDevelop ? "develop" : "simple"; - app_config->set("user_mode", mode_str); + const auto saved_mode = mode == comExpert ? comExpert : + mode == comAdvanced ? comAdvanced : + mode == comSimple ? comSimple : + get_saved_mode(); + app_config->set("user_mode", saved_mode_to_string(saved_mode)); update_mode(); } diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index e89ac33cae..e9099a2ede 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -534,7 +534,9 @@ public: Tab* get_plate_tab(); Tab* get_model_tab(bool part = false); Tab* get_layer_tab(); + ConfigOptionMode get_saved_mode(); ConfigOptionMode get_mode(); + std::string get_saved_mode_str(); std::string get_mode_str(); void save_mode(const /*ConfigOptionMode*/int mode) ; void update_mode(); @@ -705,6 +707,10 @@ public: bool hot_reload_network_plugin(); std::string get_latest_network_version() const; bool has_network_update_available() const; + // Return the client version to report to Bambu servers. Pinned to + // 01.10.01.50 when the legacy network plugin lacks get_my_token support + // so the auth server stays on the ?access_token= redirect path. + std::string get_bbl_client_version(); private: int updating_bambu_networking(); diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 9b98052cdd..ead0d0debb 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -777,17 +777,37 @@ wxMenuItem* MenuFactory::append_menu_item_change_type(wxMenu* menu) // Update checkmark dynamically when menu is shown - check all selected volumes m_parent->Bind(wxEVT_UPDATE_UI, [type = info.type](wxUpdateUIEvent& evt) { + auto model = obj_list()->GetModel(); + auto objs = obj_list()->objects(); bool has_type = false; wxDataViewItemArray sels; obj_list()->GetSelections(sels); for (auto item : sels) { - ModelVolumeType vol_type = obj_list()->GetModel()->GetVolumeType(item); + ModelVolumeType vol_type = model->GetVolumeType(item); if (vol_type == type) { has_type = true; break; } } evt.Check(has_type); + + // ORCA Fix crash caused by SVG/TEXT volumes cant be Support Enforcer/Blocker type + for (auto item : sels) { + if (model->GetItemType(item) == itVolume){ + auto vol_idx = model->GetVolumeIdByItem(item); + auto obj_idx = model->GetObjectIdByItem(item); + if (vol_idx < 0 || obj_idx < 0) + continue; + + auto vol = (*objs)[obj_idx]->volumes[vol_idx]; + + // disable Support Enforcer/Blocker if selection contains svg or text + if (vol != nullptr && (vol->is_svg() || vol->is_text()) && (type == ModelVolumeType::SUPPORT_BLOCKER || type == ModelVolumeType::SUPPORT_ENFORCER)){ + evt.Enable(false); + break; + } + } + } }, item->GetId()); } @@ -827,7 +847,7 @@ void MenuFactory::append_menu_item_fill_bed(wxMenu *menu) wxMenuItem* MenuFactory::append_menu_item_printable(wxMenu* menu) { // BBS: to be checked - wxMenuItem* menu_item_printable = append_menu_check_item(menu, wxID_ANY, _L("Printable"), "", + wxMenuItem* menu_item_printable = append_menu_check_item(menu, wxID_ANY, _L("Printable") + "\t" + "V", "", [](wxCommandEvent&) { obj_list()->toggle_printable_state(); }, menu); m_parent->Bind(wxEVT_UPDATE_UI, [](wxUpdateUIEvent& evt) { @@ -2222,8 +2242,7 @@ void MenuFactory::append_menu_item_set_printable(wxMenu* menu) } } - wxString menu_text = _L("Printable"); - wxMenuItem* menu_item_set_printable = append_menu_check_item(menu, wxID_ANY, menu_text, "", [this, all_printable](wxCommandEvent&) { + wxMenuItem* menu_item_set_printable = append_menu_check_item(menu, wxID_ANY, _L("Printable") + "\t" + "V", "", [this, all_printable](wxCommandEvent&) { Selection& selection = plater()->canvas3D()->get_selection(); selection.set_printable(!all_printable); }, menu); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index 6b3fd492c6..7aa347b9c2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -81,14 +81,14 @@ bool GLGizmoFdmSupports::on_init() m_shortcut_key = WXK_CONTROL_L; m_desc["perform"] = _L("Perform"); - m_desc["on_overhangs_only"] = _L("On overhangs only"); + m_desc["on_overhangs_only"] = _L("On highlighted overhangs only"); m_desc["remove_all"] = _L("Erase all painting"); m_desc["highlight_by_angle"] = _L("Highlight overhang areas"); m_desc["tool_type"] = _L("Tool type"); m_desc["gap_fill"] = _L("Gap fill"); m_desc["reset_direction"] = _L("Reset direction"); m_desc["clipping_of_view"] = _L("Section view"); - m_desc["cursor_size"] = _L("Pen size"); + m_desc["cursor_size"] = _L("Brush size"); m_desc["smart_fill_angle"] = _L("Smart fill angle"); m_desc["gap_area"] = _L("Gap area"); @@ -360,6 +360,12 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l ImGui::BBLDragFloat("##gap_area_input", &TriangleSelectorPatch::gap_area, 0.05f, 0.0f, 0.0f, "%.2f"); } + m_imgui->bbl_checkbox(m_desc["on_overhangs_only"], m_paint_on_overhangs_only); + if (ImGui::IsItemHovered()) + m_imgui->tooltip(format_wxstr(_L("Allows painting only on facets selected by: \"%1%\""), m_desc["highlight_by_angle"]), + max_tooltip_width); + + ImGui::Separator(); float position_before_text_y = ImGui::GetCursorPos().y; ImGui::AlignTextToFramePadding(); @@ -398,11 +404,6 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l ImGui::PushItemWidth(1.5 * slider_icon_width); ImGui::BBLDragFloat("##angle_threshold_deg_input", &m_highlight_by_angle_threshold_deg, 0.05f, 0.0f, 0.0f, "%.2f"); - m_imgui->bbl_checkbox(m_desc["on_overhangs_only"], m_paint_on_overhangs_only); - if (ImGui::IsItemHovered()) - m_imgui->tooltip(format_wxstr(_L("Allows painting only on facets selected by: \"%1%\""), m_desc["highlight_by_angle"]), - max_tooltip_width); - ImGui::Separator(); if (m_c->object_clipper()->get_position() == 0.f) { ImGui::AlignTextToFramePadding(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp index 0c50c32e12..80470de7ad 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp @@ -45,7 +45,7 @@ bool GLGizmoFuzzySkin::on_init() m_desc["tool_brush"] = _L("Brush"); m_desc["tool_smart_fill"] = _L("Smart fill"); m_desc["clipping_of_view"] = _L("Section view"); - m_desc["cursor_size"] = _L("Pen size"); + m_desc["cursor_size"] = _L("Brush size"); m_desc["add_fuzzy_skin"] = _L("Add fuzzy skin"); m_desc["remove_fuzzy_skin"] = _L("Remove fuzzy skin"); m_desc["smart_fill_angle"] = _L("Smart fill angle"); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index a351961b71..e3fbfe0726 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -95,8 +95,8 @@ bool GLGizmoMmuSegmentation::on_init() m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size"] = _L("Pen size"); - m_desc["cursor_type"] = _L("Pen shape"); + m_desc["cursor_size"] = _L("Brush size"); + m_desc["cursor_type"] = _L("Brush shape"); m_desc["paint"] = _L("Paint"); m_desc["erase"] = _L("Erase"); m_desc["shortcut_key"] = _L("Choose filament"); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp index 7ebb794bef..8790fd430d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp @@ -36,7 +36,7 @@ bool GLGizmoSeam::on_init() m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size"] = _L("Pen size"); + m_desc["cursor_size"] = _L("Brush size"); m_desc["tool_type"] = _L("Tool type"); m_desc["enforce"] = _L("Enforce seam"); m_desc["block"] = _L("Block seam"); diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp index fa26cd17a2..a716112347 100644 --- a/src/slic3r/GUI/HintNotification.cpp +++ b/src/slic3r/GUI/HintNotification.cpp @@ -115,7 +115,8 @@ namespace { ConfigOptionMode config_mode = wxGetApp().get_mode(); if (config_mode == ConfigOptionMode::comSimple) return (tag == "simple" ? TagCheckAffirmative : TagCheckNegative); else if (config_mode == ConfigOptionMode::comAdvanced) return (tag == "advanced" ? TagCheckAffirmative : TagCheckNegative); - //else if (config_mode == ConfigOptionMode::comDevelop) return (tag == "develop" ? TagCheckAffirmative : TagCheckNegative); + else if (config_mode == ConfigOptionMode::comExpert || config_mode == ConfigOptionMode::comDevelop) + return (tag == "expert" ? TagCheckAffirmative : TagCheckNegative); } return TagCheckNotCompatible; } diff --git a/src/slic3r/GUI/HttpServer.cpp b/src/slic3r/GUI/HttpServer.cpp index a806bd6e24..e45d3f5751 100644 --- a/src/slic3r/GUI/HttpServer.cpp +++ b/src/slic3r/GUI/HttpServer.cpp @@ -3,6 +3,7 @@ #include "GUI_App.hpp" #include "slic3r/Utils/Http.hpp" #include "slic3r/Utils/NetworkAgent.hpp" +#include "slic3r/Utils/BBLNetworkPlugin.hpp" namespace Slic3r { namespace GUI { @@ -268,9 +269,106 @@ std::shared_ptr HttpServer::bbl_auth_handle_request(const std::string location_str = (boost::format("%1%?result=fail&error=%2%") % redirect_url % error_str).str(); return std::make_shared(location_str); } - } else { - return std::make_shared(); } + + // Ticket-based redirect: Bambu Lab's auth server redirects here after a + // third-party (Google) OAuth so that the access token never travels through + // the URL. We exchange the ticket via the network plugin's get_my_token, + // then run the same get_my_profile + change_user flow as access_token. + // Skip entirely on legacy plugins missing bambu_network_get_my_token — + // those clients pin X-BBL-Client-Version so the server stays on the legacy + // ?access_token= redirect path and never sends ?ticket= here. + const std::string ticket = url_get_param(url, "ticket"); + const std::string ticket_redirect_url = url_get_param(url, "redirect_url"); + if (!ticket.empty() && !ticket_redirect_url.empty() && + BBLNetworkPlugin::instance().get_get_my_token() != nullptr) { + BOOST_LOG_TRIVIAL(info) << "thirdparty_login: ticket flow"; + NetworkAgent* agent = wxGetApp().getAgent(); + if (!agent) { + std::string location_str = (boost::format("%1%?result=fail&error=no_agent") % ticket_redirect_url).str(); + return std::make_shared(location_str); + } + + auto fail_redirect = [&ticket_redirect_url](const std::string& reason) { + std::string location_str = (boost::format("%1%?result=fail&error=%2%") % ticket_redirect_url % reason).str(); + return std::make_shared(location_str); + }; + + unsigned int token_http_code = 0; + std::string token_body; + int token_result = agent->get_my_token(ticket, &token_http_code, &token_body); + if (token_result != 0) { + BOOST_LOG_TRIVIAL(warning) << "thirdparty_login: get_my_token failed, http_code=" << token_http_code; + return fail_redirect("get_my_token_error_" + std::to_string(token_result)); + } + + std::string access_token; + std::string refresh_token; + std::string expires_in_str; + std::string refresh_expires_in_str; + try { + json token_j = json::parse(token_body); + if (token_j.contains("accessToken")) + access_token = token_j["accessToken"].get(); + if (token_j.contains("refreshToken")) + refresh_token = token_j["refreshToken"].get(); + if (token_j.contains("expiresIn")) + expires_in_str = std::to_string(token_j["expiresIn"].get()); + if (token_j.contains("refreshExpiresIn")) + refresh_expires_in_str = std::to_string(token_j["refreshExpiresIn"].get()); + } catch (...) { + return fail_redirect("token_parse_error"); + } + + if (access_token.empty()) { + return fail_redirect("token_missing"); + } + + unsigned int profile_http_code = 0; + std::string profile_body; + int profile_result = agent->get_my_profile(access_token, &profile_http_code, &profile_body); + if (profile_result != 0) { + BOOST_LOG_TRIVIAL(warning) << "thirdparty_login: get_my_profile failed, http_code=" << profile_http_code; + return fail_redirect("get_user_profile_error_" + std::to_string(profile_result)); + } + + std::string user_id; + std::string user_name; + std::string user_account; + std::string user_avatar; + try { + json user_j = json::parse(profile_body); + if (user_j.contains("uidStr")) + user_id = user_j["uidStr"].get(); + if (user_j.contains("name")) + user_name = user_j["name"].get(); + if (user_j.contains("avatar")) + user_avatar = user_j["avatar"].get(); + if (user_j.contains("account")) + user_account = user_j["account"].get(); + } catch (...) { + BOOST_LOG_TRIVIAL(warning) << "thirdparty_login: profile JSON parse failed"; + } + + json j; + j["data"]["refresh_token"] = refresh_token; + j["data"]["token"] = access_token; + j["data"]["expires_in"] = expires_in_str; + j["data"]["refresh_expires_in"] = refresh_expires_in_str; + j["data"]["user"]["uid"] = user_id; + j["data"]["user"]["name"] = user_name; + j["data"]["user"]["account"] = user_account; + j["data"]["user"]["avatar"] = user_avatar; + agent->change_user(j.dump()); + if (agent->is_user_login()) { + wxGetApp().request_user_login(1); + } + GUI::wxGetApp().CallAfter([] { wxGetApp().ShowUserLogin(false); }); + std::string location_str = (boost::format("%1%?result=success") % ticket_redirect_url).str(); + return std::make_shared(location_str); + } + + return std::make_shared(); } void HttpServer::ResponseNotFound::write_response(std::stringstream& ssOut) diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 7d346571bb..2b845385e7 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -259,6 +259,7 @@ void KBShortcutsDialog::fill_shortcuts() { "E", L("Gizmo brim ears") }, { "I", L("Zoom in") }, { "O", L("Zoom out") }, + { "V", L("Toggle printable for object/part") }, { L("Tab"), L("Switch between Prepare/Preview") }, }; diff --git a/src/slic3r/GUI/Notebook.cpp b/src/slic3r/GUI/Notebook.cpp index 89f00f9447..ceda3fc0d6 100644 --- a/src/slic3r/GUI/Notebook.cpp +++ b/src/slic3r/GUI/Notebook.cpp @@ -87,25 +87,6 @@ void ButtonsListCtrl::OnPaint(wxPaintEvent&) dc.SetBrush(clr); dc.DrawRectangle(pos.x, pos.y + size.y, size.x, sz.y - size.y); } - -#if 0 - // highlight selected mode button - if (m_mode_sizer) { - const std::vector& mode_btns = m_mode_sizer->get_btns(); - for (int idx = 0; idx < int(mode_btns.size()); idx++) { - ModeButton* btn = mode_btns[idx]; - btn->SetBackgroundColor(btn->is_selected() ? selected_btn_bg : default_btn_bg); - - //wxPoint pos = btn->GetPosition(); - //wxSize size = btn->GetSize(); - //const wxColour& clr = btn->is_selected() ? btn_marker_color : default_btn_bg; - //dc.SetPen(clr); - //dc.SetBrush(clr); - //dc.DrawRectangle(pos.x, pos.y + size.y, size.x, sz.y - size.y); - } - } -#endif - // Draw orange bottom line dc.SetPen(btn_marker_color); diff --git a/src/slic3r/GUI/Notebook.hpp b/src/slic3r/GUI/Notebook.hpp index 10abfedb95..d333956561 100644 --- a/src/slic3r/GUI/Notebook.hpp +++ b/src/slic3r/GUI/Notebook.hpp @@ -6,7 +6,6 @@ #include #include -class ModeSizer; class ScalableButton; class Button; @@ -40,7 +39,6 @@ private: int m_selection {-1}; int m_btn_margin; int m_line_margin; - //ModeSizer* m_mode_sizer {nullptr}; std::vector m_pageLabels; // ORCA }; diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 620e5fa8ef..f3dcd37d55 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -1840,14 +1840,18 @@ void NotificationManager::push_validate_error_notification(StringObjectException { auto po = dynamic_cast(error.object); auto mo = po ? po->model_object() : dynamic_cast(error.object); + //ORCA: Update to handle ModelInstance selection for validation errors with fallback + /* std::function callback; if (mo || !error.opt_key.empty()) { callback = [id = mo ? mo->id() : 0, opt = error.opt_key](wxEvtHandler*) { auto& objects = wxGetApp().model().objects; auto iter = id.id ? std::find_if(objects.begin(), objects.end(), [id](auto o) { return o->id() == id; }) : objects.end(); - if (iter != objects.end()) + if (iter != objects.end()) { wxGetApp().obj_list()->select_items({ {*iter, nullptr} }); + wxGetApp().obj_list()->update_selections_on_canvas(); + } if (!opt.empty()) { if (iter != objects.end()) wxGetApp().params_panel()->switch_to_object(); @@ -1861,6 +1865,71 @@ void NotificationManager::push_validate_error_notification(StringObjectException } auto link = (mo || !error.opt_key.empty()) ? _u8L("Jump to") : ""; if (mo) link += std::string(" [") + mo->name + "]"; + */ + auto mi = dynamic_cast(error.object); + std::function callback; + if (mo || mi || !error.opt_key.empty()) { + callback = + [id = mo ? mo->id() : (mi ? mi->id() : 0), + parent_id = mi ? mi->get_object()->id() : 0, + is_inst = (mi != nullptr), + opt = error.opt_key](wxEvtHandler*) { + auto& objects = wxGetApp().model().objects; + + if (is_inst) { + bool selected = false; + auto iter = std::find_if(objects.begin(), objects.end(), [parent_id](auto o) { return o->id() == parent_id; }); + if (iter != objects.end()) { + ModelObject* obj = *iter; + int inst_idx = -1; + for(size_t i=0; iinstances.size(); ++i) { + if (obj->instances[i]->id() == id) { + inst_idx = i; + break; + } + } + if (inst_idx != -1) { + auto* model = wxGetApp().obj_list()->GetModel(); + wxDataViewItem item; + wxDataViewItem objItem = model->GetObjectItem(obj); + if (objItem.IsOk()) { + int vm_obj_idx = model->GetIdByItem(objItem); + if (vm_obj_idx != -1) { + item = model->GetItemByInstanceId(vm_obj_idx, inst_idx); + } + } + if (item.IsOk()) { + wxDataViewItemArray sel_items; + sel_items.Add(item); + wxGetApp().obj_list()->select_items(sel_items); + selected = true; + } + } + + if (!selected) { + wxGetApp().obj_list()->select_items({ {obj, nullptr} }); + } + } + } else { + auto iter = id.id ? std::find_if(objects.begin(), objects.end(), [id](auto o) { return o->id() == id; }) : objects.end(); + if (iter != objects.end()) + wxGetApp().obj_list()->select_items({ {*iter, nullptr} }); + } + + if (!opt.empty()) { + if ((!is_inst && id.id) || (is_inst && parent_id.id)) // if object found + wxGetApp().params_panel()->switch_to_object(); + wxGetApp().sidebar().jump_to_option(opt, Preset::TYPE_PRINT, L""); + } + else { + wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); + } + return false; + }; + } + auto link = (mo || mi || !error.opt_key.empty()) ? _u8L("Jump to") : ""; + if (mo) link += std::string(" [") + mo->name + "]"; + if (mi) link += std::string(" [") + mi->get_object()->name + "]"; if (!error.opt_key.empty()) link += std::string(" (") + error.opt_key + ")"; push_notification_data({NotificationType::ValidateError, NotificationLevel::ErrorNotificationLevel, 0, _u8L("Error:") + "\n" + error.string, link, callback}, 0); set_slicing_progress_hidden(); @@ -2290,7 +2359,7 @@ void NotificationManager::upload_job_notification_show_error(int id, const std:: } } -void NotificationManager::push_slicing_serious_warning_notification(const std::string &text, std::vector objs) +void NotificationManager::push_slicing_serious_warning_notification(const std::string &text, std::vector objs) { std::vector ids; for (auto optr : objs) { @@ -2308,19 +2377,113 @@ void NotificationManager::push_slicing_serious_warning_notification(const std::s if (!ovs.empty()) { wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); wxGetApp().obj_list()->select_items(ovs); + wxGetApp().obj_list()->update_selections_on_canvas(); } return false; }; } auto link = callback ? _u8L("Jump to") : ""; - if (!objs.empty()) { - link += " ["; - for (auto obj : objs) { - if (obj) link += obj->name + ", "; + std::vector names; + for (auto optr : objs) { + if (optr) { + names.push_back(optr->name); } - if (!objs.empty()) { - link.pop_back(); - link.pop_back(); + } + if (!names.empty()) { + link += " ["; + for (size_t i = 0; i < names.size(); ++i) { + if (i > 0) link += ", "; + link += names[i]; + } + link += "] "; + } + set_all_slicing_warnings_gray(false); + push_notification_data({NotificationType::SlicingSeriousWarning, NotificationLevel::SeriousWarningNotificationLevel, 0, _u8L("Serious warning:") + "\n" + text, link, + callback}, + 0); + set_slicing_progress_hidden(); +} + +void NotificationManager::push_slicing_serious_warning_notification(const std::string &text, std::vector insts) +{ + std::vector> ids; + for (auto iptr : insts) { + if (iptr && iptr->get_object()) { + ids.push_back({iptr->get_object()->id(), iptr->id()}); + } + } + std::function callback; + if (!insts.empty()) { + callback = [ids](wxEvtHandler*) { + auto& objects = wxGetApp().model().objects; + wxDataViewItemArray sel_items; + std::vector fallback_ovs; + auto* obj_list = wxGetApp().obj_list(); + if (!obj_list) return false; + auto* model = obj_list->GetModel(); + if (!model) return false; + + for (const auto& pair : ids) { + ObjectID obj_id = pair.first; + ObjectID inst_id = pair.second; + + auto iter = std::find_if(objects.begin(), objects.end(), [obj_id](auto o) { return o->id() == obj_id; }); + if (iter != objects.end()) { + ModelObject* obj = *iter; + int inst_idx = -1; + for (int i=0; iinstances.size(); ++i) { + if (obj->instances[i]->id() == inst_id) { + inst_idx = i; + break; + } + } + + if (inst_idx != -1) { + wxDataViewItem item; + wxDataViewItem objItem = model->GetObjectItem(obj); + if (objItem.IsOk()) { + int vm_obj_idx = model->GetIdByItem(objItem); + if (vm_obj_idx != -1) { + item = model->GetItemByInstanceId(vm_obj_idx, inst_idx); + } + } + + if (item.IsOk()) { + sel_items.Add(item); + } else { + fallback_ovs.push_back({obj, nullptr}); + } + } else { + fallback_ovs.push_back({obj, nullptr}); + } + } + } + + wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); + + if (!sel_items.empty()) { + obj_list->select_items(sel_items); + obj_list->update_selections_on_canvas(); + } else if (!fallback_ovs.empty()) { + obj_list->select_items(fallback_ovs); + obj_list->update_selections_on_canvas(); + } + + return false; + }; + } + auto link = callback ? _u8L("Jump to") : ""; + std::vector names; + for (auto iptr : insts) { + if (iptr && iptr->get_object()) { + names.push_back(iptr->get_object()->name); + } + } + if (!names.empty()) { + link += " ["; + for (size_t i = 0; i < names.size(); ++i) { + if (i > 0) link += ", "; + link += names[i]; } link += "] "; } diff --git a/src/slic3r/GUI/NotificationManager.hpp b/src/slic3r/GUI/NotificationManager.hpp index 4d31861390..44263451ba 100644 --- a/src/slic3r/GUI/NotificationManager.hpp +++ b/src/slic3r/GUI/NotificationManager.hpp @@ -218,6 +218,7 @@ public: void upload_job_notification_show_canceled(int id, const std::string& filename, const std::string& host); void upload_job_notification_show_error(int id, const std::string& filename, const std::string& host); void push_slicing_serious_warning_notification(const std::string &text, std::vector objs); + void push_slicing_serious_warning_notification(const std::string &text, std::vector insts); void close_slicing_serious_warning_notification(const std::string &text); // Creates Slicing Error notification with a custom text and no fade out. void push_slicing_error_notification(const std::string &text, std::vector objs); diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index a7f371a9a8..2c18edfaeb 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -22,6 +22,16 @@ namespace Slic3r { namespace GUI { +namespace +{ +int mode_to_selection(ConfigOptionMode mode) +{ + return mode == comExpert ? 2 : + mode == comAdvanced ? 1 : + 0; +} +} + TipsDialog::TipsDialog(wxWindow *parent, const wxString &title, const wxString &description, std::string app_key, long style,std::map option_map) : DPIDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX), @@ -261,15 +271,17 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c m_mode_icon = new ScalableButton(m_top_panel, wxID_ANY, "advanced"); // ORCA m_mode_icon->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) { - if(wxGetApp().get_mode() == comDevelop) return; // prevent change on dev mode - m_mode_view->SetValue(!m_mode_view->GetValue()); - wxCommandEvent evt(wxEVT_TOGGLEBUTTON, m_mode_view->GetId()); // ParamsPanel::OnToggled(evt) - evt.SetEventObject(m_mode_view); - m_mode_view->wxEvtHandler::ProcessEvent(evt); + if (wxGetApp().get_mode() == comDevelop || m_mode_view == nullptr) + return; // prevent change on dev mode + + const int selection = m_mode_view->GetSelection(); + m_mode_view->SelectAndNotify((selection + 1) % 3); }); - m_mode_icon->SetToolTip(_L("Show/Hide advanced parameters")); - m_mode_view = new SwitchButton(m_top_panel, wxID_ABOUT); - m_mode_view->SetToolTip(_L("Show/Hide advanced parameters")); + m_mode_icon->SetToolTip(_L("Cycle settings visibility")); + m_mode_view = new ModeSwitchButton(m_top_panel); + m_mode_view->SetSelection(mode_to_selection(wxGetApp().get_saved_mode())); + if (wxGetApp().get_mode() == comDevelop) + m_mode_view->Enable(false); // BBS: new layout //m_search_btn = new ScalableButton(m_top_panel, wxID_ANY, "search", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true); @@ -382,9 +394,6 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c if (m_mode_region) m_mode_region->Bind(wxEVT_TOGGLEBUTTON, &ParamsPanel::OnToggled, this); - if (m_mode_view) - m_mode_view->Bind(wxEVT_TOGGLEBUTTON, &ParamsPanel::OnToggled, this); - Bind(wxEVT_TOGGLEBUTTON, &ParamsPanel::OnToggled, this); // For Tab's mode switch //Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { wxGetApp().plater()->search(false); }, wxID_FIND); //m_export_to_file->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { wxGetApp().mainframe->export_config(); }); //m_import_from_file->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { wxGetApp().mainframe->load_config_file(); }); @@ -560,28 +569,6 @@ void ParamsPanel::OnToggled(wxCommandEvent& event) return; } - if (wxID_ABOUT != event.GetId()) { - return; - } - - // this is from tab's mode switch - bool value = dynamic_cast(event.GetEventObject())->GetValue(); - int mode_id; - - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": Advanced mode toogle to %1%") % value; - - if (value) - { - //m_mode_region->SetBitmap(m_toggle_on_icon); - mode_id = comAdvanced; - } - else - { - //m_mode_region->SetBitmap(m_toggle_off_icon); - mode_id = comSimple; - } - - Slic3r::GUI::wxGetApp().save_mode(mode_id); event.Skip(); } @@ -657,27 +644,22 @@ bool ParamsPanel::is_active_and_shown_tab(wxPanel* tab) void ParamsPanel::update_mode() { int app_mode = Slic3r::GUI::wxGetApp().get_mode(); - SwitchButton * mode_view = m_current_tab ? dynamic_cast(m_current_tab)->m_mode_view : nullptr; - if (mode_view == nullptr) mode_view = m_mode_view; - if (mode_view == nullptr) return; + auto sync_mode_view = [&](ModeSwitchButton* mode_view) { + if (mode_view == nullptr) + return; - //BBS: disable the mode tab and return directly when enable develop mode - if (app_mode == comDevelop) - { - mode_view->Disable(); - return; - } - if (!mode_view->IsEnabled()) - mode_view->Enable(); + mode_view->SetSelection(mode_to_selection(Slic3r::GUI::wxGetApp().get_saved_mode())); + if (app_mode == comDevelop) { + mode_view->Enable(false); + return; + } - if (app_mode == comAdvanced) - { - mode_view->SetValue(true); - } - else - { - mode_view->SetValue(false); - } + if (!mode_view->IsEnabled()) + mode_view->Enable(); + }; + + sync_mode_view(m_mode_view); + sync_mode_view(m_current_tab ? dynamic_cast(m_current_tab)->m_mode_view : nullptr); } void ParamsPanel::msw_rescale() @@ -694,7 +676,9 @@ void ParamsPanel::msw_rescale() ((SwitchButton* )m_mode_region)->Rescale(); if (m_mode_icon) m_mode_icon->msw_rescale(); if (m_mode_view) - ((SwitchButton* )m_mode_view)->Rescale(); + { + m_mode_view->Rescale(); + } for (auto tab : {m_tab_print, m_tab_print_plate, m_tab_print_object, m_tab_print_part, m_tab_print_layer, m_tab_filament, m_tab_printer}) { if (tab) dynamic_cast(tab)->msw_rescale(); } @@ -790,7 +774,6 @@ void ParamsPanel::delete_subwindows() if (m_mode_view) { - delete m_mode_view; m_mode_view = nullptr; } diff --git a/src/slic3r/GUI/ParamsPanel.hpp b/src/slic3r/GUI/ParamsPanel.hpp index 36ed957cc4..0726db91d3 100644 --- a/src/slic3r/GUI/ParamsPanel.hpp +++ b/src/slic3r/GUI/ParamsPanel.hpp @@ -31,6 +31,7 @@ #include "GUI_Utils.hpp" #include "Widgets/Button.hpp" +class ModeSwitchButton; class SwitchButton; class StaticBox; @@ -85,7 +86,7 @@ class ParamsPanel : public wxPanel ScalableButton *m_tips_arrow{nullptr}; bool m_tips_arror_blink{false}; ScalableButton* m_mode_icon { nullptr }; // ORCA - SwitchButton* m_mode_view { nullptr }; + ModeSwitchButton* m_mode_view { nullptr }; //wxBitmapButton* m_search_button { nullptr }; wxStaticLine* m_staticline_print { nullptr }; //wxBoxSizer* m_print_sizer { nullptr }; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 1fc67d3e28..65b33e54c2 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5110,7 +5110,8 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) this->q->set_prepare_state(Job::PREPARE_STATE_MENU); this->q->orient(); }); //BBS - view3D_canvas->Bind(EVT_GLCANVAS_SELECT_CURR_PLATE_ALL, [this](SimpleEvent&) {this->q->select_curr_plate_all(); }); + view3D_canvas->Bind(EVT_GLCANVAS_SELECT_CURR_PLATE_ALL, [this](SimpleEvent&) {this->q->select_curr_plate_all(); }); + view3D_canvas->Bind(EVT_GLCANVAS_PRINTABLE, [this](SimpleEvent& evt) { this->sidebar->obj_list()->toggle_printable_state(); }); view3D_canvas->Bind(EVT_GLCANVAS_SELECT_ALL, [this](SimpleEvent&) { this->q->select_all(); }); view3D_canvas->Bind(EVT_GLCANVAS_QUESTION_MARK, [](SimpleEvent&) { wxGetApp().keyboard_shortcuts(); }); @@ -5995,11 +5996,24 @@ std::vector Plater::priv::load_files(const std::vector& input_ // BBS: version check Semver app_version = *(Semver::parse(SoftFever_VERSION)); + const wxString load_3mf_title = _L("Load 3MF"); + const wxString newer_3mf_title = _L("Newer 3MF version"); + const wxString bambu_project_title = _L("BambuStudio Project"); + const wxString msg_unsupported_geometry = _L("The 3MF is not supported by OrcaSlicer, loading geometry data only."); + const wxString msg_old_orca_geometry = _L("The 3MF file was generated by an old OrcaSlicer version, loading geometry data only."); + const wxString msg_older_geometry = _L("The 3MF file was generated by an older version, loading geometry data only."); + const wxString msg_bambu_geometry = _L("The 3MF file was generated by BambuStudio, loading geometry data only."); + auto log_and_show_3mf_info = [&](const wxString& text, const wxString& title) { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ + << " " + << boost::format("3MF import message [%1%]: %2% | file: %3%") % into_u8(title) % into_u8(text) % path.string(); + show_info(q, text, title); + }; if (en_3mf_file_type == En3mfType::From_Prusa) { // do not reset the model config load_config = false; - if(load_type != LoadType::LoadGeometry) - show_info(q, _L("The 3MF is not supported by OrcaSlicer, loading geometry data only."), _L("Load 3MF")); + if (load_type != LoadType::LoadGeometry) + log_and_show_3mf_info(msg_unsupported_geometry, load_3mf_title); } else if (en_3mf_file_type == En3mfType::From_Orca) { // OrcaSlicer file (has OrcaSlicer tag) - compare file_version with SoftFever_VERSION @@ -6035,7 +6049,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ wxString append = _L("You'd better upgrade your software.\n"); context += "\n\n"; context += append; - show_info(q, context, _L("Newer 3MF version")); + log_and_show_3mf_info(context, newer_3mf_title); } else { //if the minor version is not matched @@ -6043,13 +6057,13 @@ std::vector Plater::priv::load_files(const std::vector& input_ wxString text = wxString::Format(_L("The 3MF file version %s is newer than %s's version %s, we suggest to upgrade your software."), file_version.to_string_sf(), std::string(SLIC3R_APP_FULL_NAME), app_version.to_string_sf()); text += "\n"; - show_info(q, text, _L("Newer 3MF version")); + log_and_show_3mf_info(text, newer_3mf_title); } } } else if (load_config && config_loaded.empty()) { load_config = false; - show_info(q, _L("The 3MF file was generated by an old OrcaSlicer version, loading geometry data only."), _L("Load 3MF")); + log_and_show_3mf_info(msg_old_orca_geometry, load_3mf_title); } } else if (en_3mf_file_type == En3mfType::From_BBS) { @@ -6084,7 +6098,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ } else if (load_config && config_loaded.empty()) { load_config = false; - show_info(q, _L("The 3MF file was generated by an older version, loading geometry data only."), _L("Load 3MF")); + log_and_show_3mf_info(msg_older_geometry, load_3mf_title); } } else { // BambuStudio project (version > 2.3.2 without OrcaSlicer tag) @@ -6092,7 +6106,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ Semver slic3r_version = *(Semver::parse(SLIC3R_VERSION)); if (load_config && config_loaded.empty()) { load_config = false; - show_info(q, _L("The 3MF file was generated by BambuStudio, loading geometry data only."), _L("Load 3MF")); + log_and_show_3mf_info(msg_bambu_geometry, load_3mf_title); } else if (load_config && (file_version > slic3r_version)) { // BambuStudio file version is newer than our compatible SLIC3R_VERSION @@ -6104,23 +6118,32 @@ std::vector Plater::priv::load_files(const std::vector& input_ wxString append = _L("You'd better upgrade your software.\n"); context += "\n\n"; context += append; - show_info(q, context, _L("BambuStudio Project")); + log_and_show_3mf_info(context, bambu_project_title); } else { wxString text = wxString::Format(_L("The 3MF was created by BambuStudio (version %s), which is newer than the compatible version %s. Some settings may not be fully compatible."), file_version.to_string(), slic3r_version.to_string()); text += "\n"; - show_info(q, text, _L("BambuStudio Project")); + log_and_show_3mf_info(text, bambu_project_title); } } else if (load_config) { // BambuStudio version is older or same as our SLIC3R_VERSION wxString text = _L("The 3MF was created by BambuStudio. Some settings may differ from OrcaSlicer."); - show_info(q, text, _L("BambuStudio Project")); + log_and_show_3mf_info(text, bambu_project_title); } } } + else if (en_3mf_file_type == En3mfType::From_Other) { + // Generic CAD/other 3MF without slicer metadata: import geometry silently. + if (load_config && config_loaded.empty()) { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ + << " " + << boost::format("3MF has no slicer metadata/project config, importing geometry only: %1%") % path.string(); + load_config = false; + } + } else if (load_config && config_loaded.empty()) { load_config = false; - show_info(q, _L("The 3MF file was generated by an old OrcaSlicer version, loading geometry data only."), _L("Load 3MF")); + log_and_show_3mf_info(msg_old_orca_geometry, load_3mf_title); } else if (!load_config) { // reset config except color @@ -6210,9 +6233,9 @@ std::vector Plater::priv::load_files(const std::vector& input_ config += std::move(config_loaded); std::map validity = config.validate(); if (!validity.empty()) { - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("Param values in 3mf error: "); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << " " << boost::format("Param values in 3mf error: "); for (std::map::iterator it=validity.begin(); it!=validity.end(); ++it) - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("%1%: %2%")%it->first %it->second; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << " " << boost::format("%1%: %2%")%it->first %it->second; // NotificationManager *notify_manager = q->get_notification_manager(); std::string error_message = L("Invalid values found in the 3MF:"); @@ -6694,7 +6717,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ model_object->center_around_origin(false); // BBS - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("import 3mf IMPORT_LOAD_MODEL_OBJECTS \n"); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << " " << boost::format("import 3mf IMPORT_LOAD_MODEL_OBJECTS \n"); wxString msg = wxString::Format("Loading file: %s", from_path(real_filename)); model_idx++; dlg_cont = dlg.Update(progress_percent, msg); @@ -7777,22 +7800,72 @@ void Plater::priv::process_validation_warning(StringObjectException const &warni std::string text = warning.string; auto po = dynamic_cast(warning.object); auto mo = po ? po->model_object() : dynamic_cast(warning.object); - auto action_fn = (mo || !warning.opt_key.empty()) ? [id = mo ? mo->id() : 0, opt = warning.opt_key](wxEvtHandler *) { + //ORCA: Update process_validation_warning to handle ModelInstance selection and include fallback + auto mi = dynamic_cast(warning.object); + + auto action_fn = (mo || mi || !warning.opt_key.empty()) ? [id = mo ? mo->id() : (mi ? mi->id() : 0), + parent_id = mi ? mi->get_object()->id() : 0, + is_inst = (mi != nullptr), + opt = warning.opt_key](wxEvtHandler *) { auto & objects = wxGetApp().model().objects; - auto iter = id.id ? std::find_if(objects.begin(), objects.end(), [id](auto o) { return o->id() == id; }) : objects.end(); - if (iter != objects.end()) { - wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); - wxGetApp().obj_list()->select_items({{*iter, nullptr}}); + + if (is_inst) { + bool selected = false; + auto iter = std::find_if(objects.begin(), objects.end(), [parent_id](auto o) { return o->id() == parent_id; }); + if (iter != objects.end()) { + ModelObject* obj = *iter; + int inst_idx = -1; + for(size_t i=0; iinstances.size(); ++i) { + if (obj->instances[i]->id() == id) { + inst_idx = i; + break; + } + } + + wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); + + if (inst_idx != -1) { + auto* model = wxGetApp().obj_list()->GetModel(); + wxDataViewItem item; + wxDataViewItem objItem = model->GetObjectItem(obj); + if (objItem.IsOk()) { + int vm_obj_idx = model->GetIdByItem(objItem); + if (vm_obj_idx != -1) { + item = model->GetItemByInstanceId(vm_obj_idx, inst_idx); + } + } + if (item.IsOk()) { + wxDataViewItemArray sel_items; + sel_items.Add(item); + wxGetApp().obj_list()->select_items(sel_items); + wxGetApp().obj_list()->update_selections_on_canvas(); + selected = true; + } + } + + if (!selected) { + wxGetApp().obj_list()->select_items({ {obj, nullptr} }); + wxGetApp().obj_list()->update_selections_on_canvas(); + } + } + } else { + auto iter = id.id ? std::find_if(objects.begin(), objects.end(), [id](auto o) { return o->id() == id; }) : objects.end(); + if (iter != objects.end()) { + wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); + wxGetApp().obj_list()->select_items({{*iter, nullptr}}); + wxGetApp().obj_list()->update_selections_on_canvas(); + } } if (!opt.empty()) { - if (iter != objects.end()) + if ((!is_inst && id.id) || (is_inst && parent_id.id)) wxGetApp().params_panel()->switch_to_object(); wxGetApp().sidebar().jump_to_option(opt, Preset::TYPE_PRINT, L""); } return false; } : std::function(); - auto hypertext = (mo || !warning.opt_key.empty()) ? _u8L("Jump to") : ""; + auto hypertext = (mo || mi || !warning.opt_key.empty()) ? _u8L("Jump to") : ""; if (mo) hypertext += std::string(" [") + mo->name + "]"; + if (mi) hypertext += std::string(" [") + mi->get_object()->name + "]"; if (!warning.opt_key.empty()) hypertext += std::string(" (") + warning.opt_key + ")"; // BBS disable support enforcer @@ -12633,6 +12706,7 @@ void Plater::calib_pa(const Calib_Params& params) auto print_config = &wxGetApp().preset_bundle->prints.get_edited_preset().config; auto printer_config = &wxGetApp().preset_bundle->printers.get_edited_preset().config; print_config->set_key_value("overhang_reverse", new ConfigOptionBool(false)); + print_config->set_key_value("precise_z_height", new ConfigOptionBool(false)); printer_config->set_key_value("resonance_avoidance", new ConfigOptionBool{false}); switch (params.mode) { case CalibMode::Calib_PA_Line: @@ -13141,6 +13215,10 @@ void Plater::calib_flowrate(bool is_linear, int pass, InfillPattern pattern) { void Plater::calib_temp(const Calib_Params& params) { + constexpr double base_temp_tower_nozzle_diameter = 0.4; + constexpr double base_temp_tower_block_height = 10.0; + constexpr int base_temp_tower_temp_step = 5; + const auto calib_temp_name = wxString::Format(L"Nozzle temperature test"); new_project(false, false, calib_temp_name); wxGetApp().mainframe->select_tab(size_t(MainFrame::tp3DEditor)); @@ -13151,18 +13229,61 @@ void Plater::calib_temp(const Calib_Params& params) { auto printer_config = &wxGetApp().preset_bundle->printers.get_edited_preset().config; auto filament_config = &wxGetApp().preset_bundle->filaments.get_edited_preset().config; auto start_temp = lround(params.start); + const ConfigOptionFloats* nozzle_diameter_config = printer_config->option("nozzle_diameter"); + size_t nozzle_id = static_cast(std::max(params.extruder_id, 0)); + double nozzle_diameter = base_temp_tower_nozzle_diameter; + if (nozzle_diameter_config && !nozzle_diameter_config->values.empty()) { + nozzle_id = std::min(nozzle_id, nozzle_diameter_config->values.size() - 1); + nozzle_diameter = nozzle_diameter_config->values[nozzle_id]; + } + if (nozzle_diameter <= 0.0) + nozzle_diameter = base_temp_tower_nozzle_diameter; + + const double nozzle_scale = nozzle_diameter / base_temp_tower_nozzle_diameter; + const double block_height = base_temp_tower_block_height; + + // cut upper + auto obj_bb = model().objects[0]->bounding_box_exact(); + auto block_count = lround((500 - params.end) / base_temp_tower_temp_step + 1); + if (block_count > 0) { + // subtract EPSILON offset to avoid cutting at the exact location where the flat surface is + auto new_height = block_count * block_height - EPSILON; + if (new_height < obj_bb.size().z()) { + cut_horizontal(0, 0, new_height, ModelObjectCutAttribute::KeepLower); + } + } + + // cut bottom + obj_bb = model().objects[0]->bounding_box_exact(); + block_count = lround((500 - params.start) / base_temp_tower_temp_step); + if (block_count > 0) { + auto new_height = block_count * block_height + EPSILON; + if (new_height < obj_bb.size().z()) { + cut_horizontal(0, 0, new_height, ModelObjectCutAttribute::KeepUpper); + } + } + + if (std::abs(nozzle_scale - 1.0) > EPSILON) + model().objects[0]->scale(nozzle_scale, nozzle_scale, nozzle_scale); + + model().objects[0]->ensure_on_bed(); + printer_config->set_key_value("resonance_avoidance", new ConfigOptionBool{false}); filament_config->set_key_value("nozzle_temperature_initial_layer", new ConfigOptionInts(1,(int)start_temp)); filament_config->set_key_value("nozzle_temperature", new ConfigOptionInts(1,(int)start_temp)); + model().objects[0]->config.set_key_value("layer_height", new ConfigOptionFloat(nozzle_diameter/2)); model().objects[0]->config.set_key_value("brim_type", new ConfigOptionEnum(btOuterOnly)); model().objects[0]->config.set_key_value("brim_width", new ConfigOptionFloat(5.0)); model().objects[0]->config.set_key_value("brim_object_gap", new ConfigOptionFloat(0.0)); model().objects[0]->config.set_key_value("alternate_extra_wall", new ConfigOptionBool(false)); model().objects[0]->config.set_key_value("seam_slope_type", new ConfigOptionEnum(SeamScarfType::None)); model().objects[0]->config.set_key_value("overhang_reverse", new ConfigOptionBool(false)); + model().objects[0]->config.set_key_value("precise_z_height", new ConfigOptionBool(false)); auto print_config = &wxGetApp().preset_bundle->prints.get_edited_preset().config; print_config->set_key_value("enable_wrapping_detection", new ConfigOptionBool(false)); + print_config->set_key_value("initial_layer_print_height", new ConfigOptionFloat(nozzle_diameter/2)); + changed_objects({ 0 }); wxGetApp().get_tab(Preset::TYPE_PRINT)->update_dirty(); @@ -13170,27 +13291,6 @@ void Plater::calib_temp(const Calib_Params& params) { wxGetApp().get_tab(Preset::TYPE_PRINT)->reload_config(); wxGetApp().get_tab(Preset::TYPE_FILAMENT)->reload_config(); - // cut upper - auto obj_bb = model().objects[0]->bounding_box_exact(); - auto block_count = lround((500 - params.end) / 5 + 1); - if(block_count > 0){ - // subtract EPSILON offset to avoid cutting at the exact location where the flat surface is - auto new_height = block_count * 10.0 - EPSILON; - if (new_height < obj_bb.size().z()) { - cut_horizontal(0, 0, new_height, ModelObjectCutAttribute::KeepLower); - } - } - - // cut bottom - obj_bb = model().objects[0]->bounding_box_exact(); - block_count = lround((500 - params.start) / 5); - if(block_count > 0){ - auto new_height = block_count * 10.0 + EPSILON; - if (new_height < obj_bb.size().z()) { - cut_horizontal(0, 0, new_height, ModelObjectCutAttribute::KeepUpper); - } - } - p->background_process.fff_print()->set_calib_params(params); } @@ -13239,6 +13339,7 @@ void Plater::calib_max_vol_speed(const Calib_Params& params) obj_cfg.set_key_value("brim_type", new ConfigOptionEnum(btOuterAndInner)); obj_cfg.set_key_value("brim_width", new ConfigOptionFloat(5.0)); obj_cfg.set_key_value("brim_object_gap", new ConfigOptionFloat(0.0)); + obj_cfg.set_key_value("precise_z_height", new ConfigOptionBool(false)); print_config->set_key_value("timelapse_type", new ConfigOptionEnum(tlTraditional)); print_config->set_key_value("spiral_mode", new ConfigOptionBool(true)); print_config->set_key_value("max_volumetric_extrusion_rate_slope", new ConfigOptionFloat(0)); @@ -13311,6 +13412,7 @@ void Plater::calib_retraction(const Calib_Params& params) obj->config.set_key_value("seam_position", new ConfigOptionEnum(spAligned)); obj->config.set_key_value("wall_sequence", new ConfigOptionEnum(WallSequence::InnerOuter)); obj->config.set_key_value("overhang_reverse", new ConfigOptionBool(false)); + obj->config.set_key_value("precise_z_height", new ConfigOptionBool(false)); changed_objects({ 0 }); @@ -13349,6 +13451,7 @@ void Plater::calib_VFA(const Calib_Params& params) print_config->set_key_value("detect_thin_wall", new ConfigOptionBool(false)); print_config->set_key_value("spiral_mode", new ConfigOptionBool(true)); print_config->set_key_value("enable_wrapping_detection", new ConfigOptionBool(false)); + print_config->set_key_value("precise_z_height", new ConfigOptionBool(false)); model().objects[0]->config.set_key_value("brim_type", new ConfigOptionEnum(btOuterOnly)); model().objects[0]->config.set_key_value("brim_width", new ConfigOptionFloat(3.0)); model().objects[0]->config.set_key_value("brim_object_gap", new ConfigOptionFloat(0.0)); @@ -13416,6 +13519,7 @@ void Plater::calib_input_shaping_freq(const Calib_Params& params) print_config->set_key_value("outer_wall_speed", new ConfigOptionFloat(200)); print_config->set_key_value("default_acceleration", new ConfigOptionFloat(20000)); print_config->set_key_value("outer_wall_acceleration", new ConfigOptionFloat(20000)); + print_config->set_key_value("precise_z_height", new ConfigOptionBool(false)); model().objects[0]->config.set_key_value("brim_type", new ConfigOptionEnum(btOuterOnly)); model().objects[0]->config.set_key_value("brim_width", new ConfigOptionFloat(3.0)); model().objects[0]->config.set_key_value("brim_object_gap", new ConfigOptionFloat(0.0)); @@ -13476,6 +13580,7 @@ void Plater::calib_input_shaping_damp(const Calib_Params& params) print_config->set_key_value("outer_wall_speed", new ConfigOptionFloat(200)); print_config->set_key_value("default_acceleration", new ConfigOptionFloat(20000)); print_config->set_key_value("outer_wall_acceleration", new ConfigOptionFloat(20000)); + print_config->set_key_value("precise_z_height", new ConfigOptionBool(false)); model().objects[0]->config.set_key_value("brim_type", new ConfigOptionEnum(btOuterOnly)); model().objects[0]->config.set_key_value("brim_width", new ConfigOptionFloat(3.0)); model().objects[0]->config.set_key_value("brim_object_gap", new ConfigOptionFloat(0.0)); @@ -13538,6 +13643,7 @@ void Plater::Calib_Cornering(const Calib_Params& params) print_config->set_key_value("outer_wall_speed", new ConfigOptionFloat(200)); print_config->set_key_value("default_acceleration", new ConfigOptionFloat(2000)); print_config->set_key_value("outer_wall_acceleration", new ConfigOptionFloat(2000)); + print_config->set_key_value("precise_z_height", new ConfigOptionBool(false)); model().objects[0]->config.set_key_value("brim_type", new ConfigOptionEnum(btOuterOnly)); model().objects[0]->config.set_key_value("brim_width", new ConfigOptionFloat(3.0)); model().objects[0]->config.set_key_value("brim_object_gap", new ConfigOptionFloat(0.0)); diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 2774f6fcd7..a07e352798 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -1004,11 +1004,7 @@ wxBoxSizer *PreferencesDialog::create_item_checkbox(wxString title, wxString too if (param == "developer_mode") { m_developer_mode_def = app_config->get("developer_mode"); - if (m_developer_mode_def == "true") { - Slic3r::GUI::wxGetApp().save_mode(comDevelop); - } else { - Slic3r::GUI::wxGetApp().save_mode(comAdvanced); - } + Slic3r::GUI::wxGetApp().update_mode(); } // webview dump_vedio diff --git a/src/slic3r/GUI/Printer/gstbambusrc.c b/src/slic3r/GUI/Printer/gstbambusrc.c index 316432fd0a..d3f4ab112a 100644 --- a/src/slic3r/GUI/Printer/gstbambusrc.c +++ b/src/slic3r/GUI/Printer/gstbambusrc.c @@ -299,34 +299,86 @@ gst_bambusrc_create (GstPushSrc * psrc, GstBuffer ** outbuf) #endif *outbuf = gst_buffer_new_wrapped_full(0, sbuf, sample.size, 0, sample.size, sbuf, g_free); - /* The NAL data already contains a timestamp (I think?), but we seem to - * need to feed this in too -- otherwise the GStreamer pipeline gets upset - * and starts triggering QoS events. + /* Synthesize monotonic timestamps at the announced frame rate, anchored + * to the first frame's arrival time. The X1C's RTSPS server emits + * unreliable decode timestamps (wildly non-monotonic jumps, or sometimes + * none at all); forwarding them directly froze the pipeline after a few + * seconds. Pacing on a synthesized clock — the same trick mpv uses when + * it reports "No video PTS! Making something up." — gives smooth + * playback regardless of network jitter, and only drops late frames if + * the printer can't keep up. A snap-back resets the anchor if real + * arrival drifts more than two frame periods from the synthesized + * timeline (e.g. announced framerate was wrong). */ - if (src->video_type == AVC1) { - if (!src->sttime) { - src->sttime = sample.decode_time * 100ULL; - } - GST_BUFFER_DTS(*outbuf) = sample.decode_time * 100ULL - src->sttime; - GST_BUFFER_PTS(*outbuf) = GST_CLOCK_TIME_NONE; - GST_BUFFER_DURATION(*outbuf) = GST_CLOCK_TIME_NONE; + GstClock *clock = GST_ELEMENT_CLOCK(psrc); + GstClockTime base_time = gst_element_get_base_time((GstElement *)psrc); + GstClockTime running_now = GST_CLOCK_TIME_NONE; + if (clock) { + GstClockTime now = gst_clock_get_time(clock); + if (now != GST_CLOCK_TIME_NONE && now >= base_time) + running_now = now - base_time; } - else { - if (!src->sttime) { - //only available from 1.18 - //src->sttime = gst_element_get_current_clock_time((GstElement *)psrc); - src->sttime = gst_clock_get_time(((GstElement *)psrc)->clock); - //if (GST_CLOCK_TIME_NONE == src->sttime) - // src->sttime - GST_DEBUG_OBJECT(src, - "sttime init to %lu.", - src->sttime); - } - //GST_BUFFER_DTS(*outbuf) = gst_element_get_current_clock_time((GstElement *)psrc) - src->sttime; - GST_BUFFER_DTS(*outbuf) = gst_clock_get_time(((GstElement *)psrc)->clock) - src->sttime; - GST_BUFFER_PTS(*outbuf) = GST_CLOCK_TIME_NONE; - GST_BUFFER_DURATION(*outbuf) = GST_CLOCK_TIME_NONE; + + /* Adapt the period to actual inter-arrival time via EWMA. The announced + * frame_rate is unreliable on Bambu printers (X1C announces 30 but + * delivers ~28), so trusting it causes the synthesized timeline to drift + * relative to real time, which makes the sink consider frames late and + * skip pacing entirely. Measuring the real rate keeps PTS in step with + * arrival on average, so the sink can pace inside bursts while still + * tracking the printer's actual frame cadence. + */ + if (src->avg_period == 0) { + int fps = src->frame_rate > 0 ? src->frame_rate : 30; + src->avg_period = GST_SECOND / fps; } + if (running_now != GST_CLOCK_TIME_NONE && src->last_arrival != 0) { + GstClockTimeDiff delta = GST_CLOCK_DIFF(src->last_arrival, running_now); + /* clamp to plausible video frame periods (5..200 ms) so a one-off + * burst-of-zero or long stall doesn't poison the average */ + if (delta > 5 * GST_MSECOND && delta < 200 * GST_MSECOND) { + src->avg_period = (src->avg_period * 15 + (GstClockTime)delta) / 16; + } + } + src->last_arrival = (running_now != GST_CLOCK_TIME_NONE) ? running_now : src->last_arrival; + GstClockTime period = src->avg_period; + + /* Lead time: schedule frames a few periods in the future of their + * arrival, so the sink has a small jitter buffer. Without this, frames + * arriving slightly later than expected land behind the running clock + * and the sink renders them immediately, producing visible stutter. + * 100ms is invisible for a live print-monitor view. + */ + const GstClockTime LEAD = 100 * GST_MSECOND; + + if (!src->sttime) { + src->sttime = (running_now != GST_CLOCK_TIME_NONE) ? running_now + LEAD : LEAD; + src->frame_count = 0; + } + + GstClockTime pts = src->sttime + src->frame_count * period; + + /* Safety net: with the lead applied, expected drift is roughly -LEAD + * (pts sits LEAD ns ahead of running_now). Re-anchor only if the + * synthesized timeline diverges from that expectation by several frame + * periods, which indicates a real disturbance (printer paused, stream + * resumed, large fps change) rather than ordinary jitter. + */ + if (running_now != GST_CLOCK_TIME_NONE) { + GstClockTimeDiff drift = GST_CLOCK_DIFF(pts, running_now); + GstClockTimeDiff expected = -(GstClockTimeDiff)LEAD; + GstClockTimeDiff slack = (GstClockTimeDiff)(4 * period); + if (drift > expected + slack || drift < expected - slack) { + GST_DEBUG_OBJECT(src, "ts drift %" G_GINT64_FORMAT " ns; re-anchoring", drift); + src->sttime = running_now + LEAD; + src->frame_count = 0; + pts = src->sttime; + } + } + + GST_BUFFER_PTS(*outbuf) = pts; + GST_BUFFER_DTS(*outbuf) = pts; + GST_BUFFER_DURATION(*outbuf) = period; + src->frame_count++; GST_DEBUG_OBJECT(src, "sttime:%lu, DTS:%lu, PTS: %lu~", src->sttime, GST_BUFFER_DTS(*outbuf), GST_BUFFER_PTS(*outbuf)); @@ -396,12 +448,16 @@ gst_bambusrc_start (GstBaseSrc * bsrc) GST_INFO_OBJECT (src, "stream %d type=%d, sub_type=%d", i, info.type, info.sub_type); if (info.type == VIDE) { src->video_type = info.sub_type; + src->frame_rate = info.format.video.frame_rate; GST_INFO_OBJECT (src, " width %d height=%d, frame_rate=%d", info.format.video.width, info.format.video.height, info.format.video.frame_rate); } } src->sttime = 0; + src->frame_count = 0; + src->last_arrival = 0; + src->avg_period = 0; return TRUE; } diff --git a/src/slic3r/GUI/Printer/gstbambusrc.h b/src/slic3r/GUI/Printer/gstbambusrc.h index fbffb2df03..d5c022a40e 100644 --- a/src/slic3r/GUI/Printer/gstbambusrc.h +++ b/src/slic3r/GUI/Printer/gstbambusrc.h @@ -65,6 +65,10 @@ struct _GstBambuSrc Bambu_Tunnel tnl; GstClockTime sttime; int video_type; + int frame_rate; + guint64 frame_count; + GstClockTime last_arrival; + GstClockTime avg_period; }; extern void gstbambusrc_register(); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 6354b7c880..52c70fdd4d 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -44,7 +44,9 @@ #include "MsgDialog.hpp" #include "Notebook.hpp" +#include "Widgets/ComboBox.hpp" #include "Widgets/Label.hpp" +#include "Widgets/SwitchButton.hpp" #include "Widgets/TabCtrl.hpp" #include "Widgets/ComboBox.hpp" #include "Widgets/CheckBox.hpp" @@ -68,6 +70,16 @@ t_config_option_keys deep_diff(const ConfigBase &config_this, const ConfigBase & namespace GUI { +namespace +{ +int mode_to_selection(ConfigOptionMode mode) +{ + return mode == comExpert ? 2 : + mode == comAdvanced ? 1 : + 0; +} +} + #define DISABLE_UNDO_SYS // Forward declaration for early use; definitions live later in this translation unit. @@ -393,17 +405,19 @@ void Tab::create_preset_tab() if (dynamic_cast(this) == nullptr) { m_mode_icon = new ScalableButton(m_top_panel, wxID_ANY, "advanced"); // ORCA - m_mode_icon->SetToolTip(_L("Show/Hide advanced parameters")); + m_mode_icon->SetToolTip(_L("Cycle settings visibility")); m_mode_icon->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) { - if(wxGetApp().get_mode() == comDevelop) return; // prevent change on dev mode - m_mode_view->SetValue(!m_mode_view->GetValue()); - wxCommandEvent evt(wxEVT_TOGGLEBUTTON, m_mode_view->GetId()); // ParamsPanel::OnToggled(evt) - evt.SetEventObject(m_mode_view); - m_mode_view->wxEvtHandler::ProcessEvent(evt); + if (wxGetApp().get_mode() == comDevelop || m_mode_view == nullptr) + return; // prevent change on dev mode + + const int selection = m_mode_view->GetSelection(); + m_mode_view->SelectAndNotify((selection + 1) % 3); }); m_top_sizer->Add(m_mode_icon, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::WideSpacing())); - m_mode_view = new SwitchButton(m_top_panel, wxID_ABOUT); - m_mode_view->SetToolTip(_L("Show/Hide advanced parameters")); + m_mode_view = new ModeSwitchButton(m_top_panel); + m_mode_view->SetSelection(mode_to_selection(wxGetApp().get_saved_mode())); + if (wxGetApp().get_mode() == comDevelop) + m_mode_view->Enable(false); m_top_sizer->AddSpacer(FromDIP(SidebarProps::ElementSpacing())); m_top_sizer->Add( m_mode_view, 0, wxALIGN_CENTER_VERTICAL); } @@ -417,56 +431,6 @@ void Tab::create_preset_tab() else m_top_panel->Hide(); -#if 0 -#ifdef _MSW_DARK_MODE - // Sizer with buttons for mode changing - if (wxGetApp().tabs_as_menu()) -#endif - m_mode_sizer = new ModeSizer(panel, int (0.5*em_unit(this))); - - const float scale_factor = /*wxGetApp().*/em_unit(this)*0.1;// GetContentScaleFactor(); - m_hsizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(m_hsizer, 0, wxEXPAND | wxBOTTOM, 3); - m_hsizer->Add(m_presets_choice, 0, wxLEFT | wxRIGHT | wxTOP | wxALIGN_CENTER_VERTICAL, 3); - m_hsizer->AddSpacer(int(4*scale_factor)); - m_hsizer->Add(m_btn_save_preset, 0, wxALIGN_CENTER_VERTICAL); - m_hsizer->AddSpacer(int(4 * scale_factor)); - m_hsizer->Add(m_btn_delete_preset, 0, wxALIGN_CENTER_VERTICAL); - if (m_btn_edit_ph_printer) { - m_hsizer->AddSpacer(int(4 * scale_factor)); - m_hsizer->Add(m_btn_edit_ph_printer, 0, wxALIGN_CENTER_VERTICAL); - } - m_hsizer->AddSpacer(int(/*16*/8 * scale_factor)); - m_hsizer->Add(m_btn_hide_incompatible_presets, 0, wxALIGN_CENTER_VERTICAL); - m_hsizer->AddSpacer(int(8 * scale_factor)); - m_hsizer->Add(m_question_btn, 0, wxALIGN_CENTER_VERTICAL); - m_hsizer->AddSpacer(int(32 * scale_factor)); - m_hsizer->Add(m_undo_to_sys_btn, 0, wxALIGN_CENTER_VERTICAL); - m_hsizer->Add(m_undo_btn, 0, wxALIGN_CENTER_VERTICAL); - m_hsizer->AddSpacer(int(32 * scale_factor)); - m_hsizer->Add(m_search_btn, 0, wxALIGN_CENTER_VERTICAL); - m_hsizer->AddSpacer(int(8*scale_factor)); - m_hsizer->Add(m_btn_compare_preset, 0, wxALIGN_CENTER_VERTICAL); - m_hsizer->AddSpacer(int(16*scale_factor)); - // m_hsizer->AddStretchSpacer(32); - // StretchSpacer has a strange behavior under OSX, so - // There is used just additional sizer for m_mode_sizer with right alignment - if (m_mode_sizer) { - auto mode_sizer = new wxBoxSizer(wxVERTICAL); - // Don't set the 2nd parameter to 1, making the sizer rubbery scalable in Y axis may lead - // to wrong vertical size assigned to wxBitmapComboBoxes, see GH issue #7176. - mode_sizer->Add(m_mode_sizer, 0, wxALIGN_RIGHT); - m_hsizer->Add(mode_sizer, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, wxOSX ? 15 : 10); - } - - //Horizontal sizer to hold the tree and the selected page. - m_hsizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(m_hsizer, 1, wxEXPAND, 0); - - //left vertical sizer - m_left_sizer = new wxBoxSizer(wxVERTICAL); - m_hsizer->Add(m_left_sizer, 0, wxEXPAND | wxLEFT | wxTOP | wxBOTTOM, 3); -#endif // tree m_tabctrl = new TabCtrl(panel, wxID_ANY, wxDefaultPosition, wxSize(20 * m_em_unit, -1), wxTR_NO_BUTTONS | wxTR_HIDE_ROOT | wxTR_SINGLE | wxTR_NO_LINES | wxBORDER_NONE | wxWANTS_CHARS | wxTR_FULL_ROW_HIGHLIGHT); @@ -1277,11 +1241,6 @@ void Tab::update_mode() { m_mode = wxGetApp().get_mode(); - //BBS: GUI refactor - // update mode for ModeSizer - //if (m_mode_sizer) - // m_mode_sizer->SetMode(m_mode); - update_visibility(); update_changed_tree_ui(); @@ -1325,7 +1284,9 @@ void Tab::msw_rescale() bmp->msw_rescale(); if (m_mode_view) + { m_mode_view->Rescale(); + } if (m_detach_preset_btn) m_detach_preset_btn->msw_rescale(); @@ -2330,6 +2291,7 @@ void TabPrint::build() optgroup->append_single_option_line("xy_hole_compensation", "quality_settings_precision#x-y-compensation"); optgroup->append_single_option_line("xy_contour_compensation", "quality_settings_precision#x-y-compensation"); optgroup->append_single_option_line("elefant_foot_compensation", "quality_settings_precision#elephant-foot-compensation"); + optgroup->append_single_option_line("elefant_foot_layers_density", "quality_settings_precision#elephant-foot-compensation"); optgroup->append_single_option_line("elefant_foot_compensation_layers", "quality_settings_precision#elephant-foot-compensation"); optgroup->append_single_option_line("precise_outer_wall", "quality_settings_precision#precise-wall"); optgroup->append_single_option_line("precise_z_height", "quality_settings_precision#precise-z-height"); @@ -2356,6 +2318,8 @@ void TabPrint::build() optgroup->append_single_option_line("min_bead_width", "quality_settings_wall_generator#arachne"); optgroup->append_single_option_line("min_feature_size", "quality_settings_wall_generator#arachne"); optgroup->append_single_option_line("min_length_factor", "quality_settings_wall_generator#arachne"); + optgroup->append_single_option_line("wall_maximum_resolution", "quality_settings_wall_generator#arachne"); + optgroup->append_single_option_line("wall_maximum_deviation", "quality_settings_wall_generator#arachne"); optgroup = page->new_optgroup(L("Walls and surfaces"), L"param_wall_surface"); optgroup->append_single_option_line("wall_sequence", "quality_settings_wall_and_surfaces#walls-printing-order"); diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp index ad0e784050..273fc47f6e 100644 --- a/src/slic3r/GUI/Tab.hpp +++ b/src/slic3r/GUI/Tab.hpp @@ -44,6 +44,8 @@ #include "Widgets/ComboBox.hpp" class TabCtrl; +class ModeSwitchButton; +class SwitchButton; namespace Slic3r { @@ -163,8 +165,6 @@ protected: wxScrolledWindow* m_page_view {nullptr}; //wxBoxSizer* m_page_sizer {nullptr}; - //ModeSizer* m_mode_sizer {nullptr}; - struct PresetDependencies { Preset::Type type = Preset::TYPE_INVALID; ::CheckBox* checkbox = nullptr; @@ -304,7 +304,7 @@ public: // 3. propagate changed configuration to the Plater when (m_update_cnt == 0) only int m_update_cnt = 0; - SwitchButton *m_mode_view = nullptr; + ModeSwitchButton *m_mode_view = nullptr; SwitchButton *m_extruder_switch = nullptr; public: diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 743401626d..a6936e634c 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -84,7 +84,7 @@ ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_AN BOOST_LOG_TRIVIAL(info) << "login url = " << TargetUrl.ToStdString(); - m_bbl_user_agent = wxString::Format("BBL-Slicer/v%s", SLIC3R_VERSION); + m_bbl_user_agent = wxString::Format("BBL-Slicer/v%s", wxGetApp().get_bbl_client_version()); // set the frame icon diff --git a/src/slic3r/GUI/Widgets/SwitchButton.cpp b/src/slic3r/GUI/Widgets/SwitchButton.cpp index bedc068e1b..aedd868f8f 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.cpp @@ -3,6 +3,8 @@ #include "StaticBox.hpp" #include "../wxExtensions.hpp" +#include "../GUI_App.hpp" +#include "slic3r/GUI/I18N.hpp" #include "../Utils/MacDarkMode.hpp" #include "../Utils/WxFontUtils.hpp" #ifdef __APPLE__ @@ -156,10 +158,10 @@ void SwitchButton::Rescale() #endif dc2.SetBrush(wxBrush(track_color.colorForStates(state))); dc2.SetPen(wxPen(track_color.colorForStates(state))); - dc2.DrawRoundedRectangle(wxRect({0, 0}, trackSize), trackSize.y / 2); + dc2.DrawRoundedRectangle(wxRect({0, 0}, trackSize), trackSize.y / 2.0); dc2.SetBrush(wxBrush(thumb_color.colorForStates(StateColor::Checked | StateColor::Enabled))); dc2.SetPen(wxPen(thumb_color.colorForStates(StateColor::Checked | StateColor::Enabled))); - dc2.DrawRoundedRectangle(wxRect({ i == 0 ? BS : (trackSize.x - thumbSize.x - BS), BS}, thumbSize), thumbSize.y / 2); + dc2.DrawRoundedRectangle(wxRect({ i == 0 ? BS : (trackSize.x - thumbSize.x - BS), BS}, thumbSize), thumbSize.y / 2.0); } memdc.SetTextForeground(text_color.colorForStates(state ^ StateColor::Checked)); auto text_y = BS + (thumbSize.y - textSize[0].y) / 2; @@ -202,6 +204,184 @@ void SwitchButton::update() SetBitmap((GetValue() ? m_on : m_off).bmp()); } +ModeSwitchButton::ModeSwitchButton(wxWindow* parent, wxWindowID id) +{ + background_color = StateColor( + std::make_pair(wxColour(0xF1, 0xF1, 0xF1), (int) StateColor::Disabled), + std::make_pair(wxColour(0xE3, 0xE3, 0xE3), (int) StateColor::Pressed), + std::make_pair(wxColour(0xD9, 0xD9, 0xD9), (int) StateColor::Normal)); + border_color = StateColor( + std::make_pair(wxColour(0xEA, 0xEA, 0xEA), (int) StateColor::Disabled), + std::make_pair(wxColour(0xBC, 0xBC, 0xBC), (int) StateColor::Hovered), + std::make_pair(wxColour(0xC8, 0xC8, 0xC8), (int) StateColor::Focused), + std::make_pair(wxColour(0xCE, 0xCE, 0xCE), (int) StateColor::Normal)); + + StaticBox::Create(parent, id, wxDefaultPosition, wxDefaultSize, 0); + SetBackgroundColour(StaticBox::GetParentBackgroundColor(parent)); + SetCursor(wxCursor(wxCURSOR_HAND)); + + m_tooltips[0] = _L("Simple settings"); + m_tooltips[1] = _L("Advanced settings"); + m_tooltips[2] = _L("Expert settings"); + + Bind(wxEVT_LEFT_DOWN, &ModeSwitchButton::mouseDown, this); + Bind(wxEVT_LEFT_UP, &ModeSwitchButton::mouseReleased, this); + Bind(wxEVT_LEFT_DCLICK, &ModeSwitchButton::mouseDown, this); + Bind(wxEVT_MOUSE_CAPTURE_LOST, &ModeSwitchButton::mouseCaptureLost, this); + + Rescale(); +} + +void ModeSwitchButton::SetSelection(int selection) +{ + m_selection = std::clamp(selection, 0, 2); + update_tooltip(); + Refresh(); +} + +void ModeSwitchButton::SelectAndNotify(int selection) +{ + if (!IsEnabled()) + return; + + SetSelection(selection); + Slic3r::GUI::wxGetApp().save_mode(m_selection); +} + +void ModeSwitchButton::Rescale() +{ + const wxSize button_size = FromDIP(wxSize(48, 20)); + SetMinSize(button_size); + SetMaxSize(button_size); + SetSize(button_size); + SetCornerRadius(button_size.y / 2.0); + Refresh(); +} + +bool ModeSwitchButton::Enable(bool enable /* = true */) +{ + const bool changed = StaticBox::Enable(enable); + if (changed) + Refresh(); + return changed; +} + +void ModeSwitchButton::doRender(wxDC& dc) +{ + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(GetBackgroundColour())); + dc.DrawRectangle(GetClientRect()); + + const wxRect bounds = GetClientRect().Deflate(1); + if (bounds.width <= 0 || bounds.height <= 0) + return; + + const int states = state_handler.states(); + const bool hovered = (states & StateHandler::Hovered) != 0; + const bool focused = (states & StateHandler::Focused) != 0; + const bool disabled = !IsEnabled(); + + const wxColour track_fill = disabled ? wxColour(0xD0, 0xD0, 0xD4) : + m_pressed ? wxColour(0x5A, 0x5D, 0x64) : wxColour(0x66, 0x69, 0x70); + const wxColour track_border = disabled ? wxColour(0xDD, 0xDD, 0xE0) : + focused ? wxColour("#009688") : + hovered ? wxColour(0x7A, 0x7D, 0x84) : wxColour(0x75, 0x78, 0x7F); + const wxColour active_fill = disabled ? wxColour(0x9E, 0xBE, 0xB9) : + m_pressed ? wxColour(0x00877B) : wxColour("#009688"); + const wxColour active_dot = disabled ? wxColour(0xEC, 0xF4, 0xF2) : wxColour(0xB7, 0xEB, 0xE3); + const wxColour inactive_dot = disabled ? wxColour(0xF2, 0xF2, 0xF4) : wxColour(0xB5, 0xB7, 0xBD); + const wxColour thumb_fill = disabled ? wxColour(0xFA, 0xFA, 0xFA) : *wxWHITE; + const wxColour thumb_border = disabled ? wxColour(0xE7, 0xE7, 0xEA) : wxColour(0xDD, 0xDF, 0xE3); + + dc.SetPen(wxPen(track_border, 1)); + dc.SetBrush(wxBrush(track_fill)); + dc.DrawRoundedRectangle(bounds, bounds.height / 2.0); + + const wxRect thumb = thumb_rect_for(m_selection); + const int fill_right = std::min(bounds.GetRight(), thumb.GetX() + thumb.GetWidth() / 2 + FromDIP(2)); + wxRect active(bounds.x, bounds.y, fill_right - bounds.x + 1, bounds.height); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(active_fill)); + dc.DrawRoundedRectangle(active, bounds.height / 2.0); + + const int dot_radius = std::max(FromDIP(1), thumb.height / 7); + for (int idx = 0; idx < 3; ++idx) { + if (idx == m_selection) + continue; + + const wxRect slot = thumb_rect_for(idx); + const wxPoint center(slot.GetX() + slot.GetWidth() / 2, slot.GetY() + slot.GetHeight() / 2); + dc.SetBrush(wxBrush(idx < m_selection ? active_dot : inactive_dot)); + dc.DrawCircle(center, dot_radius); + } + + dc.SetPen(wxPen(thumb_border, 1)); + dc.SetBrush(wxBrush(thumb_fill)); + dc.DrawRoundedRectangle(thumb, thumb.height / 2.0); +} + +void ModeSwitchButton::mouseDown(wxMouseEvent& event) +{ + if (!IsEnabled()) { + event.Skip(); + return; + } + + m_pressed = true; + if (!HasCapture()) + CaptureMouse(); + + Refresh(); + + event.Skip(); +} + +void ModeSwitchButton::mouseReleased(wxMouseEvent& event) +{ + if (m_pressed) { + m_pressed = false; + if (HasCapture()) + ReleaseMouse(); + + if (GetClientRect().Contains(event.GetPosition())) + SelectAndNotify(hit_test_selection(event.GetPosition())); + + Refresh(); + } + + event.Skip(); +} + +void ModeSwitchButton::mouseCaptureLost(wxMouseCaptureLostEvent& event) +{ + m_pressed = false; + Refresh(); + event.Skip(); +} + +int ModeSwitchButton::hit_test_selection(const wxPoint& point) const +{ + const int width = std::max(1, GetClientSize().x); + const int x = std::clamp(point.x, 0, width - 1); + return std::clamp((x * 3) / width, 0, 2); +} + +wxRect ModeSwitchButton::thumb_rect_for(int selection) const +{ + const wxRect bounds = GetClientRect().Deflate(3); + const int thumb_diameter = std::max(FromDIP(10), bounds.height - FromDIP(2)); + const int y = bounds.y + (bounds.height - thumb_diameter) / 2; + + const int travel = std::max(0, bounds.width - thumb_diameter); + const int x = bounds.x + (travel * std::clamp(selection, 0, 2)) / 2; + return wxRect(x, y, thumb_diameter, thumb_diameter); +} + +void ModeSwitchButton::update_tooltip() +{ + SetToolTip(m_tooltips[m_selection]); +} + SwitchBoard::SwitchBoard(wxWindow *parent, wxString leftL, wxString right, wxSize size) : wxWindow(parent, wxID_ANY, wxDefaultPosition, size) { @@ -355,24 +535,14 @@ void SwitchBoard::on_left_down(wxMouseEvent &evt) wxPostEvent(this, event); } -void SwitchBoard::Enable() +bool SwitchBoard::Enable(bool enable /* = true */) { - if (is_enable == true) + if (is_enable == enable) { - return; + return false; } - is_enable = true; - Refresh(); -} - -void SwitchBoard::Disable() -{ - if (is_enable == false) - { - return; - } - - is_enable = false; + is_enable = enable; Refresh(); + return true; } \ No newline at end of file diff --git a/src/slic3r/GUI/Widgets/SwitchButton.hpp b/src/slic3r/GUI/Widgets/SwitchButton.hpp index 18a2a2c55d..077ee86597 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.hpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.hpp @@ -3,10 +3,9 @@ #include "../wxExtensions.hpp" #include "StateColor.hpp" +#include "StaticBox.hpp" #include -#include "Label.hpp" -#include "Button.hpp" wxDECLARE_EVENT(wxCUSTOMEVT_SWITCH_POS, wxCommandEvent); @@ -46,6 +45,37 @@ private: StateColor thumb_color; }; +class ModeSwitchButton : public StaticBox +{ +public: + ModeSwitchButton(wxWindow* parent = nullptr, wxWindowID id = wxID_ANY); + + int GetSelection() const { return m_selection; } + void SetSelection(int selection); + void SelectAndNotify(int selection); + + void Rescale(); + void msw_rescale() { Rescale(); } + + bool Enable(bool enable = true) override; + +protected: + void doRender(wxDC& dc) override; + +private: + void mouseDown(wxMouseEvent& event); + void mouseReleased(wxMouseEvent& event); + void mouseCaptureLost(wxMouseCaptureLostEvent& event); + int hit_test_selection(const wxPoint& point) const; + wxRect thumb_rect_for(int selection) const; + void update_tooltip(); + +private: + int m_selection { 0 }; + bool m_pressed { false }; + wxString m_tooltips[3]; +}; + class SwitchBoard : public wxWindow { public: @@ -62,8 +92,8 @@ public: void* client_data = nullptr;/*MachineObject* in StatusPanel*/ public: - void Enable(); - void Disable(); + bool Enable(bool enable = true) override; + bool Disable() { return Enable(false); } bool IsEnabled(){return is_enable;}; void SetClientData(void* data) { client_data = data; }; diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp index 82933b6069..d31c168ded 100644 --- a/src/slic3r/GUI/Widgets/WebView.cpp +++ b/src/slic3r/GUI/Widgets/WebView.cpp @@ -276,7 +276,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url) #ifdef __WIN32__ webView->SetUserAgent(wxString::Format("Mozilla/5.0 (Windows NT 10.0; Win64; x64) " "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.52 BBL-Slicer/v%s (%s) BBL-Language/%s", - SLIC3R_VERSION, Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light", language_code.mb_str())); + Slic3r::GUI::wxGetApp().get_bbl_client_version(), Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light", language_code.mb_str())); webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); // We register the wxfs:// protocol for testing purposes webView->RegisterHandler(wxSharedPtr(new wxWebViewArchiveHandler("bbl"))); @@ -294,7 +294,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url) } webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); webView->SetUserAgent(wxString::Format("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) BBL-Slicer/v%s (%s) BBL-Language/%s", - SLIC3R_VERSION, Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light", language_code.mb_str())); + Slic3r::GUI::wxGetApp().get_bbl_client_version(), Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light", language_code.mb_str())); #endif #ifdef __WXMAC__ WKWebView * wkWebView = (WKWebView *) webView->GetNativeBackend(); @@ -399,7 +399,7 @@ void WebView::RecreateAll() language_code = language_code.ToStdString(); for (auto webView : g_webviews) { webView->SetUserAgent(wxString::Format("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) BBL-Slicer/v%s (%s) BBL-Language/%s", - SLIC3R_VERSION, dark ? "dark" : "light", language_code.mb_str())); + Slic3r::GUI::wxGetApp().get_bbl_client_version(), dark ? "dark" : "light", language_code.mb_str())); webView->Reload(); } } diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index ee256a9ace..66ad109fab 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -413,15 +413,6 @@ int em_unit(wxWindow* win) return Slic3r::GUI::wxGetApp().em_unit(); } -int mode_icon_px_size() -{ -#ifdef __APPLE__ - return 10; -#else - return 12; -#endif -} - wxBitmap create_menu_bitmap(const std::string& bmp_name) { return create_scaled_bitmap(bmp_name, nullptr, 16, false, "", true); @@ -895,141 +886,6 @@ void LockButton::update_button_bitmaps() -// ---------------------------------------------------------------------------- -// ModeButton -// ---------------------------------------------------------------------------- - -ModeButton::ModeButton( wxWindow * parent, - wxWindowID id, - const std::string& icon_name /* = ""*/, - const wxString& mode /* = wxEmptyString*/, - const wxSize& size /* = wxDefaultSize*/, - const wxPoint& pos /* = wxDefaultPosition*/) : - ScalableButton(parent, id, icon_name, mode, size, pos, wxBU_EXACTFIT) -{ - Init(mode); -} - -ModeButton::ModeButton( wxWindow* parent, - const wxString& mode/* = wxEmptyString*/, - const std::string& icon_name/* = ""*/, - int px_cnt/* = 16*/) : - ScalableButton(parent, wxID_ANY, ScalableBitmap(parent, icon_name, px_cnt), mode, wxBU_EXACTFIT) -{ - Init(mode); -} - -void ModeButton::Init(const wxString &mode) -{ - std::string mode_str = std::string(mode.ToUTF8()); - //m_tt_focused = Slic3r::GUI::from_u8((boost::format(_utf8(L("Switch to the %s mode"))) % mode_str).str()); - //m_tt_selected = Slic3r::GUI::from_u8((boost::format(_utf8(L("Current mode is %s"))) % mode_str).str()); - - SetBitmapMargins(3, 0); - - //button events - Bind(wxEVT_BUTTON, &ModeButton::OnButton, this); - Bind(wxEVT_ENTER_WINDOW, &ModeButton::OnEnterBtn, this); - Bind(wxEVT_LEAVE_WINDOW, &ModeButton::OnLeaveBtn, this); -} - -void ModeButton::OnButton(wxCommandEvent& event) -{ - m_is_selected = true; - focus_button(m_is_selected); - - event.Skip(); -} - -void ModeButton::SetState(const bool state) -{ - m_is_selected = state; - focus_button(m_is_selected); - SetToolTip(state ? m_tt_selected : m_tt_focused); -} - -void ModeButton::focus_button(const bool focus) -{ - const wxFont& new_font = focus ? - Slic3r::GUI::wxGetApp().bold_font() : - Slic3r::GUI::wxGetApp().normal_font(); - - SetFont(new_font); -#ifdef _WIN32 - GetParent()->Refresh(); // force redraw a background of the selected mode button -#else - SetForegroundColour(wxSystemSettings::GetColour(focus ? wxSYS_COLOUR_BTNTEXT : -#if defined (__linux__) && defined (__WXGTK3__) - wxSYS_COLOUR_GRAYTEXT -#elif defined (__linux__) && defined (__WXGTK2__) - wxSYS_COLOUR_BTNTEXT -#else - wxSYS_COLOUR_BTNSHADOW -#endif - )); -#endif /* no _WIN32 */ - - Refresh(); - Update(); -} - - -// ---------------------------------------------------------------------------- -// ModeSizer -// ---------------------------------------------------------------------------- - -ModeSizer::ModeSizer(wxWindow *parent, int hgap/* = 0*/) : - wxFlexGridSizer(3, 0, hgap), - m_parent(parent), - m_hgap_unscaled((double)(hgap)/em_unit(parent)) -{ - SetFlexibleDirection(wxHORIZONTAL); - - std::vector < std::pair < wxString, std::string >> buttons = { - //{_(L("Simple")), "mode_simple"}, - //{_(L("Advanced")), "mode_advanced"}, - //{_CTX(L_CONTEXT("Advanced", "Mode"), "Mode"), "mode_advanced"} - }; - - auto modebtnfn = [](wxCommandEvent &event, int mode_id) { - Slic3r::GUI::wxGetApp().save_mode(mode_id); - event.Skip(); - }; - - m_mode_btns.reserve(3); - for (const auto& button : buttons) { - m_mode_btns.push_back(new ModeButton(parent, button.first, button.second, mode_icon_px_size())); - - m_mode_btns.back()->Bind(wxEVT_BUTTON, std::bind(modebtnfn, std::placeholders::_1, int(m_mode_btns.size() - 1))); - Add(m_mode_btns.back()); - } -} - -void ModeSizer::SetMode(const int mode) -{ - for (size_t m = 0; m < m_mode_btns.size(); m++) - m_mode_btns[m]->SetState(int(m) == mode); -} - -void ModeSizer::set_items_flag(int flag) -{ - for (wxSizerItem* item : this->GetChildren()) - item->SetFlag(flag); -} - -void ModeSizer::set_items_border(int border) -{ - for (wxSizerItem* item : this->GetChildren()) - item->SetBorder(border); -} - -void ModeSizer::msw_rescale() -{ - this->SetHGap(std::lround(m_hgap_unscaled * em_unit(m_parent))); - for (size_t m = 0; m < m_mode_btns.size(); m++) - m_mode_btns[m]->msw_rescale(); -} - // ---------------------------------------------------------------------------- // MenuWithSeparators // ---------------------------------------------------------------------------- diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp index 4681fb4822..502614eb92 100644 --- a/src/slic3r/GUI/wxExtensions.hpp +++ b/src/slic3r/GUI/wxExtensions.hpp @@ -52,7 +52,6 @@ class wxDialog; void edit_tooltip(wxString& tooltip); void msw_buttons_rescale(wxDialog* dlg, const int em_unit, const std::vector& btn_ids); int em_unit(wxWindow* win); -int mode_icon_px_size(); wxBitmap create_menu_bitmap(const std::string& bmp_name); @@ -285,76 +284,6 @@ private: }; -// ---------------------------------------------------------------------------- -// ModeButton -// ---------------------------------------------------------------------------- - -class ModeButton : public ScalableButton -{ -public: - ModeButton( - wxWindow* parent, - wxWindowID id, - const std::string& icon_name = "", - const wxString& mode = wxEmptyString, - const wxSize& size = wxDefaultSize, - const wxPoint& pos = wxDefaultPosition); - - ModeButton( - wxWindow* parent, - const wxString& mode = wxEmptyString, - const std::string& icon_name = "", - int px_cnt = 16); - - ~ModeButton() {} - - void Init(const wxString& mode); - - void OnButton(wxCommandEvent& event); - void OnEnterBtn(wxMouseEvent& event) { focus_button(true); event.Skip(); } - void OnLeaveBtn(wxMouseEvent& event) { focus_button(m_is_selected); event.Skip(); } - - void SetState(const bool state); - bool is_selected() { return m_is_selected; } - -protected: - void focus_button(const bool focus); - -private: - bool m_is_selected = false; - - wxString m_tt_selected; - wxString m_tt_focused; -}; - - - -// ---------------------------------------------------------------------------- -// ModeSizer -// ---------------------------------------------------------------------------- - -class ModeSizer : public wxFlexGridSizer -{ -public: - ModeSizer( wxWindow *parent, int hgap = 0); - ~ModeSizer() {} - - void SetMode(const /*ConfigOptionMode*/int mode); - - void set_items_flag(int flag); - void set_items_border(int border); - - void msw_rescale(); - const std::vector& get_btns() { return m_mode_btns; } - -private: - std::vector m_mode_btns; - wxWindow* m_parent {nullptr}; - double m_hgap_unscaled; -}; - - - // ---------------------------------------------------------------------------- // MenuWithSeparators // ---------------------------------------------------------------------------- diff --git a/src/slic3r/Utils/BBLCloudServiceAgent.cpp b/src/slic3r/Utils/BBLCloudServiceAgent.cpp index 5f20549db2..ec54041b57 100644 --- a/src/slic3r/Utils/BBLCloudServiceAgent.cpp +++ b/src/slic3r/Utils/BBLCloudServiceAgent.cpp @@ -628,6 +628,17 @@ int BBLCloudServiceAgent::get_my_profile(std::string token, unsigned int* http_c return -1; } +int BBLCloudServiceAgent::get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body) +{ + auto& plugin = BBLNetworkPlugin::instance(); + auto agent = plugin.get_agent(); + auto func = plugin.get_get_my_token(); + if (func && agent) { + return func(agent, ticket, http_code, http_body); + } + return -1; +} + // ============================================================================ // Analytics & Tracking // ============================================================================ diff --git a/src/slic3r/Utils/BBLCloudServiceAgent.hpp b/src/slic3r/Utils/BBLCloudServiceAgent.hpp index 0c960cf5d7..b4ca79be82 100644 --- a/src/slic3r/Utils/BBLCloudServiceAgent.hpp +++ b/src/slic3r/Utils/BBLCloudServiceAgent.hpp @@ -98,6 +98,7 @@ public: int get_model_mall_home_url(std::string* url) override; int get_model_mall_detail_url(std::string* url, std::string id) override; int get_my_profile(std::string token, unsigned int* http_code, std::string* http_body) override; + int get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body) override; // Analytics & Tracking int track_enable(bool enable) override; diff --git a/src/slic3r/Utils/BBLNetworkPlugin.cpp b/src/slic3r/Utils/BBLNetworkPlugin.cpp index e3b7f46be7..1db8cd5ed9 100644 --- a/src/slic3r/Utils/BBLNetworkPlugin.cpp +++ b/src/slic3r/Utils/BBLNetworkPlugin.cpp @@ -176,7 +176,8 @@ int BBLNetworkPlugin::initialize(bool using_backup, const std::string& version) << ", version=" << (loaded_version.empty() ? "unknown" : loaded_version) << ", send_message=" << (m_send_message ? "loaded" : "null") << ", start_print=" << (m_start_print ? "loaded" : "null") - << ", start_local_print=" << (m_start_local_print ? "loaded" : "null"); + << ", start_local_print=" << (m_start_local_print ? "loaded" : "null") + << ", get_my_token=" << (m_get_my_token ? "loaded" : "null"); return 0; } @@ -622,6 +623,7 @@ void BBLNetworkPlugin::load_all_function_pointers() m_get_model_mall_home_url = reinterpret_cast(get_function("bambu_network_get_model_mall_home_url")); m_get_model_mall_detail_url = reinterpret_cast(get_function("bambu_network_get_model_mall_detail_url")); m_get_my_profile = reinterpret_cast(get_function("bambu_network_get_my_profile")); + m_get_my_token = reinterpret_cast(get_function("bambu_network_get_my_token")); m_track_enable = reinterpret_cast(get_function("bambu_network_track_enable")); m_track_remove_files = reinterpret_cast(get_function("bambu_network_track_remove_files")); m_track_event = reinterpret_cast(get_function("bambu_network_track_event")); @@ -725,6 +727,7 @@ void BBLNetworkPlugin::clear_all_function_pointers() m_get_model_mall_home_url = nullptr; m_get_model_mall_detail_url = nullptr; m_get_my_profile = nullptr; + m_get_my_token = nullptr; m_track_enable = nullptr; m_track_remove_files = nullptr; m_track_event = nullptr; diff --git a/src/slic3r/Utils/BBLNetworkPlugin.hpp b/src/slic3r/Utils/BBLNetworkPlugin.hpp index 523d3962d6..661d968858 100644 --- a/src/slic3r/Utils/BBLNetworkPlugin.hpp +++ b/src/slic3r/Utils/BBLNetworkPlugin.hpp @@ -107,6 +107,7 @@ typedef int (*func_get_subtask)(void *agent, BBLModelTask* task, OnGetSubTaskFn typedef int (*func_get_model_mall_home_url)(void *agent, std::string* url); typedef int (*func_get_model_mall_detail_url)(void *agent, std::string* url, std::string id); typedef int (*func_get_my_profile)(void *agent, std::string token, unsigned int *http_code, std::string *http_body); +typedef int (*func_get_my_token)(void *agent, std::string ticket, unsigned int *http_code, std::string *http_body); typedef int (*func_track_enable)(void *agent, bool enable); typedef int (*func_track_remove_files)(void *agent); typedef int (*func_track_event)(void *agent, std::string evt_key, std::string content); @@ -361,6 +362,7 @@ public: func_get_model_mall_home_url get_get_model_mall_home_url() const { return m_get_model_mall_home_url; } func_get_model_mall_detail_url get_get_model_mall_detail_url() const { return m_get_model_mall_detail_url; } func_get_my_profile get_get_my_profile() const { return m_get_my_profile; } + func_get_my_token get_get_my_token() const { return m_get_my_token; } func_track_enable get_track_enable() const { return m_track_enable; } func_track_remove_files get_track_remove_files() const { return m_track_remove_files; } func_track_event get_track_event() const { return m_track_event; } @@ -496,6 +498,7 @@ private: func_get_model_mall_home_url m_get_model_mall_home_url{nullptr}; func_get_model_mall_detail_url m_get_model_mall_detail_url{nullptr}; func_get_my_profile m_get_my_profile{nullptr}; + func_get_my_token m_get_my_token{nullptr}; func_track_enable m_track_enable{nullptr}; func_track_remove_files m_track_remove_files{nullptr}; func_track_event m_track_event{nullptr}; diff --git a/src/slic3r/Utils/ICloudServiceAgent.hpp b/src/slic3r/Utils/ICloudServiceAgent.hpp index 5a5d02cd38..bb1e9afd09 100644 --- a/src/slic3r/Utils/ICloudServiceAgent.hpp +++ b/src/slic3r/Utils/ICloudServiceAgent.hpp @@ -353,6 +353,14 @@ public: */ virtual int get_my_profile(std::string token, unsigned int* http_code, std::string* http_body) = 0; + /** + * Exchange a one-time login ticket (from a third-party OAuth callback) + * for token + profile JSON. Used by the localhost callback handler when + * the auth server redirects with ?ticket=...&redirect_url=... instead of + * passing tokens directly in the URL. + */ + virtual int get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body) = 0; + // ======================================================================== // Analytics & Tracking // ======================================================================== diff --git a/src/slic3r/Utils/NetworkAgent.cpp b/src/slic3r/Utils/NetworkAgent.cpp index 1ec0ef437d..a554e9aa04 100644 --- a/src/slic3r/Utils/NetworkAgent.cpp +++ b/src/slic3r/Utils/NetworkAgent.cpp @@ -781,6 +781,12 @@ int NetworkAgent::get_my_profile(std::string token, unsigned int* http_code, std return -1; } +int NetworkAgent::get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body) +{ + if (m_cloud_agent) return m_cloud_agent->get_my_token(ticket, http_code, http_body); + return -1; +} + int NetworkAgent::track_enable(bool enable) { this->enable_track = enable; diff --git a/src/slic3r/Utils/NetworkAgent.hpp b/src/slic3r/Utils/NetworkAgent.hpp index 402497fc19..ce3590ad86 100644 --- a/src/slic3r/Utils/NetworkAgent.hpp +++ b/src/slic3r/Utils/NetworkAgent.hpp @@ -144,6 +144,7 @@ public: int get_model_mall_home_url(std::string* url); int get_model_mall_detail_url(std::string* url, std::string id); int get_my_profile(std::string token, unsigned int* http_code, std::string* http_body); + int get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body); int track_enable(bool enable); int track_remove_files(); int track_event(std::string evt_key, std::string content); diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp index 524ac72ed8..ecb3e462d0 100644 --- a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp +++ b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp @@ -2474,6 +2474,14 @@ int OrcaCloudServiceAgent::get_my_profile(std::string token, unsigned int* http_ return BAMBU_NETWORK_SUCCESS; } +int OrcaCloudServiceAgent::get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body) +{ + BOOST_LOG_TRIVIAL(debug) << "OrcaCloudServiceAgent: get_my_token (stub) - Orca cloud uses code-based OAuth, not tickets"; + if (http_code) *http_code = 0; + if (http_body) *http_body = ""; + return -1; +} + int OrcaCloudServiceAgent::track_enable(bool enable) { std::lock_guard lock(state_mutex); diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.hpp b/src/slic3r/Utils/OrcaCloudServiceAgent.hpp index 510829c717..140d8da9e0 100644 --- a/src/slic3r/Utils/OrcaCloudServiceAgent.hpp +++ b/src/slic3r/Utils/OrcaCloudServiceAgent.hpp @@ -199,6 +199,7 @@ public: int get_model_mall_home_url(std::string* url) override; int get_model_mall_detail_url(std::string* url, std::string id) override; int get_my_profile(std::string token, unsigned int* http_code, std::string* http_body) override; + int get_my_token(std::string ticket, unsigned int* http_code, std::string* http_body) override; // ======================================================================== // ICloudServiceAgent Interface Implementation - Analytics & Tracking