diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index a530929e9d..4744392fa9 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -4,6 +4,9 @@ on: push: branches: - main + pull_request: + branches: + - main jobs: appimage-builder: diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml index 72af519b5d..01c4017d8b 100644 --- a/.github/workflows/build_mac_arm64.yml +++ b/.github/workflows/build_mac_arm64.yml @@ -4,6 +4,9 @@ on: push: branches: - main + pull_request: + branches: + - main jobs: build_osx_arm64: @@ -73,7 +76,7 @@ jobs: export ver=$(grep '^#define SoftFever_VERSION' ./build_arm64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3) ver="_V${ver//\"}" cd ${{ github.workspace }}/build_arm64/OrcaSlicer - zip -FSrq OrcaSlicer${ver}_nightly_Mac_AppleSilicon_signed.zip ./OrcaSlicer.app + zip -FSrq OrcaSlicer${ver}_Mac_AppleSilicon_signed.zip ./OrcaSlicer.app # (wip: staple failed, error 65) # - name: Notarize the app diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml index 04ad784cbb..483ab88135 100644 --- a/.github/workflows/build_mac_x64.yml +++ b/.github/workflows/build_mac_x64.yml @@ -4,6 +4,9 @@ on: push: branches: - main + pull_request: + branches: + - main jobs: build_osx_x86_64: @@ -73,7 +76,7 @@ jobs: export ver=$(grep '^#define SoftFever_VERSION' ./build_x86_64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3) ver="_V${ver//\"}" cd ${{ github.workspace }}/build_x86_64/OrcaSlicer - zip -FSrq OrcaSlicer${ver}_nightly_Mac_Intel_signed.zip OrcaSlicer.app + zip -FSrq OrcaSlicer${ver}_Mac_Intel_signed.zip OrcaSlicer.app # (wip: staple failed, error 65) # - name: Notarize the app diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 13ae42ec33..5e14527058 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -4,6 +4,9 @@ on: push: branches: - main + pull_request: + branches: + - main jobs: build_win64: diff --git a/bbl/i18n/OrcaSlicer.pot b/bbl/i18n/OrcaSlicer.pot index dfe8d99c54..129d203cbd 100644 --- a/bbl/i18n/OrcaSlicer.pot +++ b/bbl/i18n/OrcaSlicer.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -692,6 +692,18 @@ msgstr "" msgid "Load..." msgstr "" +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "" @@ -6371,14 +6383,6 @@ msgid "" "printing." msgstr "" -msgid "Max Radius" -msgstr "" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" - msgid "Extruder Color" msgstr "" diff --git a/bbl/i18n/cs/OrcaSlicer_cs.po b/bbl/i18n/cs/OrcaSlicer_cs.po index 51a60ae64a..b3aa2aaf05 100755 --- a/bbl/i18n/cs/OrcaSlicer_cs.po +++ b/bbl/i18n/cs/OrcaSlicer_cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-16 21:34+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "PO-Revision-Date: 2023-03-31 22:48+0200\n" "Last-Translator: Momo \n" "Language-Team: \n" @@ -715,6 +715,18 @@ msgstr "Upravit text" msgid "Load..." msgstr "Načíst..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Kostka" @@ -2480,8 +2492,8 @@ msgstr "Procento" msgid "Layer Height (mm)" msgstr "Výška vrstvy (mm)" -msgid "Line Flushed (mm)" -msgstr "Čistící Linka" +msgid "Line Width (mm)" +msgstr "" msgid "Speed (mm/s)" msgstr "Rychlost (mm/s)" @@ -3800,6 +3812,9 @@ msgstr "Nastavení filamentu" msgid "Printer settings" msgstr "Nastavení tiskárny" +msgid "Untitled" +msgstr "Bez názvu" + #, boost-format msgid " plate %1%:" msgstr " podložka %1%:" @@ -3894,9 +3909,6 @@ msgstr "" "Aktualizujte prosím Orca Slicer nebo restartujte Orca Slicer a zkontrolujte, " "zda existuje aktualizace systémupředvolby." -msgid "Untitled" -msgstr "Bez názvu" - #, boost-format msgid "Do you want to save changes to \"%1%\"?" msgstr "Chcete uložit změny do \"%1%\"?" @@ -4523,6 +4535,9 @@ msgstr "Stejné jako globální tisková sekvence" msgid "Print sequence" msgstr "Tisková sekvence" +msgid "Plate name" +msgstr "" + msgid "Same as Global Bed Type" msgstr "Stejné jako globální typ postele" @@ -4943,8 +4958,8 @@ msgstr "" msgid "" "When recording timelapse without toolhead, it is recommended to add a " "\"Timelapse Wipe Tower\" \n" -"by right-click the empty position of build plate and choose \"Add " -"Primitive\"->\"Timelapse Wipe Tower\"." +"by right-click the empty position of build plate and choose \"Add Primitive" +"\"->\"Timelapse Wipe Tower\"." msgstr "" "Při nahrávání timelapse bez nástrojové hlavy se doporučuje přidat " "\"Timelapse Wipe Tower\" \n" @@ -5959,9 +5974,6 @@ msgstr "Spodní plocha" msgid "Bridge" msgstr "Most" -msgid "Skirt" -msgstr "Obrys" - msgid "Gap infill" msgstr "Výplň mezery" @@ -6882,16 +6894,6 @@ msgstr "" "Poloměr vůle kolem extruderu. Používá se pro zamezení kolizi při tisku " "vedlejších objektů." -msgid "Max Radius" -msgstr "Max. poloměr" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" -"Maximální poloměr vůle kolem extrudéru. Používá se pro zamezení kolizi při " -"tisku vedlejších objektů." - msgid "Extruder Color" msgstr "Barva extruderu" @@ -7413,6 +7415,12 @@ msgstr "" "pro Octoprint plugin CancelObject. Nastavení NENÍ kompatibilní se Single " "Extruder Multi Material konfigurací a s čištěním trysky do objektu / výplně." +msgid "Exclude objects" +msgstr "" + +msgid "Enable this option to add EXCLUDE OBJECT command in g-code" +msgstr "" + msgid "Verbose G-code" msgstr "Komentáře do G-kódu" @@ -7859,9 +7867,6 @@ msgstr "" "mezera mezi tryskou a tiskem. Zabraňuje tomu, aby tryska zasáhla tisk při " "pohybu. Použití spirálové linky ke zvednutí z může zabránit stringování" -msgid "Z Hop Type" -msgstr "Typ Z hop" - msgid "Z hop type" msgstr "Typ Z hop" @@ -7915,6 +7920,9 @@ msgstr "" "poradil s retrakcí. Toto je podporováno pouze v posledních verzích firmwaru " "Marlin." +msgid "Show auto-calibration marks" +msgstr "" + msgid "Seam position" msgstr "Pozice švu" @@ -8090,11 +8098,9 @@ msgid "Slicing Mode" msgstr "Režim Slicování" msgid "" -"Use \"Sudé-liché\" for 3DLabPrint airplane models. Use \"Close holes\" to " +"Use \"Even-odd\" for 3DLabPrint airplane models. Use \"Close holes\" to " "close all holes in the model." msgstr "" -"Použít \"Sudé-liché\" pro modely letadel 3DLabPrint. Pomocí \"Uzavírání " -"děr\" uzavřete všechny díry v modelu." msgid "Regular" msgstr "Obvyklý" @@ -8467,12 +8473,6 @@ msgstr "" "vyčistili uniklý materiál na trysce. To může minimalizovat skvrny při tisku " "nového dílu po cestě" -msgid "NormalLift" -msgstr "Normální zdvih" - -msgid "SpiralLift" -msgstr "Spirálový zdvih" - msgid "Wipe Distance" msgstr "Vzdálenost čištění" @@ -9313,3 +9313,35 @@ msgstr "" "Zlepšete pevnost\n" "Did jste, že ke zlepšení pevnosti modelu můžete použít více smyček na stěně " "a vyšší hustotu výplně?" + +#~ msgid "Line Flushed (mm)" +#~ msgstr "Čistící Linka" + +#~ msgid "Skirt" +#~ msgstr "Obrys" + +#~ msgid "Max Radius" +#~ msgstr "Max. poloměr" + +#~ msgid "" +#~ "Max clearance radius around extruder. Used for collision avoidance in by-" +#~ "object printing." +#~ msgstr "" +#~ "Maximální poloměr vůle kolem extrudéru. Používá se pro zamezení kolizi " +#~ "při tisku vedlejších objektů." + +#~ msgid "Z Hop Type" +#~ msgstr "Typ Z hop" + +#~ msgid "" +#~ "Use \"Sudé-liché\" for 3DLabPrint airplane models. Use \"Close holes\" to " +#~ "close all holes in the model." +#~ msgstr "" +#~ "Použít \"Sudé-liché\" pro modely letadel 3DLabPrint. Pomocí \"Uzavírání " +#~ "děr\" uzavřete všechny díry v modelu." + +#~ msgid "NormalLift" +#~ msgstr "Normální zdvih" + +#~ msgid "SpiralLift" +#~ msgstr "Spirálový zdvih" diff --git a/bbl/i18n/de/OrcaSlicer_de.po b/bbl/i18n/de/OrcaSlicer_de.po index 11f800d062..6a10f50a4a 100644 --- a/bbl/i18n/de/OrcaSlicer_de.po +++ b/bbl/i18n/de/OrcaSlicer_de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "PO-Revision-Date: \n" "Last-Translator: Heiko Liebscher \n" "Language-Team: \n" @@ -721,6 +721,18 @@ msgstr "Text bearbeiten" msgid "Load..." msgstr "Laden..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Würfel" @@ -7094,16 +7106,6 @@ msgstr "" "Abstandsradius um den Extruder. Wird zur Kollisionsvermeidung im " "nacheinander Objektdruck verwendet." -msgid "Max Radius" -msgstr "Max Radius" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" -"Maximaler Abstandsradius um den Extruder. Wird zur Kollisionsvermeidung im " -"nacheinander Objektdruck verwendet." - msgid "Extruder Color" msgstr "Extruder Farbe" @@ -9632,6 +9634,16 @@ msgstr "" "Wussten Sie, dass Sie mehr Wandschlaufen und eine höhere spärliche " "Fülldichte verwenden können, um die Festigkeit des Modells zu verbessern?" +#~ msgid "Max Radius" +#~ msgstr "Max Radius" + +#~ msgid "" +#~ "Max clearance radius around extruder. Used for collision avoidance in by-" +#~ "object printing." +#~ msgstr "" +#~ "Maximaler Abstandsradius um den Extruder. Wird zur Kollisionsvermeidung " +#~ "im nacheinander Objektdruck verwendet." + #~ msgid "Z Hop Type" #~ msgstr "Z Hop Type" diff --git a/bbl/i18n/en/OrcaSlicer_en.po b/bbl/i18n/en/OrcaSlicer_en.po index a84ad24035..1ed6f10125 100644 --- a/bbl/i18n/en/OrcaSlicer_en.po +++ b/bbl/i18n/en/OrcaSlicer_en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -700,6 +700,18 @@ msgstr "" msgid "Load..." msgstr "Load..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Cube" @@ -6621,14 +6633,6 @@ msgid "" "printing." msgstr "" -msgid "Max Radius" -msgstr "" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" - msgid "Extruder Color" msgstr "Extruder Color" diff --git a/bbl/i18n/es/OrcaSlicer_es.po b/bbl/i18n/es/OrcaSlicer_es.po index ca006495ee..e2ed366833 100644 --- a/bbl/i18n/es/OrcaSlicer_es.po +++ b/bbl/i18n/es/OrcaSlicer_es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -703,6 +703,18 @@ msgstr "" msgid "Load..." msgstr "Cargar..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Cubo" @@ -6715,14 +6727,6 @@ msgid "" "printing." msgstr "" -msgid "Max Radius" -msgstr "" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" - msgid "Extruder Color" msgstr "Color del extrusor" diff --git a/bbl/i18n/fr/OrcaSlicer_fr.po b/bbl/i18n/fr/OrcaSlicer_fr.po index e0ad0ad9df..2336b6d7bb 100644 --- a/bbl/i18n/fr/OrcaSlicer_fr.po +++ b/bbl/i18n/fr/OrcaSlicer_fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "PO-Revision-Date: 2023-02-21 21:56+0200\n" "Last-Translator: 5axes <5axes@free.fr>\n" "Language-Team: 5axes\n" @@ -711,6 +711,18 @@ msgstr "" msgid "Load..." msgstr "Charger..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Cube" @@ -7013,16 +7025,6 @@ msgstr "" "Rayon de dégagement autour de l'extrudeuse. Utilisé pour éviter les " "collisions dans l'impression par objet." -msgid "Max Radius" -msgstr "Rayon maxi" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" -"Rayon de dégagement maximal autour de l'extrudeuse. Utilisé pour éviter les " -"collisions dans l'impression par objet." - msgid "Extruder Color" msgstr "Couleur de l'extrudeuse" @@ -9508,6 +9510,16 @@ msgstr "" "Saviez-vous que vous pouvez utiliser plus de boucles de mur et une densité " "de remplissage plus élevée pour améliorer la résistance du modèle ?" +#~ msgid "Max Radius" +#~ msgstr "Rayon maxi" + +#~ msgid "" +#~ "Max clearance radius around extruder. Used for collision avoidance in by-" +#~ "object printing." +#~ msgstr "" +#~ "Rayon de dégagement maximal autour de l'extrudeuse. Utilisé pour éviter " +#~ "les collisions dans l'impression par objet." + #~ msgid "NormalLift" #~ msgstr "Retrait Normal" diff --git a/bbl/i18n/hu/OrcaSlicer_hu.po b/bbl/i18n/hu/OrcaSlicer_hu.po index 3c67d27886..8109e48de4 100644 --- a/bbl/i18n/hu/OrcaSlicer_hu.po +++ b/bbl/i18n/hu/OrcaSlicer_hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -701,6 +701,18 @@ msgstr "" msgid "Load..." msgstr "Betöltés..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Kocka" @@ -6680,14 +6692,6 @@ msgid "" "printing." msgstr "" -msgid "Max Radius" -msgstr "" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" - msgid "Extruder Color" msgstr "Extruder szín" diff --git a/bbl/i18n/it/OrcaSlicer_it.po b/bbl/i18n/it/OrcaSlicer_it.po index 99ba9b87d4..b2e744a4c8 100644 --- a/bbl/i18n/it/OrcaSlicer_it.po +++ b/bbl/i18n/it/OrcaSlicer_it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -698,6 +698,18 @@ msgstr "" msgid "Load..." msgstr "Caricamento..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Cube" @@ -6621,14 +6633,6 @@ msgid "" "printing." msgstr "" -msgid "Max Radius" -msgstr "" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" - msgid "Extruder Color" msgstr "Colore estrusore" diff --git a/bbl/i18n/ja/OrcaSlicer_ja.po b/bbl/i18n/ja/OrcaSlicer_ja.po index 04b2d58972..9ac89921e0 100644 --- a/bbl/i18n/ja/OrcaSlicer_ja.po +++ b/bbl/i18n/ja/OrcaSlicer_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -694,6 +694,18 @@ msgstr "" msgid "Load..." msgstr "ファイルを読込む" +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "キューブ" @@ -6631,14 +6643,6 @@ msgstr "" "押出機のクリアランス（半径）：オブジェクト順で造形する時にこのパラメータでオ" "ブジェクトの間隔を計算します。" -msgid "Max Radius" -msgstr "最大半径" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "押出機のクリアランス半径。オブジェクト順で造形する時に衝突防止用です。" - msgid "Extruder Color" msgstr "押出機の色" @@ -8875,6 +8879,15 @@ msgstr "" "強度の向上\n" "壁面層数やインフィルの充填密度を増やして造形強度を向上できます。" +#~ msgid "Max Radius" +#~ msgstr "最大半径" + +#~ msgid "" +#~ "Max clearance radius around extruder. Used for collision avoidance in by-" +#~ "object printing." +#~ msgstr "" +#~ "押出機のクリアランス半径。オブジェクト順で造形する時に衝突防止用です。" + #~ msgid "Z Hop Type" #~ msgstr "Z方向調整タイプ" diff --git a/bbl/i18n/nl/OrcaSlicer_nl.po b/bbl/i18n/nl/OrcaSlicer_nl.po index b6b1456b7c..16e08cc608 100644 --- a/bbl/i18n/nl/OrcaSlicer_nl.po +++ b/bbl/i18n/nl/OrcaSlicer_nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -701,6 +701,18 @@ msgstr "" msgid "Load..." msgstr "Laden..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Kubus" @@ -6723,14 +6735,6 @@ msgid "" "printing." msgstr "" -msgid "Max Radius" -msgstr "" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" - msgid "Extruder Color" msgstr "Extruder kleur" diff --git a/bbl/i18n/sv/OrcaSlicer_sv.po b/bbl/i18n/sv/OrcaSlicer_sv.po index 10662933cc..139a579e83 100644 --- a/bbl/i18n/sv/OrcaSlicer_sv.po +++ b/bbl/i18n/sv/OrcaSlicer_sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -697,6 +697,18 @@ msgstr "" msgid "Load..." msgstr "Ladda..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "Kub" @@ -6615,14 +6627,6 @@ msgid "" "printing." msgstr "" -msgid "Max Radius" -msgstr "" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "" - msgid "Extruder Color" msgstr "Extruder Färg" diff --git a/bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po b/bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po index 049890447f..131664cb41 100644 --- a/bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po +++ b/bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-02 11:05+0800\n" +"POT-Creation-Date: 2023-04-26 22:21+0800\n" "PO-Revision-Date: 2023-04-01 13:21+0800\n" "Last-Translator: Jiang Yue \n" "Language-Team: \n" @@ -692,6 +692,18 @@ msgstr "" msgid "Load..." msgstr "加载..." +msgid "Orca Cube" +msgstr "" + +msgid "3DBenchy" +msgstr "" + +msgid "Autodesk FDM Test" +msgstr "" + +msgid "Voron Cube" +msgstr "" + msgid "Cube" msgstr "立方体" @@ -6526,14 +6538,6 @@ msgid "" "printing." msgstr "挤出机四周的避让半径。用于在逐件打印中避免碰撞。" -msgid "Max Radius" -msgstr "最大半径" - -msgid "" -"Max clearance radius around extruder. Used for collision avoidance in by-" -"object printing." -msgstr "挤出机四周的最大避让半径。用于在逐件打印中避免碰撞。" - msgid "Extruder Color" msgstr "挤出机颜色" @@ -8728,6 +8732,14 @@ msgstr "" "提高强度\n" "你知道吗？你可以使用更多的墙层数和更高的疏散填充密度来提高模型的强度。" +#~ msgid "Max Radius" +#~ msgstr "最大半径" + +#~ msgid "" +#~ "Max clearance radius around extruder. Used for collision avoidance in by-" +#~ "object printing." +#~ msgstr "挤出机四周的最大避让半径。用于在逐件打印中避免碰撞。" + #~ msgid "NormalLift" #~ msgstr "直接抬Z" diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index c048300481..f5bb57021a 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -11,6 +11,10 @@ { "name": "Creality CR-10 Max", "sub_path": "machine/Creality CR-10 Max.json" + }, + { + "name": "Creality Ender-5 Pro 2019", + "sub_path": "machine/Creality Ender-5 Pro 2019.json" } ], "process_list": [ @@ -85,6 +89,11 @@ { "name": "Creality CR-10 Max 0.4 nozzle", "sub_path": "machine/Creality CR-10 Max 0.4 nozzle.json" + }, + { + "name": "Creality Ender-5 Pro 2019 0.4 nozzle", + "sub_path": "machine/Creality Ender-5 Pro 2019 0.4 nozzle.json" } + ] } diff --git a/resources/profiles/Creality/filament/Generic ABS @Creality.json b/resources/profiles/Creality/filament/Generic ABS @Creality.json index 15b6c72aea..019b5d8faf 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Creality.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality.json @@ -14,6 +14,7 @@ ], "compatible_printers": [ "Creality Ender-3 V2 0.4 nozzle", - "Creality CR-10 Max 0.4 nozzle" + "Creality CR-10 Max 0.4 nozzle", + "Creality Ender-5 Pro 2019 0.4 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Generic PETG @Creality.json b/resources/profiles/Creality/filament/Generic PETG @Creality.json index d626feee9e..3686aafef2 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Creality.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality.json @@ -44,6 +44,7 @@ ], "compatible_printers": [ "Creality Ender-3 V2 0.4 nozzle", - "Creality CR-10 Max 0.4 nozzle" + "Creality CR-10 Max 0.4 nozzle", + "Creality Ender-5 Pro 2019 0.4 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Generic PLA @Creality.json b/resources/profiles/Creality/filament/Generic PLA @Creality.json index 801beb84d1..28f5e1157e 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Creality.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality.json @@ -17,6 +17,7 @@ ], "compatible_printers": [ "Creality Ender-3 V2 0.4 nozzle", - "Creality CR-10 Max 0.4 nozzle" + "Creality CR-10 Max 0.4 nozzle", + "Creality Ender-5 Pro 2019 0.4 nozzle" ] } diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro 2019 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro 2019 0.4 nozzle.json new file mode 100644 index 0000000000..1ec5d4dd6a --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro 2019 0.4 nozzle.json @@ -0,0 +1,25 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-5 Pro 2019 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-5 Pro 2019", + "default_filament_profile": [ + "Generic PLA @Creality" + ], + "default_print_profile": "0.20mm Standard @Creality", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro 2019.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro 2019.json new file mode 100644 index 0000000000..c35e74fd2c --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro 2019.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Creality Ender-5 Pro 2019", + "model_id": "Creality_Ender_5_Pro_2019", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "ENDER", + "bed_model": "", + "bed_texture": "ender3v2.svg", + "hotend_model": "hotend.stl", + "default_materials": "Generic PLA @CREALITY;Generic PETG @CREALITY;Generic ABS @CREALITY;" +} diff --git a/resources/profiles/Creality/process/fdm_process_creality_common.json b/resources/profiles/Creality/process/fdm_process_creality_common.json index 4c73471a8e..68df6e4772 100644 --- a/resources/profiles/Creality/process/fdm_process_creality_common.json +++ b/resources/profiles/Creality/process/fdm_process_creality_common.json @@ -103,6 +103,7 @@ "xy_contour_compensation": "0", "compatible_printers": [ "Creality Ender-3 V2 0.4 nozzle", - "Creality CR-10 Max 0.4 nozzle" + "Creality CR-10 Max 0.4 nozzle", + "Creality Ender-5 Pro 2019 0.4 nozzle" ] } diff --git a/resources/profiles/FLSun/process/0.20mm Standard @FLSun.json b/resources/profiles/FLSun/process/0.20mm Standard @FLSun.json index e0d44d3002..cfda270edd 100644 --- a/resources/profiles/FLSun/process/0.20mm Standard @FLSun.json +++ b/resources/profiles/FLSun/process/0.20mm Standard @FLSun.json @@ -9,19 +9,19 @@ "inner_wall_speed": "200", "sparse_infill_speed": "250", "internal_solid_infill_speed": "200", - "default_acceleration": "7000", + "default_acceleration": "5000", "default_jerk": "9", "gap_infill_speed": "200", "initial_layer_acceleration": "1000", "initial_layer_infill_speed": "100", "initial_layer_speed": "50", - "inner_wall_acceleration": "7000", + "inner_wall_acceleration": "5000", "is_custom_defined": "0", "outer_wall_acceleration": "4000", "overhang_1_4_speed": "80", "top_surface_acceleration": "3000", "top_surface_speed": "200", - "travel_acceleration": "7000", + "travel_acceleration": "5000", "travel_speed": "400", "compatible_printers": [ "FLSun V400 0.4 nozzle" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1.json deleted file mode 100644 index 3ccf84cbc1..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena PLA Basic @Arena X1.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA04", - "name": "Arena PLA Basic @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Basic @base", - "filament_max_volumetric_speed": [ - "21" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Marble @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Marble @Arena X1.json deleted file mode 100644 index 04cc65cc1b..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena PLA Marble @Arena X1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA07_01", - "name": "Arena PLA Marble @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Marble @base", - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1.json deleted file mode 100644 index 3d2ef8ff72..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena PLA Matte @Arena X1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA05", - "name": "Arena PLA Matte @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Matte @base", - "filament_max_volumetric_speed": [ - "22" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1.json deleted file mode 100644 index c0f14fba95..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena PLA Metal @Arena X1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA02_02", - "name": "Arena PLA Metal @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Metal @base", - "filament_max_volumetric_speed": [ - "21" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1.json deleted file mode 100644 index 1f22d4fae5..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena PLA Silk @Arena X1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA05_02", - "name": "Arena PLA Silk @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Silk @base", - "filament_max_volumetric_speed": [ - "12" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena X1 0.4 nozzle" - ] -} \ No newline at end of file diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @Arena X1.json deleted file mode 100644 index 4b06eac359..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @Arena X1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA08_01", - "name": "Arena PLA Sparkle @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Sparkle @base", - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1.json deleted file mode 100644 index d31e6befb8..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena PLA Tough @Arena X1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA09_01", - "name": "Arena PLA Tough @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Tough @base", - "filament_max_volumetric_speed": [ - "21" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1.json deleted file mode 100644 index 95ce73c17b..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena Support W @Arena X1.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSS02", - "name": "Arena Support W @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena Support W @base", - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/Arena TPU 95A @Arena X1.json b/resources/profiles/OrcaArena/filament/Arena TPU 95A @Arena X1.json deleted file mode 100644 index 36e72800ce..0000000000 --- a/resources/profiles/OrcaArena/filament/Arena TPU 95A @Arena X1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSU01", - "name": "Arena TPU 95A @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "Arena TPU 95A @base", - "filament_max_volumetric_speed": [ - "3.6" - ], - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena ABS @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena ABS @Arena P1P 0.2 nozzle.json deleted file mode 100644 index c4ffbbfa4d..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena ABS @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSB00_02", - "name": "Arena ABS @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena ABS @base", - "filament_max_volumetric_speed": [ - "2" - ], - "hot_plate_temp" : [ - "100" - ], - "hot_plate_temp_initial_layer" : [ - "100" - ], - "textured_plate_temp" : [ - "100" - ], - "textured_plate_temp_initial_layer" : [ - "100" - ], - "fan_max_speed": [ - "20" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena ABS @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena ABS @Arena P1P.json deleted file mode 100644 index e81b13c08e..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena ABS @Arena P1P.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSB00_03", - "name": "Arena ABS @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena ABS @base", - "filament_max_volumetric_speed": [ - "22" - ], - "fan_max_speed": [ - "20" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "hot_plate_temp" : [ - "100" - ], - "hot_plate_temp_initial_layer" : [ - "100" - ], - "textured_plate_temp" : [ - "100" - ], - "textured_plate_temp_initial_layer" : [ - "100" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PA-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PA-CF @Arena P1P.json deleted file mode 100644 index d0973038a3..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PA-CF @Arena P1P.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSN00_10", - "name": "Arena PA-CF @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PA-CF @base", - "filament_max_volumetric_speed": [ - "8" - ], - "nozzle_temperature_initial_layer": [ - "290" - ], - "nozzle_temperature": [ - "290" - ], - "fan_max_speed": [ - "30" - ], - "fan_min_speed": [ - "10" - ], - "fan_cooling_layer_time": [ - "5" - ], - "full_fan_speed_layer": [ - "2" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PAHT-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PAHT-CF @Arena P1P.json deleted file mode 100644 index 71dbbf0a63..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PAHT-CF @Arena P1P.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSN04_10", - "name": "Arena PAHT-CF @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PAHT-CF @base", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PC @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena PC @Arena P1P 0.2 nozzle.json deleted file mode 100644 index cfd7900915..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PC @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSC00_03", - "name": "Arena PC @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena PC @base", - "filament_max_volumetric_speed": [ - "1" - ], - "nozzle_temperature": [ - "260" - ], - "fan_max_speed": [ - "20" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} \ No newline at end of file diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PC @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PC @Arena P1P.json deleted file mode 100644 index 9a8b8574ea..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PC @Arena P1P.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSC00_04", - "name": "Arena PC @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PC @base", - "fan_max_speed": [ - "20" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PET-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PET-CF @Arena P1P.json deleted file mode 100644 index 4164c8a68e..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PET-CF @Arena P1P.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFST01_10", - "name": "Arena PET-CF @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PET-CF @base", - "slow_down_for_layer_cooling": [ - "1" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "slow_down_min_speed": [ - "20" - ], - "slow_down_layer_time": [ - "2" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" -] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PETG-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PETG-CF @Arena P1P.json deleted file mode 100644 index 0cecda5053..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PETG-CF @Arena P1P.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSG50_11", - "name": "Arena PETG-CF @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PETG-CF @base", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Basic @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Basic @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 57a8c08435..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Basic @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA00_10", - "name": "Arena PLA Basic @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Basic @base", - "filament_max_volumetric_speed": [ - "2" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Basic @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Basic @Arena P1P.json deleted file mode 100644 index cb669d47c1..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Basic @Arena P1P.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA04_10", - "name": "Arena PLA Basic @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Basic @base", - "filament_max_volumetric_speed": [ - "21" - ], - "slow_down_layer_time": [ - "8" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Marble @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Marble @Arena P1P.json deleted file mode 100644 index 56b718b205..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Marble @Arena P1P.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA07_10", - "name": "Arena PLA Marble @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Marble @base", - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Matte @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Matte @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 5c898243f6..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Matte @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA01_10", - "name": "Arena PLA Matte @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Matte @base", - "filament_max_volumetric_speed": [ - "2" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Matte @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Matte @Arena P1P.json deleted file mode 100644 index 89c0088bf2..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Matte @Arena P1P.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA05_10", - "name": "Arena PLA Matte @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Matte @base", - "filament_max_volumetric_speed": [ - "22" - ], - "slow_down_layer_time": [ - "8" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Metal @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Metal @Arena P1P 0.2 nozzle.json deleted file mode 100644 index fd7c7b62bc..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Metal @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA02_11", - "name": "Arena PLA Metal @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Metal @base", - "filament_max_volumetric_speed": [ - "2" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Metal @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Metal @Arena P1P.json deleted file mode 100644 index 3c91dcde9d..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Metal @Arena P1P.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA02_10", - "name": "Arena PLA Metal @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Metal @base", - "filament_max_volumetric_speed": [ - "21" - ], - "slow_down_layer_time": [ - "8" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 0d48d22f52..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA05_11", - "name": "Arena PLA Silk @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Silk @base", - "filament_max_volumetric_speed": [ - "2" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} \ No newline at end of file diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P.json deleted file mode 100644 index 4f525605a6..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Silk @Arena P1P.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA05_12", - "name": "Arena PLA Silk @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Silk @base", - "filament_max_volumetric_speed": [ - "12" - ], - "slow_down_layer_time": [ - "8" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} \ No newline at end of file diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Sparkle @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Sparkle @Arena P1P.json deleted file mode 100644 index 4bf84a334b..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Sparkle @Arena P1P.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA08_10", - "name": "Arena PLA Sparkle @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Marble @base", - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Tough @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Tough @Arena P1P 0.2 nozzle.json deleted file mode 100644 index f99cfc7c5f..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Tough @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA09_10", - "name": "Arena PLA Tough @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Tough @base", - "filament_max_volumetric_speed": [ - "2" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Tough @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA Tough @Arena P1P.json deleted file mode 100644 index 5552e23fb5..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA Tough @Arena P1P.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA09_11", - "name": "Arena PLA Tough @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA Tough @base", - "filament_max_volumetric_speed": [ - "21" - ], - "slow_down_layer_time": [ - "8" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA-CF @Arena P1P 0.8 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA-CF @Arena P1P 0.8 nozzle.json deleted file mode 100644 index 0e74d0d105..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA-CF @Arena P1P 0.8 nozzle.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA50_11", - "name": "Arena PLA-CF @Arena P1P 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA-CF @base", - "filament_max_volumetric_speed": [ - "18" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ], - "compatible_printers": [ - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena PLA-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena PLA-CF @Arena P1P.json deleted file mode 100644 index 7d60e3f8b9..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena PLA-CF @Arena P1P.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSA50_10", - "name": "Arena PLA-CF @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena PLA-CF @base", - "filament_max_volumetric_speed": [ - "15" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena Support G @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena Support G @Arena P1P.json deleted file mode 100644 index 63d94f0a7c..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena Support G @Arena P1P.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSS01_10", - "name": "Arena Support G @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena Support G @base", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena Support W @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Arena Support W @Arena P1P 0.2 nozzle.json deleted file mode 100644 index bc0dc90a0f..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena Support W @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSS00_10", - "name": "Arena Support W @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Arena Support W @base", - "filament_max_volumetric_speed": [ - "0.5" - ], - "nozzle_temperature_initial_layer": [ - "240" - ], - "nozzle_temperature": [ - "240" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} \ No newline at end of file diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena Support W @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena Support W @Arena P1P.json deleted file mode 100644 index c3c65179a3..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena Support W @Arena P1P.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSS02_10", - "name": "Arena Support W @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena Support W @base", - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Arena TPU 95A @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Arena TPU 95A @Arena P1P.json deleted file mode 100644 index b23625fda1..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Arena TPU 95A @Arena P1P.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSU01_10", - "name": "Arena TPU 95A @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Arena TPU 95A @base", - "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": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic ABS @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Generic ABS @Arena P1P 0.2 nozzle.json deleted file mode 100644 index ce9b9cb507..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic ABS @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSB99_02", - "name": "Generic ABS @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Generic ABS @base", - "filament_max_volumetric_speed": [ - "2" - ], - "fan_max_speed": [ - "20" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "hot_plate_temp" : [ - "100" - ], - "hot_plate_temp_initial_layer" : [ - "100" - ], - "textured_plate_temp" : [ - "100" - ], - "textured_plate_temp_initial_layer" : [ - "100" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic ABS @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic ABS @Arena P1P.json deleted file mode 100644 index ac84079da5..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic ABS @Arena P1P.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSB99_01", - "name": "Generic ABS @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic ABS @base", - "fan_max_speed": [ - "20" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "hot_plate_temp" : [ - "100" - ], - "hot_plate_temp_initial_layer" : [ - "100" - ], - "textured_plate_temp" : [ - "100" - ], - "textured_plate_temp_initial_layer" : [ - "100" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic ASA @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Generic ASA @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 2972f4dc6b..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic ASA @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSB98_11", - "name": "Generic ASA @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Generic ASA @base", - "filament_max_volumetric_speed": [ - "2" - ], - "hot_plate_temp" : [ - "100" - ], - "hot_plate_temp_initial_layer" : [ - "100" - ], - "textured_plate_temp" : [ - "100" - ], - "textured_plate_temp_initial_layer" : [ - "100" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic ASA @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic ASA @Arena P1P.json deleted file mode 100644 index 731d8d462b..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic ASA @Arena P1P.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSB98_10", - "name": "Generic ASA @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic ASA @base", - "hot_plate_temp" : [ - "100" - ], - "hot_plate_temp_initial_layer" : [ - "100" - ], - "textured_plate_temp" : [ - "100" - ], - "textured_plate_temp_initial_layer" : [ - "100" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PA @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PA @Arena P1P.json deleted file mode 100644 index 066d7eb4e0..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PA @Arena P1P.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "filament", - "filament_id": "GFN99", - "setting_id": "GFSN98_10", - "name": "Generic PA @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pa", - "required_nozzle_HRC": [ - "3" - ], - "nozzle_temperature_initial_layer": [ - "280" - ], - "nozzle_temperature": [ - "280" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" -] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PA-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PA-CF @Arena P1P.json deleted file mode 100644 index 45e1abea29..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PA-CF @Arena P1P.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "type": "filament", - "filament_id": "GFN98", - "setting_id": "GFSN99_10", - "name": "Generic PA-CF @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pa", - "filament_type": [ - "PA-CF" - ], - "nozzle_temperature_initial_layer": [ - "290" - ], - "nozzle_temperature": [ - "290" - ], - "filament_max_volumetric_speed": [ - "8" - ], - "fan_max_speed": [ - "30" - ], - "fan_min_speed": [ - "10" - ], - "overhang_fan_threshold": [ - "0%" - ], - "overhang_fan_speed": [ - "40" - ], - "fan_cooling_layer_time": [ - "5" - ], - "full_fan_speed_layer": [ - "2" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PC @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Generic PC @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 719d3428da..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PC @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSC99_01", - "name": "Generic PC @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Generic PC @base", - "filament_max_volumetric_speed": [ - "1" - ], - "fan_max_speed": [ - "20" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} \ No newline at end of file diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PC @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PC @Arena P1P.json deleted file mode 100644 index 8e8f324af1..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PC @Arena P1P.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSC99_02", - "name": "Generic PC @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic PC @base", - "fan_max_speed": [ - "20" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] - } \ No newline at end of file diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PETG @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Generic PETG @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 6b4a99b103..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PETG @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSG99_11", - "name": "Generic PETG @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Generic PETG @base", - "hot_plate_temp" : [ - "80" - ], - "hot_plate_temp_initial_layer" : [ - "80" - ], - "textured_plate_temp" : [ - "80" - ], - "textured_plate_temp_initial_layer" : [ - "80" - ], - "filament_max_volumetric_speed": [ - "1" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PETG @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PETG @Arena P1P.json deleted file mode 100644 index 1ec1195db5..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PETG @Arena P1P.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSG99_10", - "name": "Generic PETG @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic PETG @base", - "hot_plate_temp" : [ - "80" - ], - "hot_plate_temp_initial_layer" : [ - "80" - ], - "textured_plate_temp" : [ - "80" - ], - "textured_plate_temp_initial_layer" : [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PETG-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PETG-CF @Arena P1P.json deleted file mode 100644 index 1b3e30f73e..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PETG-CF @Arena P1P.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSG50_10", - "name": "Generic PETG-CF @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic PETG-CF @base", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PLA @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Generic PLA @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 9289d0c221..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PLA @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL99_11", - "name": "Generic PLA @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Generic PLA @base", - "filament_max_volumetric_speed": [ - "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PLA @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PLA @Arena P1P.json deleted file mode 100644 index 2bfcce5354..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PLA @Arena P1P.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL99_10", - "name": "Generic PLA @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic PLA @base", - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PLA Silk @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PLA Silk @Arena P1P.json deleted file mode 100644 index 67c38ec974..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PLA Silk @Arena P1P.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL99_12", - "name": "Generic PLA Silk @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic PLA Silk @base", - "filament_max_volumetric_speed": [ - "7.5" - ], - "filament_retraction_length": [ - "0.5" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PLA-CF @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PLA-CF @Arena P1P.json deleted file mode 100644 index 4cdd3c70c6..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PLA-CF @Arena P1P.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL98_10", - "name": "Generic PLA-CF @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic PLA-CF @base", - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PVA @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/Generic PVA @Arena P1P 0.2 nozzle.json deleted file mode 100644 index f8c1f9ccb8..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PVA @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSS99_11", - "name": "Generic PVA @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Generic PVA @base", - "filament_max_volumetric_speed": [ - "0.5" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic PVA @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic PVA @Arena P1P.json deleted file mode 100644 index 8e928f9c74..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic PVA @Arena P1P.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSS99_10", - "name": "Generic PVA @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "Generic PVA @base", - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/Generic TPU @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/Generic TPU @Arena P1P.json deleted file mode 100644 index 4233760a8f..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/Generic TPU @Arena P1P.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "filament_id": "GFU99", - "setting_id": "GFSR99_10", - "name": "Generic TPU @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_tpu", - "filament_max_volumetric_speed": [ - "3.2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}" - ], - "hot_plate_temp" : [ - "45" - ], - "hot_plate_temp_initial_layer" : [ - "45" - ], - "textured_plate_temp" : [ - "45" - ], - "textured_plate_temp_initial_layer" : [ - "45" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/PolyLite PLA @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/PolyLite PLA @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 537fc2c2e3..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/PolyLite PLA @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL25_10", - "name": "PolyLite PLA @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "PolyLite PLA @Arena X1C", - "filament_max_volumetric_speed": [ - "1" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/PolyLite PLA @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/PolyLite PLA @Arena P1P.json deleted file mode 100644 index 583a58f784..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/PolyLite PLA @Arena P1P.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL23_10", - "name": "PolyLite PLA @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "PolyLite PLA @base", - "filament_max_volumetric_speed": [ - "15" - ], - "slow_down_layer_time": [ - "8" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/PolyTerra PLA @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/filament/P1P/PolyTerra PLA @Arena P1P 0.2 nozzle.json deleted file mode 100644 index da4f970df9..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/PolyTerra PLA @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL24_10", - "name": "PolyTerra PLA @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "PolyTerra PLA @Arena X1C", - "filament_max_volumetric_speed": [ - "1" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/P1P/PolyTerra PLA @Arena P1P.json b/resources/profiles/OrcaArena/filament/P1P/PolyTerra PLA @Arena P1P.json deleted file mode 100644 index 63d631f7b0..0000000000 --- a/resources/profiles/OrcaArena/filament/P1P/PolyTerra PLA @Arena P1P.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL22_10", - "name": "PolyTerra PLA @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "PolyTerra PLA @base", - "filament_max_volumetric_speed": [ - "22" - ], - "slow_down_layer_time": [ - "8" - ], - "hot_plate_temp" : [ - "65" - ], - "hot_plate_temp_initial_layer" : [ - "65" - ], - "textured_plate_temp" : [ - "65" - ], - "textured_plate_temp_initial_layer" : [ - "65" - ], - "fan_min_speed": [ - "50" - ], - "fan_cooling_layer_time": [ - "80" - ], - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena P1P 0.6 nozzle", - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1.json b/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1.json deleted file mode 100644 index fe3d99ffe0..0000000000 --- a/resources/profiles/OrcaArena/filament/PolyLite PLA @Arena X1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL23", - "name": "PolyLite PLA @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "PolyLite PLA @base", - "filament_max_volumetric_speed": [ - "15" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1.json b/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1.json deleted file mode 100644 index 9f457993f5..0000000000 --- a/resources/profiles/OrcaArena/filament/PolyTerra PLA @Arena X1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "filament", - "setting_id": "GFSL22", - "name": "PolyTerra PLA @Arena X1", - "from": "system", - "instantiation": "true", - "inherits": "PolyTerra PLA @base", - "filament_max_volumetric_speed": [ - "22" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.2 nozzle.json deleted file mode 100644 index 5855aeff11..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM010", - "name": "Orca Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Orca Arena P1P 0.4 nozzle", - "printer_model": "Orca Arena P1P", - "nozzle_diameter": [ - "0.2" - ], - "printer_variant": "0.2", - "default_filament_profile": [ - "Arena PLA Basic @Arena X1C 0.2 nozzle" - ], - "default_print_profile": "0.10mm Standard @Arena P1P 0.2 nozzle", - "max_layer_height": [ - "0.14" - ], - "min_layer_height": [ - "0.04" - ], - "retraction_length": [ - "0.4" - ], - "retraction_minimum_travel": [ - "5" - ], - "machine_start_gcode": ";===== machine: P1P ========================\n;===== date: 20230323 =====================\n;===== turn on the HB fan =================\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp to turn on the HB fan\n;===== reset machine status =================\nG91\nM17 Z0.4 ; lower the z-motor current\nG0 Z12 F300 ; lower the hotbed , to prevent the nozzle is below the hotbed\nG0 Z-6;\nG90\nM17 X1.2 Y1.2 Z0.75 ; reset motor current to default\nM960 S5 P1 ; turn on logo lamp\nG90\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 5\nM221 X0 Y0 Z0 ; turn off soft endstop to prevent protential logic problem\nG29.1 Z{+0.0} ; clear z-trim value first\n\n;===== heatbed preheat ====================\nM1002 gcode_claim_action : 2\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {elsif (bed_temperature[initial_extruder] >50)||(bed_temperature_initial_layer[initial_extruder] >50)}\n M106 P3 S255\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n;===== prepare print temperature and material ==========\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nG91\nG0 Z10 F1200\nG90\nG28 X\nM975 S1 ; turn on\nG1 X60 F12000\nG1 Y245\nG1 Y265 F3000\nM620 M\nM620 S[initial_extruder]A ; switch material if AMS exist\n M109 S[nozzle_temperature_initial_layer]\n G1 X120 F12000\n\n G1 X20 Y50 F12000\n G1 Y-3\n T[initial_extruder]\n G1 X54 F12000\n G1 Y265\n M400\nM621 S[initial_extruder]A\nM620.1 E F{filament_max_volumetric_speed[initial_extruder]/2.4053*60} T{nozzle_temperature_range_high[initial_extruder]}\n\n\nM412 S1 ; ===turn on filament runout detection===\n\nM109 S250 ;set nozzle to common flush temp\nM106 P1 S0\nG92 E0\nG1 E50 F200\nM400\nM104 S[nozzle_temperature_initial_layer]\nG92 E0\nG1 E50 F200\nM400\nM106 P1 S255\nG92 E0\nG1 E5 F300\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20} ; drop nozzle temp, make filament shink a bit\nG92 E0\nG1 E-0.5 F300\n\nG1 X70 F9000\nG1 X76 F15000\nG1 X65 F15000\nG1 X76 F15000\nG1 X65 F15000; shake to put down garbage\nG1 X80 F6000\nG1 X95 F15000\nG1 X80 F15000\nG1 X165 F15000; wipe and shake\nM400\nM106 P1 S0\n;===== prepare print temperature and material end =====\n\n\n;===== wipe nozzle ===============================\nM1002 gcode_claim_action : 14\nM975 S1\nM106 S255\nG1 X65 Y230 F18000\nG1 Y264 F6000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20}\nG1 X100 F18000 ; first wipe mouth\n\nG0 X135 Y253 F20000 ; move to exposed steel surface edge\nG28 Z P0 T300; home z with low precision,permit 300deg temperature\nG29.2 S0 ; turn off ABL\nG0 Z5 F20000\n\nG1 X60 Y265\nG92 E0\nG1 E-0.5 F300 ; retrack more\nG1 X100 F5000; second wipe mouth\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X90 F5000\nG0 X128 Y261 Z-1.5 F20000 ; move to exposed steel surface and stop the nozzle\nM104 S140 ; set temp down to heatbed acceptable\nM106 S255 ; turn on fan (G28 has turn off fan)\n\nM221 S; push soft endstop status\nM221 Z0 ;turn off Z axis endstop\nG0 Z0.5 F20000\nG0 X125 Y259.5 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 X128\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\n\nM109 S140 ; wait nozzle temp down to heatbed acceptable\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\n\nM221 R; pop softend status\nG1 Z10 F1200\nM400\nG1 Z10\nG1 F30000\nG1 X230 Y15\nG29.2 S1 ; turn on ABL\n;G28 ; home again after hard wipe mouth\nM106 S0 ; turn off fan , too noisy\n;===== wipe nozzle end ================================\n\n\n;===== bed leveling ==================================\nM1002 judge_flag g29_before_print_flag\nM622 J1\n\n M1002 gcode_claim_action : 1\n G29 A X{first_layer_print_min[0]} Y{first_layer_print_min[1]} I{first_layer_print_size[0]} J{first_layer_print_size[1]}\n M400\n M500 ; save cali data\n\nM623\n;===== bed leveling end ================================\n\n;===== home after wipe mouth============================\nM1002 judge_flag g29_before_print_flag\nM622 J0\n\n M1002 gcode_claim_action : 13\n G28\n\nM623\n;===== home after wipe mouth end =======================\n\nM975 S1 ; turn on vibration supression\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {elsif (bed_temperature[initial_extruder] >50)||(bed_temperature_initial_layer[initial_extruder] >50)}\n M106 P3 S255\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n\nM104 S{nozzle_temperature_initial_layer[initial_extruder]} ; set extrude temp earlier, to reduce wait time\n\n;===== mech mode fast check============================\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q1 A7 B30 C80 H15 K0\nM974 Q1 S2 P0\n\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q0 A7 B30 C90 Q0 H15 K0\nM974 Q0 S2 P0\n\nM975 S1\nG1 F30000\nG1 X230 Y15\nG28 X ; re-home XY\n;===== fmech mode fast check============================\n\n\n;===== noozle load line ===============================\nM975 S1\nG90\nM83\nT1000\nG1 X18.0 Y1.0 Z0.8 F18000;Move to start position\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nG0 E2 F300\nG0 X240 E15 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nG0 Y11 E0.700 F{outer_wall_volumetric_speed/(0.3*0.5)/ 4 * 60}\nG0 X239.5\nG0 E0.2\nG0 Y1.5 E0.700\nG0 X18 E15 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nM400\n\n;===== for Textured PEI Plate , lower the nozzle as the nozzle was touching topmost of the texture when homing ==\n;curr_bed_type={curr_bed_type}\n{if curr_bed_type==\"Textured PEI Plate\"}\nG29.1 Z-0.04 ; for Textured PEI Plate\n{endif}\n;========turn off light and wait extrude temperature =============\nM1002 gcode_claim_action : 0\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off big fan\nM106 P3 S0 ; turn off chamber fan\n\nM975 S1 ; turn on mech mode supression", - "upward_compatible_machine":[ - "Orca Arena X1 0.2 nozzle", - "Orca Arena X1 Carbon 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.4 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.4 nozzle.json deleted file mode 100644 index 149deff937..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.4 nozzle.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM013", - "name": "Orca Arena P1P 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", - "printer_model": "Orca Arena P1P", - "default_filament_profile": [ - "Arena PLA Basic @Arena X1" - ], - "default_print_profile": "0.20mm Standard @Arena P1P", - "nozzle_diameter": [ - "0.4" - ], - "extruder_offset": [ - "0x2" - ], - "extruder_clearance_max_radius": "56", - "machine_start_gcode": ";===== machine: P1P ========================\n;===== date: 20230323 =====================\n;===== turn on the HB fan =================\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp to turn on the HB fan\n;===== reset machine status =================\nG91\nM17 Z0.4 ; lower the z-motor current\nG0 Z12 F300 ; lower the hotbed , to prevent the nozzle is below the hotbed\nG0 Z-6;\nG90\nM17 X1.2 Y1.2 Z0.75 ; reset motor current to default\nM960 S5 P1 ; turn on logo lamp\nG90\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 5\nM221 X0 Y0 Z0 ; turn off soft endstop to prevent protential logic problem\nG29.1 Z{+0.0} ; clear z-trim value first\n\n;===== heatbed preheat ====================\nM1002 gcode_claim_action : 2\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\n\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {elsif (bed_temperature[initial_extruder] >50)||(bed_temperature_initial_layer[initial_extruder] >50)}\n M106 P3 S255\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n;===== prepare print temperature and material ==========\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nG91\nG0 Z10 F1200\nG90\nG28 X\nM975 S1 ; turn on\nG1 X60 F12000\nG1 Y245\nG1 Y265 F3000\nM620 M\nM620 S[initial_extruder]A ; switch material if AMS exist\n M109 S[nozzle_temperature_initial_layer]\n G1 X120 F12000\n\n G1 X20 Y50 F12000\n G1 Y-3\n T[initial_extruder]\n G1 X54 F12000\n G1 Y265\n M400\nM621 S[initial_extruder]A\nM620.1 E F{filament_max_volumetric_speed[initial_extruder]/2.4053*60} T{nozzle_temperature_range_high[initial_extruder]}\n\n\nM412 S1 ; ===turn on filament runout detection===\n\nM109 S250 ;set nozzle to common flush temp\nM106 P1 S0\nG92 E0\nG1 E50 F200\nM400\nM104 S[nozzle_temperature_initial_layer]\nG92 E0\nG1 E50 F200\nM400\nM106 P1 S255\nG92 E0\nG1 E5 F300\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20} ; drop nozzle temp, make filament shink a bit\nG92 E0\nG1 E-0.5 F300\n\nG1 X70 F9000\nG1 X76 F15000\nG1 X65 F15000\nG1 X76 F15000\nG1 X65 F15000; shake to put down garbage\nG1 X80 F6000\nG1 X95 F15000\nG1 X80 F15000\nG1 X165 F15000; wipe and shake\nM400\nM106 P1 S0\n;===== prepare print temperature and material end =====\n\n\n;===== wipe nozzle ===============================\nM1002 gcode_claim_action : 14\nM975 S1\nM106 S255\nG1 X65 Y230 F18000\nG1 Y264 F6000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20}\nG1 X100 F18000 ; first wipe mouth\n\nG0 X135 Y253 F20000 ; move to exposed steel surface edge\nG28 Z P0 T300; home z with low precision,permit 300deg temperature\nG29.2 S0 ; turn off ABL\nG0 Z5 F20000\n\nG1 X60 Y265\nG92 E0\nG1 E-0.5 F300 ; retrack more\nG1 X100 F5000; second wipe mouth\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X90 F5000\nG0 X128 Y261 Z-1.5 F20000 ; move to exposed steel surface and stop the nozzle\nM104 S140 ; set temp down to heatbed acceptable\nM106 S255 ; turn on fan (G28 has turn off fan)\n\nM221 S; push soft endstop status\nM221 Z0 ;turn off Z axis endstop\nG0 Z0.5 F20000\nG0 X125 Y259.5 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 X128\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\n\nM109 S140 ; wait nozzle temp down to heatbed acceptable\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\n\nM221 R; pop softend status\nG1 Z10 F1200\nM400\nG1 Z10\nG1 F30000\nG1 X230 Y15\nG29.2 S1 ; turn on ABL\n;G28 ; home again after hard wipe mouth\nM106 S0 ; turn off fan , too noisy\n;===== wipe nozzle end ================================\n\n\n;===== bed leveling ==================================\nM1002 judge_flag g29_before_print_flag\nM622 J1\n\n M1002 gcode_claim_action : 1\n G29 A X{first_layer_print_min[0]} Y{first_layer_print_min[1]} I{first_layer_print_size[0]} J{first_layer_print_size[1]}\n M400\n M500 ; save cali data\n\nM623\n;===== bed leveling end ================================\n\n;===== home after wipe mouth============================\nM1002 judge_flag g29_before_print_flag\nM622 J0\n\n M1002 gcode_claim_action : 13\n G28\n\nM623\n;===== home after wipe mouth end =======================\n\nM975 S1 ; turn on vibration supression\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {elsif (bed_temperature[initial_extruder] >50)||(bed_temperature_initial_layer[initial_extruder] >50)}\n M106 P3 S255\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n\nM104 S{nozzle_temperature_initial_layer[initial_extruder]} ; set extrude temp earlier, to reduce wait time\n\n;===== mech mode fast check============================\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q1 A7 B30 C80 H15 K0\nM974 Q1 S2 P0\n\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q0 A7 B30 C90 Q0 H15 K0\nM974 Q0 S2 P0\n\nM975 S1\nG1 F30000\nG1 X230 Y15\nG28 X ; re-home XY\n;===== fmech mode fast check============================\n\n\n;===== noozle load line ===============================\nM975 S1\nG90\nM83\nT1000\nG1 X18.0 Y1.0 Z0.8 F18000;Move to start position\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nG0 E2 F300\nG0 X240 E15 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nG0 Y11 E0.700 F{outer_wall_volumetric_speed/(0.3*0.5)/ 4 * 60}\nG0 X239.5\nG0 E0.2\nG0 Y1.5 E0.700\nG0 X18 E15 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nM400\n\n;===== for Textured PEI Plate , lower the nozzle as the nozzle was touching topmost of the texture when homing ==\n;curr_bed_type={curr_bed_type}\n{if curr_bed_type==\"Textured PEI Plate\"}\nG29.1 Z{-0.04} ; for Textured PEI Plate\n{endif}\n;========turn off light and wait extrude temperature =============\nM1002 gcode_claim_action : 0\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off big fan\nM106 P3 S0 ; turn off chamber fan\n\nM975 S1 ; turn on mech mode supression", - "scan_first_layer": "0", - "machine_load_filament_time": "29", - "machine_unload_filament_time": "28", - "nozzle_type": "stainless_steel", - "nozzle_hrc": "20", - "auxiliary_fan": "0", - "layer_change_gcode": "; layer num/total_layer_count: {layer_num+1}/[total_layer_count]\nM622.1 S1 ; for prev firware, default turned on\nM1002 judge_flag timelapse_record_flag\nM622 J1\n{if timelapse_type == 0} ; timelapse without wipe tower\nM971 S11 C10 O0\n{elsif timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG17\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\nG1 X65 Y245 F20000 ; move to safe pos\nG17\nG2 Z{layer_z} I0.86 J0.86 P1 F20000\nG1 Y265 F3000\nM400 P300\nM971 S11 C11 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255 F20000\n{endif}\nM623\n; update layer progress\nM73 L{layer_num+1}\nM991 S0 P{layer_num} ;notify layer change", - "upward_compatible_machine":[ - "Orca Arena X1 0.4 nozzle", - "Orca Arena X1 Carbon 0.4 nozzle" - ], - "bbl_calib_mark_logo": "0" - } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.6 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.6 nozzle.json deleted file mode 100644 index 76aa2caef9..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.6 nozzle.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM011", - "name": "Orca Arena P1P 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Orca Arena P1P 0.4 nozzle", - "printer_model": "Orca Arena P1P", - "default_filament_profile": [ - "Arena PLA Basic @Arena X1" - ], - "default_print_profile": "0.30mm Standard @Arena P1P 0.6 nozzle", - "nozzle_diameter": [ - "0.6" - ], - "printer_variant": "0.6", - "max_layer_height": [ - "0.42" - ], - "min_layer_height": [ - "0.12" - ], - "retraction_length": [ - "1.4" - ], - "retraction_minimum_travel": [ - "3" - ], - "machine_start_gcode": ";===== machine: P1P ========================\n;===== date: 20230323 =====================\n;===== turn on the HB fan =================\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp to turn on the HB fan\n;===== reset machine status =================\nG91\nM17 Z0.4 ; lower the z-motor current\nG0 Z12 F300 ; lower the hotbed , to prevent the nozzle is below the hotbed\nG0 Z-6;\nG90\nM17 X1.2 Y1.2 Z0.75 ; reset motor current to default\nM960 S5 P1 ; turn on logo lamp\nG90\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 5\nM221 X0 Y0 Z0 ; turn off soft endstop to prevent protential logic problem\nG29.1 Z{+0.0} ; clear z-trim value first\n\n;===== heatbed preheat ====================\nM1002 gcode_claim_action : 2\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {elsif (bed_temperature[initial_extruder] >50)||(bed_temperature_initial_layer[initial_extruder] >50)}\n M106 P3 S255\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n;===== prepare print temperature and material ==========\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nG91\nG0 Z10 F1200\nG90\nG28 X\nM975 S1 ; turn on\nG1 X60 F12000\nG1 Y245\nG1 Y265 F3000\nM620 M\nM620 S[initial_extruder]A ; switch material if AMS exist\n M109 S[nozzle_temperature_initial_layer]\n G1 X120 F12000\n\n G1 X20 Y50 F12000\n G1 Y-3\n T[initial_extruder]\n G1 X54 F12000\n G1 Y265\n M400\nM621 S[initial_extruder]A\nM620.1 E F{filament_max_volumetric_speed[initial_extruder]/2.4053*60} T{nozzle_temperature_range_high[initial_extruder]}\n\n\nM412 S1 ; ===turn on filament runout detection===\n\nM109 S250 ;set nozzle to common flush temp\nM106 P1 S0\nG92 E0\nG1 E50 F200\nM400\nM104 S[nozzle_temperature_initial_layer]\nG92 E0\nG1 E50 F200\nM400\nM106 P1 S255\nG92 E0\nG1 E5 F300\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20} ; drop nozzle temp, make filament shink a bit\nG92 E0\nG1 E-0.5 F300\n\nG1 X70 F9000\nG1 X76 F15000\nG1 X65 F15000\nG1 X76 F15000\nG1 X65 F15000; shake to put down garbage\nG1 X80 F6000\nG1 X95 F15000\nG1 X80 F15000\nG1 X165 F15000; wipe and shake\nM400\nM106 P1 S0\n;===== prepare print temperature and material end =====\n\n\n;===== wipe nozzle ===============================\nM1002 gcode_claim_action : 14\nM975 S1\nM106 S255\nG1 X65 Y230 F18000\nG1 Y264 F6000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20}\nG1 X100 F18000 ; first wipe mouth\n\nG0 X135 Y253 F20000 ; move to exposed steel surface edge\nG28 Z P0 T300; home z with low precision,permit 300deg temperature\nG29.2 S0 ; turn off ABL\nG0 Z5 F20000\n\nG1 X60 Y265\nG92 E0\nG1 E-0.5 F300 ; retrack more\nG1 X100 F5000; second wipe mouth\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X90 F5000\nG0 X128 Y261 Z-1.5 F20000 ; move to exposed steel surface and stop the nozzle\nM104 S140 ; set temp down to heatbed acceptable\nM106 S255 ; turn on fan (G28 has turn off fan)\n\nM221 S; push soft endstop status\nM221 Z0 ;turn off Z axis endstop\nG0 Z0.5 F20000\nG0 X125 Y259.5 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 X128\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\n\nM109 S140 ; wait nozzle temp down to heatbed acceptable\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\n\nM221 R; pop softend status\nG1 Z10 F1200\nM400\nG1 Z10\nG1 F30000\nG1 X230 Y15\nG29.2 S1 ; turn on ABL\n;G28 ; home again after hard wipe mouth\nM106 S0 ; turn off fan , too noisy\n;===== wipe nozzle end ================================\n\n\n;===== bed leveling ==================================\nM1002 judge_flag g29_before_print_flag\nM622 J1\n\n M1002 gcode_claim_action : 1\n G29 A X{first_layer_print_min[0]} Y{first_layer_print_min[1]} I{first_layer_print_size[0]} J{first_layer_print_size[1]}\n M400\n M500 ; save cali data\n\nM623\n;===== bed leveling end ================================\n\n;===== home after wipe mouth============================\nM1002 judge_flag g29_before_print_flag\nM622 J0\n\n M1002 gcode_claim_action : 13\n G28\n\nM623\n;===== home after wipe mouth end =======================\n\nM975 S1 ; turn on vibration supression\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {elsif (bed_temperature[initial_extruder] >50)||(bed_temperature_initial_layer[initial_extruder] >50)}\n M106 P3 S255\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n\nM104 S{nozzle_temperature_initial_layer[initial_extruder]} ; set extrude temp earlier, to reduce wait time\n\n;===== mech mode fast check============================\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q1 A7 B30 C80 H15 K0\nM974 Q1 S2 P0\n\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q0 A7 B30 C90 Q0 H15 K0\nM974 Q0 S2 P0\n\nM975 S1\nG1 F30000\nG1 X230 Y15\nG28 X ; re-home XY\n;===== fmech mode fast check============================\n\n\n;===== noozle load line ===============================\nM975 S1\nG90\nM83\nT1000\nG1 X18.0 Y1.0 Z0.8 F18000;Move to start position\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nG0 E2 F300\nG0 X240 E25 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nG0 Y15 E1.166 F{outer_wall_volumetric_speed/(0.3*0.5)/ 4 * 60}\nG0 X239.5\nG0 E0.2\nG0 Y1.5 E1.166\nG0 X18 E25 F{outer_wall_volumetric_speed/(0.3*0.5) * 60}\nM400\n\n;===== for Textured PEI Plate , lower the nozzle as the nozzle was touching topmost of the texture when homing ==\n;curr_bed_type={curr_bed_type}\n{if curr_bed_type==\"Textured PEI Plate\"}\nG29.1 Z{-0.04} ; for Textured PEI Plate\n{endif}\n;========turn off light and wait extrude temperature =============\nM1002 gcode_claim_action : 0\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off big fan\nM106 P3 S0 ; turn off chamber fan\n\nM975 S1 ; turn on mech mode supression", - "nozzle_type": "hardened_steel", - "nozzle_hrc": "55", - "upward_compatible_machine":[ - "Orca Arena X1 0.6 nozzle", - "Orca Arena X1 Carbon 0.6 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.8 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.8 nozzle.json deleted file mode 100644 index 3e092d0867..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena P1P 0.8 nozzle.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM012", - "name": "Orca Arena P1P 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Orca Arena P1P 0.4 nozzle", - "printer_model": "Orca Arena P1P", - "default_filament_profile": [ - "Arena PLA Basic @Arena X1" - ], - "nozzle_diameter": [ - "0.8" - ], - "printer_variant": "0.8", - "default_print_profile": "0.40mm Standard @Arena P1P 0.8 nozzle", - "max_layer_height": [ - "0.56" - ], - "min_layer_height": [ - "0.16" - ], - "retraction_length": [ - "3" - ], - "retraction_minimum_travel": [ - "1" - ], - "retract_length_toolchange": [ - "3" - ], - "machine_start_gcode": ";===== machine: P1P ========================\n;===== date: 20230323 =====================\n;===== turn on the HB fan =================\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp to turn on the HB fan\n;===== reset machine status =================\nG91\nM17 Z0.4 ; lower the z-motor current\nG0 Z12 F300 ; lower the hotbed , to prevent the nozzle is below the hotbed\nG0 Z-6;\nG90\nM17 X1.2 Y1.2 Z0.75 ; reset motor current to default\nM960 S5 P1 ; turn on logo lamp\nG90\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 5\nM221 X0 Y0 Z0 ; turn off soft endstop to prevent protential logic problem\nG29.1 Z{+0.0} ; clear z-trim value first\n\n;===== heatbed preheat ====================\nM1002 gcode_claim_action : 2\nM140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {elsif (bed_temperature[initial_extruder] >50)||(bed_temperature_initial_layer[initial_extruder] >50)}\n M106 P3 S255\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n;===== prepare print temperature and material ==========\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nG91\nG0 Z10 F1200\nG90\nG28 X\nM975 S1 ; turn on\nG1 X60 F12000\nG1 Y245\nG1 Y265 F3000\nM620 M\nM620 S[initial_extruder]A ; switch material if AMS exist\n M109 S[nozzle_temperature_initial_layer]\n G1 X120 F12000\n\n G1 X20 Y50 F12000\n G1 Y-3\n T[initial_extruder]\n G1 X54 F12000\n G1 Y265\n M400\nM621 S[initial_extruder]A\nM620.1 E F{filament_max_volumetric_speed[initial_extruder]/2.4053*60} T{nozzle_temperature_range_high[initial_extruder]}\n\n\nM412 S1 ; ===turn on filament runout detection===\n\nM109 S250 ;set nozzle to common flush temp\nM106 P1 S0\nG92 E0\nG1 E50 F200\nM400\nM104 S[nozzle_temperature_initial_layer]\nG92 E0\nG1 E50 F200\nM400\nM106 P1 S255\nG92 E0\nG1 E5 F300\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20} ; drop nozzle temp, make filament shink a bit\nG92 E0\nG1 E-0.5 F300\n\nG1 X70 F9000\nG1 X76 F15000\nG1 X65 F15000\nG1 X76 F15000\nG1 X65 F15000; shake to put down garbage\nG1 X80 F6000\nG1 X95 F15000\nG1 X80 F15000\nG1 X165 F15000; wipe and shake\nM400\nM106 P1 S0\n;===== prepare print temperature and material end =====\n\n\n;===== wipe nozzle ===============================\nM1002 gcode_claim_action : 14\nM975 S1\nM106 S255\nG1 X65 Y230 F18000\nG1 Y264 F6000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]-20}\nG1 X100 F18000 ; first wipe mouth\n\nG0 X135 Y253 F20000 ; move to exposed steel surface edge\nG28 Z P0 T300; home z with low precision,permit 300deg temperature\nG29.2 S0 ; turn off ABL\nG0 Z5 F20000\n\nG1 X60 Y265\nG92 E0\nG1 E-0.5 F300 ; retrack more\nG1 X100 F5000; second wipe mouth\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X100 F5000\nG1 X70 F15000\nG1 X90 F5000\nG0 X128 Y261 Z-1.5 F20000 ; move to exposed steel surface and stop the nozzle\nM104 S140 ; set temp down to heatbed acceptable\nM106 S255 ; turn on fan (G28 has turn off fan)\n\nM221 S; push soft endstop status\nM221 Z0 ;turn off Z axis endstop\nG0 Z0.5 F20000\nG0 X125 Y259.5 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y262.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y260.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.5\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 Z0.5 F20000\nG0 X125 Y261.0\nG0 Z-1.01\nG0 X131 F211\nG0 X124\nG0 X128\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\nG2 I0.5 J0 F300\n\nM109 S140 ; wait nozzle temp down to heatbed acceptable\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\nG2 I0.5 J0 F3000\n\nM221 R; pop softend status\nG1 Z10 F1200\nM400\nG1 Z10\nG1 F30000\nG1 X230 Y15\nG29.2 S1 ; turn on ABL\n;G28 ; home again after hard wipe mouth\nM106 S0 ; turn off fan , too noisy\n;===== wipe nozzle end ================================\n\n\n;===== bed leveling ==================================\nM1002 judge_flag g29_before_print_flag\nM622 J1\n\n M1002 gcode_claim_action : 1\n G29 A X{first_layer_print_min[0]} Y{first_layer_print_min[1]} I{first_layer_print_size[0]} J{first_layer_print_size[1]}\n M400\n M500 ; save cali data\n\nM623\n;===== bed leveling end ================================\n\n;===== home after wipe mouth============================\nM1002 judge_flag g29_before_print_flag\nM622 J0\n\n M1002 gcode_claim_action : 13\n G28\n\nM623\n;===== home after wipe mouth end =======================\n\nM975 S1 ; turn on vibration supression\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_extruder]==\"PLA\"}\n {if (bed_temperature[initial_extruder] >45)||(bed_temperature_initial_layer[initial_extruder] >45)}\n M106 P3 S180\n {elsif (bed_temperature[initial_extruder] >50)||(bed_temperature_initial_layer[initial_extruder] >50)}\n M106 P3 S255\n {endif};Prevent PLA from jamming\n{endif}\nM106 P2 S100 ; turn on big fan ,to cool down toolhead\n\n\nM104 S{nozzle_temperature_initial_layer[initial_extruder]} ; set extrude temp earlier, to reduce wait time\n\n;===== mech mode fast check============================\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q1 A7 B30 C80 H15 K0\nM974 Q1 S2 P0\n\nG1 X128 Y128 Z10 F20000\nM400 P200\nM970.3 Q0 A7 B30 C90 Q0 H15 K0\nM974 Q0 S2 P0\n\nM975 S1\nG1 F30000\nG1 X230 Y15\nG28 X ; re-home XY\n;===== fmech mode fast check============================\n\n\n;===== noozle load line ===============================\nM975 S1\nG90\nM83\nT1000\nG1 X18.0 Y0.5 Z0.8 F18000;Move to start position\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nG0 E2 F300\nG0 X129 E15 F{outer_wall_volumetric_speed/(0.3*1.0) * 60}\nG0 X240 E15\nG0 Y15 E1.500 F{outer_wall_volumetric_speed/(0.3*1.0)/ 4 * 60}\nG0 X239.5\nG0 E0.3\nG0 Y1.5 E1.500\nG0 X129 E15 F{outer_wall_volumetric_speed/(0.3*1.0) * 60}\nG0 X18 E15\nM400\n\n;===== for Textured PEI Plate , lower the nozzle as the nozzle was touching topmost of the texture when homing ==\n;curr_bed_type={curr_bed_type}\n{if curr_bed_type==\"Textured PEI Plate\"}\nG29.1 Z{-0.04} ; for Textured PEI Plate\n{endif}\n;========turn off light and wait extrude temperature =============\nM1002 gcode_claim_action : 0\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off big fan\nM106 P3 S0 ; turn off chamber fan\n\nM975 S1 ; turn on mech mode supression", - "nozzle_type": "hardened_steel", - "nozzle_hrc": "55", - "upward_compatible_machine":[ - "Orca Arena X1 0.8 nozzle", - "Orca Arena X1 Carbon 0.8 nozzle" - ] - } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena P1P.json b/resources/profiles/OrcaArena/machine/Orca Arena P1P.json deleted file mode 100644 index d6876bba95..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena P1P.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "machine_model", - "name": "Orca Arena P1P", - "model_id": "orca_arena_p1p", - "url": "", - "nozzle_diameter": "0.4;0.2;0.6;0.8", - "machine_tech": "FFF", - "family": "ARENA-3DP", - "bed_model": "", - "bed_texture": "", - "hotend_model": "", - "default_materials": "Generic PLA @Arena P1P;Generic PLA Silk @Arena P1P;Arena PLA Matte @Arena P1P;Arena PLA Basic @Arena P1P;Arena ABS @Arena P1P;Arena PC @Arena P1P;Arena Support W @Arena P1P;Arena TPU 95A @Arena P1P;PolyTerra PLA @Arena P1P;PolyLite PLA @Arena P1P;" -} diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 0.2 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 0.2 nozzle.json deleted file mode 100644 index 38c22c1434..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 0.2 nozzle.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM008", - "name": "Orca Arena X1 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Orca Arena X1 0.4 nozzle", - "nozzle_diameter": [ - "0.2" - ], - "printer_variant": "0.2", - "printer_model": "Orca Arena X1", - "default_filament_profile": [ - "Arena PLA Basic @Arena X1C 0.2 nozzle" - ], - "default_print_profile": "0.10mm Standard @Arena X1C 0.2 nozzle", - "max_layer_height": [ - "0.14" - ], - "min_layer_height": [ - "0.04" - ], - "retraction_length": [ - "0.4" - ], - "retraction_minimum_travel": [ - "5" - ], - "nozzle_type": "stainless_steel", - "upward_compatible_machine":[ - "Orca Arena P1P 0.2 nozzle", - "Orca Arena X1 Carbon 0.2 nozzle" - ] - } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 0.4 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 0.4 nozzle.json deleted file mode 100644 index a6038772a3..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 0.4 nozzle.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM003", - "name": "Orca Arena X1 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", - "printer_model": "Orca Arena X1", - "default_filament_profile": [ - "Arena PLA Basic @Arena X1" - ], - "default_print_profile": "0.20mm Standard @Arena X1C", - "nozzle_diameter": [ - "0.4" - ], - "extruder_offset": [ - "0x2" - ], - "machine_max_speed_z": [ - "20", - "20" - ], - "scan_first_layer": "1", - "machine_load_filament_time": "29", - "machine_unload_filament_time": "28", - "nozzle_type": "stainless_steel", - "nozzle_hrc": "20", - "auxiliary_fan": "0", - "upward_compatible_machine":[ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena X1 Carbon 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 0.6 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 0.6 nozzle.json deleted file mode 100644 index dc3eabf663..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 0.6 nozzle.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM006", - "name": "Orca Arena X1 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Orca Arena X1 0.4 nozzle", - "printer_model": "Orca Arena X1", - "default_filament_profile": [ - "Arena PLA Basic @Arena X1" - ], - "default_print_profile": "0.30mm Standard @Arena X1 0.6 nozzle", - "nozzle_diameter": [ - "0.6" - ], - "printer_variant": "0.6", - "max_layer_height": [ - "0.42" - ], - "min_layer_height": [ - "0.12" - ], - "retraction_length": [ - "1.4" - ], - "retraction_minimum_travel": [ - "3" - ], - "nozzle_type": "hardened_steel", - "nozzle_hrc": "55", - "upward_compatible_machine":[ - "Orca Arena P1P 0.6 nozzle", - "Orca Arena X1 Carbon 0.6 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 0.8 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 0.8 nozzle.json deleted file mode 100644 index ba36c1c648..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 0.8 nozzle.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "machine", - "setting_id": "GM007", - "name": "Orca Arena X1 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "Orca Arena X1 0.4 nozzle", - "printer_model": "Orca Arena X1", - "default_filament_profile": [ - "Arena PLA Basic @Arena X1" - ], - "nozzle_diameter": [ - "0.8" - ], - "printer_variant": "0.8", - "default_print_profile": "0.40mm Standard @Arena X1 0.8 nozzle", - "max_layer_height": [ - "0.56" - ], - "min_layer_height": [ - "0.16" - ], - "retraction_length": [ - "3" - ], - "retraction_minimum_travel": [ - "1" - ], - "retract_length_toolchange": [ - "3" - ], - "nozzle_type": "hardened_steel", - "nozzle_hrc": "55", - "upward_compatible_machine":[ - "Orca Arena P1P 0.8 nozzle", - "Orca Arena X1 Carbon 0.8 nozzle" - ] - } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.2 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.2 nozzle.json index eef54fa5e4..fb8868e86b 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.2 nozzle.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.2 nozzle.json @@ -27,9 +27,5 @@ "5" ], "nozzle_type": "stainless_steel", - "nozzle_hrc": "20", - "upward_compatible_machine":[ - "Orca Arena P1P 0.2 nozzle", - "Orca Arena X1 0.2 nozzle" - ] + "nozzle_hrc": "20" } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.4 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.4 nozzle.json index 013ebe0b09..d7f6c655e8 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.4 nozzle.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.4 nozzle.json @@ -14,7 +14,7 @@ "0.4" ], "extruder_offset": [ - "0x2" + "0x0" ], "machine_max_speed_z": [ "20", @@ -25,9 +25,5 @@ "machine_unload_filament_time": "28", "nozzle_type": "hardened_steel", "nozzle_hrc": "55", - "auxiliary_fan": "0", - "upward_compatible_machine":[ - "Orca Arena P1P 0.4 nozzle", - "Orca Arena X1 0.4 nozzle" - ] + "auxiliary_fan": "0" } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.6 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.6 nozzle.json index 224abb8e64..5232ae97e8 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.6 nozzle.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.6 nozzle.json @@ -25,9 +25,5 @@ ], "retraction_minimum_travel": [ "3" - ], - "upward_compatible_machine":[ - "Orca Arena P1P 0.6 nozzle", - "Orca Arena X1 0.6 nozzle" - ] + ] } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.8 nozzle.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.8 nozzle.json index af54736496..facb78d20a 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.8 nozzle.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon 0.8 nozzle.json @@ -28,9 +28,5 @@ ], "retract_length_toolchange": [ "3" - ], - "upward_compatible_machine":[ - "Orca Arena P1P 0.8 nozzle", - "Orca Arena X1 0.8 nozzle" - ] + ] } diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1.json b/resources/profiles/OrcaArena/machine/Orca Arena X1.json deleted file mode 100644 index 90f6b27f56..0000000000 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "machine_model", - "name": "Orca Arena X1", - "model_id": "orca_arena_x1", - "url": "", - "nozzle_diameter": "0.4;0.2;0.6;0.8", - "machine_tech": "FFF", - "family": "ARENA-3DP", - "bed_model": "bbl-3dp-X1.stl", - "bed_texture": "bbl-3dp-logo_cali_lines.svg", - "hotend_model": "", - "default_materials": "Generic PLA Silk;Generic PLA;Arena PLA Matte @Arena X1;Arena PLA Basic @Arena X1;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1;Arena TPU 95A @Arena X1;PolyTerra PLA @Arena X1;PolyLite PLA @Arena X1;" -} diff --git a/resources/profiles/OrcaArena/process/0.08mm Extra Fine @Arena P1P.json b/resources/profiles/OrcaArena/process/0.08mm Extra Fine @Arena P1P.json deleted file mode 100644 index fbff7a0b25..0000000000 --- a/resources/profiles/OrcaArena/process/0.08mm Extra Fine @Arena P1P.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "process", - "setting_id": "GP018", - "name": "0.08mm Extra Fine @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.08", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.10mm Standard @Arena P1P 0.2 nozzle.json b/resources/profiles/OrcaArena/process/0.10mm Standard @Arena P1P 0.2 nozzle.json deleted file mode 100644 index 66b4b1826d..0000000000 --- a/resources/profiles/OrcaArena/process/0.10mm Standard @Arena P1P 0.2 nozzle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "process", - "setting_id": "GP014", - "name": "0.10mm Standard @Arena P1P 0.2 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.10_nozzle_0.2", - "elefant_foot_compensation": "0.15", - "compatible_printers": [ - "Orca Arena P1P 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.12mm Fine @Arena P1P.json b/resources/profiles/OrcaArena/process/0.12mm Fine @Arena P1P.json deleted file mode 100644 index ad88bfd72a..0000000000 --- a/resources/profiles/OrcaArena/process/0.12mm Fine @Arena P1P.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "process", - "setting_id": "GP019", - "name": "0.12mm Fine @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.12", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.16mm Optimal @Arena P1P.json b/resources/profiles/OrcaArena/process/0.16mm Optimal @Arena P1P.json deleted file mode 100644 index b47a5b18da..0000000000 --- a/resources/profiles/OrcaArena/process/0.16mm Optimal @Arena P1P.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "process", - "setting_id": "GP020", - "name": "0.16mm Optimal @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.16", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.20mm Standard @Arena P1P.json b/resources/profiles/OrcaArena/process/0.20mm Standard @Arena P1P.json deleted file mode 100644 index 5988059986..0000000000 --- a/resources/profiles/OrcaArena/process/0.20mm Standard @Arena P1P.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "process", - "setting_id": "GP015", - "name": "0.20mm Standard @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.20", - "elefant_foot_compensation": "0.15", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.20mm Strength @Arena P1P.json b/resources/profiles/OrcaArena/process/0.20mm Strength @Arena P1P.json deleted file mode 100644 index 904e905016..0000000000 --- a/resources/profiles/OrcaArena/process/0.20mm Strength @Arena P1P.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "process", - "setting_id": "GP021", - "name": "0.20mm Strength @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.20", - "outer_wall_speed": "60", - "wall_loops": "6", - "sparse_infill_density": "25%", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.24mm Draft @Arena P1P.json b/resources/profiles/OrcaArena/process/0.24mm Draft @Arena P1P.json deleted file mode 100644 index fa0d2f57f5..0000000000 --- a/resources/profiles/OrcaArena/process/0.24mm Draft @Arena P1P.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "process", - "setting_id": "GP022", - "name": "0.24mm Draft @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.24", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.28mm Extra Draft @Arena P1P.json b/resources/profiles/OrcaArena/process/0.28mm Extra Draft @Arena P1P.json deleted file mode 100644 index 89c7c2d1f2..0000000000 --- a/resources/profiles/OrcaArena/process/0.28mm Extra Draft @Arena P1P.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "process", - "setting_id": "GP023", - "name": "0.28mm Extra Draft @Arena P1P", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.28", - "compatible_printers": [ - "Orca Arena P1P 0.4 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.30mm Standard @Arena P1P 0.6 nozzle.json b/resources/profiles/OrcaArena/process/0.30mm Standard @Arena P1P 0.6 nozzle.json deleted file mode 100644 index e98787d172..0000000000 --- a/resources/profiles/OrcaArena/process/0.30mm Standard @Arena P1P 0.6 nozzle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "process", - "setting_id": "GP016", - "name": "0.30mm Standard @Arena P1P 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.30_nozzle_0.6", - "elefant_foot_compensation": "0.15", - "compatible_printers": [ - "Orca Arena P1P 0.6 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.30mm Standard @Arena X1 0.6 nozzle.json b/resources/profiles/OrcaArena/process/0.30mm Standard @Arena X1 0.6 nozzle.json deleted file mode 100644 index 4de0c8d53e..0000000000 --- a/resources/profiles/OrcaArena/process/0.30mm Standard @Arena X1 0.6 nozzle.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "process", - "setting_id": "GP011", - "name": "0.30mm Standard @Arena X1 0.6 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.30_nozzle_0.6", - "compatible_printers": [ - "Orca Arena X1 0.6 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.40mm Standard @Arena P1P 0.8 nozzle.json b/resources/profiles/OrcaArena/process/0.40mm Standard @Arena P1P 0.8 nozzle.json deleted file mode 100644 index d56abfe747..0000000000 --- a/resources/profiles/OrcaArena/process/0.40mm Standard @Arena P1P 0.8 nozzle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "process", - "setting_id": "GP017", - "name": "0.40mm Standard @Arena P1P 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.40_nozzle_0.8", - "elefant_foot_compensation": "0.15", - "compatible_printers": [ - "Orca Arena P1P 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/process/0.40mm Standard @Arena X1 0.8 nozzle.json b/resources/profiles/OrcaArena/process/0.40mm Standard @Arena X1 0.8 nozzle.json deleted file mode 100644 index 2fd92157b4..0000000000 --- a/resources/profiles/OrcaArena/process/0.40mm Standard @Arena X1 0.8 nozzle.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "process", - "setting_id": "GP012", - "name": "0.40mm Standard @Arena X1 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_bbl_0.40_nozzle_0.8", - "compatible_printers": [ - "Orca Arena X1 0.8 nozzle" - ] -} diff --git a/resources/web/image/printer/Creality Ender-5 Pro 2019_cover.png b/resources/web/image/printer/Creality Ender-5 Pro 2019_cover.png new file mode 100644 index 0000000000..8e8d1dd256 Binary files /dev/null and b/resources/web/image/printer/Creality Ender-5 Pro 2019_cover.png differ diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 64fdc9ae48..6a3042d5b5 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -242,7 +242,7 @@ AboutDialog::AboutDialog() vesizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5)); auto version_string = _L("Orca Slicer ") + " " + std::string(SoftFever_VERSION); wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize); - wxStaticText* bs_version = new wxStaticText(this, wxID_ANY, wxString::Format("Based on BambuStudio %s",std::string(SLIC3R_VERSION)), wxDefaultPosition, wxDefaultSize); + wxStaticText* bs_version = new wxStaticText(this, wxID_ANY, wxString::Format("Based on BambuStudio and PrusaSlicer"), wxDefaultPosition, wxDefaultSize); bs_version->SetFont(Label::Body_12); wxFont version_font = GetFont(); #ifdef __WXMSW__ diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index b8d7c2fa40..8818f5fd9d 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -757,33 +757,33 @@ const std::vector GCodeViewer::Travel_Colors {{ // Normal ranges // blue to red -//const std::vector GCodeViewer::Range_Colors{{ -// decode_color_to_float_array("#FF00FF"), // bluish -// decode_color_to_float_array("#FF55A9"), -// decode_color_to_float_array("#FE8778"), -// decode_color_to_float_array("#FFB847"), -// decode_color_to_float_array("#FFD925"), -// decode_color_to_float_array("#FFFF00"), -// decode_color_to_float_array("#D8FF00"), -// decode_color_to_float_array("#ADFF04"), -// decode_color_to_float_array("#76FF01"), -// decode_color_to_float_array("#52c7b8") // reddish -//}}; - -const std::vector GCodeViewer::Range_Colors{ { - { 0.043f, 0.173f, 0.478f, 1.0f }, // bluish - { 0.075f, 0.349f, 0.522f, 1.0f }, - { 0.110f, 0.533f, 0.569f, 1.0f }, - { 0.016f, 0.839f, 0.059f, 1.0f }, - { 0.667f, 0.949f, 0.000f, 1.0f }, - { 0.988f, 0.975f, 0.012f, 1.0f }, - { 0.961f, 0.808f, 0.039f, 1.0f }, - { 0.890f, 0.533f, 0.125f, 1.0f }, - { 0.820f, 0.408f, 0.188f, 1.0f }, - { 0.761f, 0.322f, 0.235f, 1.0f }, - { 0.581f, 0.149f, 0.087f, 1.0f } // reddish +const std::vector GCodeViewer::Range_Colors{{ + decode_color_to_float_array("#FF00FF"), // bluish + decode_color_to_float_array("#FF55A9"), + decode_color_to_float_array("#FE8778"), + decode_color_to_float_array("#FFB847"), + decode_color_to_float_array("#FFD925"), + decode_color_to_float_array("#FFFF00"), + decode_color_to_float_array("#D8FF00"), + decode_color_to_float_array("#ADFF04"), + decode_color_to_float_array("#76FF01"), + decode_color_to_float_array("#52c7b8") // reddish }}; +//const std::vector GCodeViewer::Range_Colors {{ +// {0.043f, 0.173f, 0.478f, 1.0f}, // bluish +// {0.075f, 0.349f, 0.522f, 1.0f}, +// {0.110f, 0.533f, 0.569f, 1.0f}, +// {0.016f, 0.839f, 0.059f, 1.0f}, +// {0.667f, 0.949f, 0.000f, 1.0f}, +// {0.988f, 0.975f, 0.012f, 1.0f}, +// {0.961f, 0.808f, 0.039f, 1.0f}, +// //{0.890f, 0.533f, 0.125f, 1.0f}, +// {0.820f, 0.408f, 0.188f, 1.0f}, +// {0.761f, 0.322f, 0.235f, 1.0f}, +// {0.581f, 0.149f, 0.087f, 1.0f} // reddish +//}}; + const GCodeViewer::Color GCodeViewer::Wipe_Color = { 1.0f, 1.0f, 0.0f, 1.0f }; const GCodeViewer::Color GCodeViewer::Neutral_Color = { 0.25f, 0.25f, 0.25f, 1.0f }; diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 3d96dd9928..1c3c3a825f 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -289,15 +289,13 @@ public: memDc.SetTextForeground(StateColor::darkModeColorFor(wxColor(134, 134, 134))); memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_LEFT | wxALIGN_BOTTOM); -// #if BBL_INTERNAL_TESTING - auto bs_version = wxString::Format("Based on BambuStudio %s",std::string(SLIC3R_VERSION)).ToStdString(); + auto bs_version = wxString::Format("Based on PrusaSlicer BambuStudio").ToStdString(); memDc.SetFont(Label::Body_12); wxSize text_rect = memDc.GetTextExtent(bs_version); int start_x = (title_rect.GetLeft() + version_rect.GetRight()) / 2 - text_rect.GetWidth()/2; int start_y = version_rect.GetBottom() + 10; wxRect internal_sign_rect(wxPoint(start_x, start_y), wxSize(text_rect)); memDc.DrawLabel(bs_version, internal_sign_rect, wxALIGN_RIGHT); -// #endif // load bitmap for logo BitmapCache bmp_cache; diff --git a/version.inc b/version.inc index 088fdb9371..9523a1e203 100644 --- a/version.inc +++ b/version.inc @@ -10,5 +10,5 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() -set(SoftFever_VERSION "1.6.2-beta") +set(SoftFever_VERSION "1.6.2") set(SLIC3R_VERSION "01.05.00.61")