From 5dc70830893295327bb9a766ba607cb831731507 Mon Sep 17 00:00:00 2001 From: artillerylab Date: Thu, 6 Nov 2025 10:13:12 +0800 Subject: [PATCH] Update printer profiles for Artillery --- resources/profiles/Artillery.json | 644 +++++++++-------- .../artillery_m1_pro_buildplate_model.stl | Bin 26284 -> 487084 bytes .../artillery_m1_pro_buildplate_texture.svg | 677 +++++++++++++++++- ...lery ABS @Artillery M1 Pro 0.2 nozzle.json | 15 +- ...lery ABS @Artillery M1 Pro 0.4 nozzle.json | 30 +- ...lery ABS @Artillery M1 Pro 0.6 nozzle.json | 15 +- ...lery ABS @Artillery M1 Pro 0.8 nozzle.json | 15 +- .../Artillery/filament/Artillery ABS.json | 32 +- ...lery ASA @Artillery M1 Pro 0.2 nozzle.json | 15 +- ...lery ASA @Artillery M1 Pro 0.4 nozzle.json | 34 +- ...lery ASA @Artillery M1 Pro 0.6 nozzle.json | 15 +- ...lery ASA @Artillery M1 Pro 0.8 nozzle.json | 15 +- .../filament/Artillery Generic ABS.json | 20 +- .../filament/Artillery Generic ASA.json | 20 +- .../filament/Artillery Generic PETG.json | 20 +- .../filament/Artillery Generic PLA-CF.json | 24 +- .../filament/Artillery Generic PLA.json | 24 +- .../filament/Artillery Generic TPU.json | 20 +- ...llery PA @Artillery M1 Pro 0.4 nozzle.json | 65 +- ...ry PA-CF @Artillery M1 Pro 0.4 nozzle.json | 46 +- ...llery PC @Artillery M1 Pro 0.4 nozzle.json | 81 ++- ...lery PET @Artillery M1 Pro 0.2 nozzle.json | 15 +- ...lery PET @Artillery M1 Pro 0.4 nozzle.json | 41 +- ...lery PET @Artillery M1 Pro 0.6 nozzle.json | 15 +- ...lery PET @Artillery M1 Pro 0.8 nozzle.json | 15 +- ...ery PETG @Artillery M1 Pro 0.2 nozzle.json | 13 +- ...ery PETG @Artillery M1 Pro 0.4 nozzle.json | 41 +- ...ery PETG @Artillery M1 Pro 0.6 nozzle.json | 13 +- ...ery PETG @Artillery M1 Pro 0.8 nozzle.json | 13 +- .../Artillery/filament/Artillery PETG.json | 34 +- ...lery PLA @Artillery M1 Pro 0.2 nozzle.json | 13 +- ...lery PLA @Artillery M1 Pro 0.6 nozzle.json | 13 +- ...lery PLA @Artillery M1 Pro 0.8 nozzle.json | 13 +- ...LA Basic @Artillery M1 Pro 0.2 nozzle.json | 17 +- ...LA Basic @Artillery M1 Pro 0.4 nozzle.json | 27 +- ...LA Basic @Artillery M1 Pro 0.6 nozzle.json | 15 +- ...LA Basic @Artillery M1 Pro 0.8 nozzle.json | 17 +- ...A Basic+ @Artillery M1 Pro 0.4 nozzle.json | 17 +- .../filament/Artillery PLA Basic.json | 24 +- ...LA Matte @Artillery M1 Pro 0.2 nozzle.json | 17 +- ...LA Matte @Artillery M1 Pro 0.4 nozzle.json | 25 +- ...LA Matte @Artillery M1 Pro 0.6 nozzle.json | 17 +- ...LA Matte @Artillery M1 Pro 0.8 nozzle.json | 15 +- .../filament/Artillery PLA Matte.json | 24 +- ...PLA Silk @Artillery M1 Pro 0.2 nozzle.json | 17 +- ...PLA Silk @Artillery M1 Pro 0.4 nozzle.json | 33 +- ...PLA Silk @Artillery M1 Pro 0.6 nozzle.json | 17 +- ...PLA Silk @Artillery M1 Pro 0.8 nozzle.json | 17 +- .../filament/Artillery PLA Silk.json | 24 +- .../filament/Artillery PLA Tough.json | 26 +- ...y PLA-CF @Artillery M1 Pro 0.4 nozzle.json | 35 +- ...lery PVA @Artillery M1 Pro 0.2 nozzle.json | 13 +- ...lery PVA @Artillery M1 Pro 0.4 nozzle.json | 25 +- ...lery PVA @Artillery M1 Pro 0.6 nozzle.json | 13 +- ...lery PVA @Artillery M1 Pro 0.8 nozzle.json | 13 +- ...lery TPU @Artillery M1 Pro 0.4 nozzle.json | 19 +- ...lery TPU @Artillery M1 Pro 0.6 nozzle.json | 13 +- ...lery TPU @Artillery M1 Pro 0.8 nozzle.json | 13 +- .../Artillery/filament/Artillery TPU.json | 28 +- .../Artillery/filament/fdm_filament_abs.json | 16 +- .../Artillery/filament/fdm_filament_asa.json | 16 +- .../filament/fdm_filament_common.json | 14 +- .../Artillery/filament/fdm_filament_pet.json | 16 +- .../Artillery/filament/fdm_filament_pla.json | 16 +- .../Artillery/filament/fdm_filament_tpu.json | 16 +- .../machine/Artillery Genius 0.4 nozzle.json | 196 ++--- .../Artillery Genius Pro 0.4 nozzle.json | 197 ++--- .../machine/Artillery M1 Pro 0.2 nozzle.json | 11 +- .../machine/Artillery M1 Pro 0.4 nozzle.json | 25 +- .../machine/Artillery M1 Pro 0.6 nozzle.json | 11 +- .../machine/Artillery M1 Pro 0.8 nozzle.json | 11 +- ...tillery Sidewinder X3 Plus 0.4 nozzle.json | 10 +- ...rtillery Sidewinder X3 Pro 0.4 nozzle.json | 15 +- ...tillery Sidewinder X4 Plus 0.4 nozzle.json | 10 +- .../machine/Artillery Sidewinder X4 Plus.json | 2 +- ...rtillery Sidewinder X4 Pro 0.4 nozzle.json | 10 +- .../machine/Artillery Sidewinder X4 Pro.json | 2 +- .../Artillery/machine/fdm_machine_common.json | 2 +- ... Quality @Artillery M1 Pro 0.2 nozzle.json | 13 +- ...Standard @Artillery M1 Pro 0.2 nozzle.json | 13 +- ...tra Fine @Artillery M1 Pro 0.4 nozzle.json | 48 +- ...tra Fine @Artillery X4Plus 0.4 nozzle.json | 12 +- ...xtra Fine @Artillery X4Pro 0.4 nozzle.json | 12 +- ... Quality @Artillery M1 Pro 0.2 nozzle.json | 11 +- ... Quality @Artillery M1 Pro 0.4 nozzle.json | 43 +- ... Quality @Artillery X4Plus 0.4 nozzle.json | 14 +- ...h Quality @Artillery X4Pro 0.4 nozzle.json | 12 +- ...Standard @Artillery M1 Pro 0.2 nozzle.json | 15 +- ... Quality @Artillery M1 Pro 0.2 nozzle.json | 13 +- ...Standard @Artillery M1 Pro 0.2 nozzle.json | 15 +- ...2mm Fine @Artillery M1 Pro 0.4 nozzle.json | 49 +- ...2mm Fine @Artillery X4Plus 0.4 nozzle.json | 12 +- ...12mm Fine @Artillery X4Pro 0.4 nozzle.json | 12 +- ... Quality @Artillery M1 Pro 0.4 nozzle.json | 44 +- ... Quality @Artillery X4Plus 0.4 nozzle.json | 14 +- ...h Quality @Artillery X4Pro 0.4 nozzle.json | 14 +- ...Standard @Artillery M1 Pro 0.2 nozzle.json | 15 +- ...Standard @Artillery M1 Pro 0.2 nozzle.json | 15 +- .../0.15mm Optimal @Artillery Genius Pro.json | 214 +++--- .../0.15mm Optimal @Artillery Genius.json | 214 +++--- ... Quality @Artillery M1 Pro 0.4 nozzle.json | 37 +- ... Quality @Artillery X4Plus 0.4 nozzle.json | 14 +- ...h Quality @Artillery X4Pro 0.4 nozzle.json | 14 +- .../0.16mm Optimal @Artillery Hornet.json | 214 +++--- ... Optimal @Artillery M1 Pro 0.4 nozzle.json | 47 +- .../process/0.16mm Optimal @Artillery X1.json | 214 +++--- ... Optimal @Artillery X4Plus 0.4 nozzle.json | 12 +- ...m Optimal @Artillery X4Pro 0.4 nozzle.json | 12 +- ...Standard @Artillery M1 Pro 0.6 nozzle.json | 13 +- ...0.20mm Standard @Artillery Genius Pro.json | 214 +++--- .../0.20mm Standard @Artillery Genius.json | 214 +++--- .../0.20mm Standard @Artillery Hornet.json | 214 +++--- ...Standard @Artillery M1 Pro 0.4 nozzle.json | 27 +- .../0.20mm Standard @Artillery X1.json | 214 +++--- .../0.20mm Standard @Artillery X2.json | 212 +++--- ...Standard @Artillery X3Plus 0.4 nozzle.json | 15 +- ... Standard @Artillery X3Pro 0.4 nozzle.json | 15 +- ...Standard @Artillery X4Plus 0.4 nozzle.json | 13 +- ... Standard @Artillery X4Pro 0.4 nozzle.json | 16 +- ...Strength @Artillery M1 Pro 0.4 nozzle.json | 49 +- ...Strength @Artillery X4Plus 0.4 nozzle.json | 10 +- ... Strength @Artillery X4Pro 0.4 nozzle.json | 10 +- .../0.24mm Draft @Artillery Hornet.json | 214 +++--- ...mm Draft @Artillery M1 Pro 0.4 nozzle.json | 19 +- ...mm Draft @Artillery M1 Pro 0.6 nozzle.json | 15 +- ...mm Draft @Artillery M1 Pro 0.8 nozzle.json | 15 +- .../process/0.24mm Draft @Artillery X1.json | 214 +++--- ...mm Draft @Artillery X4Plus 0.4 nozzle.json | 12 +- ...4mm Draft @Artillery X4Pro 0.4 nozzle.json | 12 +- ...Standard @Artillery M1 Pro 0.6 nozzle.json | 15 +- ...Standard @Artillery M1 Pro 0.8 nozzle.json | 15 +- .../0.25mm Draft @Artillery Genius Pro.json | 214 +++--- .../0.25mm Draft @Artillery Genius.json | 214 +++--- ...ra Draft @Artillery M1 Pro 0.4 nozzle.json | 19 +- ...ra Draft @Artillery X4Plus 0.4 nozzle.json | 12 +- ...tra Draft @Artillery X4Pro 0.4 nozzle.json | 12 +- ...Standard @Artillery M1 Pro 0.6 nozzle.json | 15 +- ...Strength @Artillery M1 Pro 0.6 nozzle.json | 11 +- ...Standard @Artillery M1 Pro 0.8 nozzle.json | 15 +- ...Standard @Artillery M1 Pro 0.6 nozzle.json | 13 +- ...Standard @Artillery M1 Pro 0.8 nozzle.json | 15 +- ...Standard @Artillery M1 Pro 0.6 nozzle.json | 13 +- ...Standard @Artillery M1 Pro 0.8 nozzle.json | 15 +- ...Standard @Artillery M1 Pro 0.8 nozzle.json | 15 +- .../Artillery/process/fdm_process_common.json | 4 +- 145 files changed, 3865 insertions(+), 3060 deletions(-) diff --git a/resources/profiles/Artillery.json b/resources/profiles/Artillery.json index c7c1632678..ded2113bbc 100644 --- a/resources/profiles/Artillery.json +++ b/resources/profiles/Artillery.json @@ -1,9 +1,13 @@ { "name": "Artillery", - "version": "02.03.01.10", + "version": "02.03.02.10", "force_update": "0", "description": "Artillery configurations", "machine_model_list": [ + { + "name": "Artillery Sidewinder X1", + "sub_path": "machine/Artillery Sidewinder X1.json" + }, { "name": "Artillery Genius", "sub_path": "machine/Artillery Genius.json" @@ -12,143 +16,43 @@ "name": "Artillery Genius Pro", "sub_path": "machine/Artillery Genius Pro.json" }, - { - "name": "Artillery Hornet", - "sub_path": "machine/Artillery Hornet.json" - }, - { - "name": "Artillery M1 Pro", - "sub_path": "machine/Artillery M1 Pro.json" - }, - { - "name": "Artillery Sidewinder X1", - "sub_path": "machine/Artillery Sidewinder X1.json" - }, { "name": "Artillery Sidewinder X2", "sub_path": "machine/Artillery Sidewinder X2.json" }, { - "name": "Artillery Sidewinder X3 Plus", - "sub_path": "machine/Artillery Sidewinder X3 Plus.json" + "name": "Artillery Hornet", + "sub_path": "machine/Artillery Hornet.json" }, { "name": "Artillery Sidewinder X3 Pro", "sub_path": "machine/Artillery Sidewinder X3 Pro.json" }, { - "name": "Artillery Sidewinder X4 Plus", - "sub_path": "machine/Artillery Sidewinder X4 Plus.json" + "name": "Artillery Sidewinder X3 Plus", + "sub_path": "machine/Artillery Sidewinder X3 Plus.json" }, { "name": "Artillery Sidewinder X4 Pro", "sub_path": "machine/Artillery Sidewinder X4 Pro.json" + }, + { + "name": "Artillery Sidewinder X4 Plus", + "sub_path": "machine/Artillery Sidewinder X4 Plus.json" + }, + { + "name": "Artillery M1 Pro", + "sub_path": "machine/Artillery M1 Pro.json" } ], "process_list": [ - { - "name": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", - "sub_path": "process/0.08mm High Quality @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", - "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", - "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.8 nozzle.json" - }, { "name": "fdm_process_common", "sub_path": "process/fdm_process_common.json" }, { - "name": "0.06mm High Quality @Artillery M1 Pro 0.2 nozzle", - "sub_path": "process/0.06mm High Quality @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "0.06mm Standard @Artillery M1 Pro 0.2 nozzle", - "sub_path": "process/0.06mm Standard @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "0.08mm Standard @Artillery M1 Pro 0.2 nozzle", - "sub_path": "process/0.08mm Standard @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "0.10mm High Quality @Artillery M1 Pro 0.2 nozzle", - "sub_path": "process/0.10mm High Quality @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "0.10mm Standard @Artillery M1 Pro 0.2 nozzle", - "sub_path": "process/0.10mm Standard @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "0.12mm Standard @Artillery M1 Pro 0.2 nozzle", - "sub_path": "process/0.12mm Standard @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "0.14mm Standard @Artillery M1 Pro 0.2 nozzle", - "sub_path": "process/0.14mm Standard @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "0.18mm Standard @Artillery M1 Pro 0.6 nozzle", - "sub_path": "process/0.18mm Standard @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "0.24mm Standard @Artillery M1 Pro 0.6 nozzle", - "sub_path": "process/0.24mm Standard @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "0.30mm Standard @Artillery M1 Pro 0.6 nozzle", - "sub_path": "process/0.30mm Standard @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "0.30mm Strength @Artillery M1 Pro 0.6 nozzle", - "sub_path": "process/0.30mm Strength @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "0.36mm Standard @Artillery M1 Pro 0.6 nozzle", - "sub_path": "process/0.36mm Standard @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "0.42mm Standard @Artillery M1 Pro 0.6 nozzle", - "sub_path": "process/0.42mm Standard @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "0.24mm Standard @Artillery M1 Pro 0.8 nozzle", - "sub_path": "process/0.24mm Standard @Artillery M1 Pro 0.8 nozzle.json" - }, - { - "name": "0.32mm Standard @Artillery M1 Pro 0.8 nozzle", - "sub_path": "process/0.32mm Standard @Artillery M1 Pro 0.8 nozzle.json" - }, - { - "name": "0.40mm Standard @Artillery M1 Pro 0.8 nozzle", - "sub_path": "process/0.40mm Standard @Artillery M1 Pro 0.8 nozzle.json" - }, - { - "name": "0.48mm Standard @Artillery M1 Pro 0.8 nozzle", - "sub_path": "process/0.48mm Standard @Artillery M1 Pro 0.8 nozzle.json" - }, - { - "name": "0.56mm Standard @Artillery M1 Pro 0.8 nozzle", - "sub_path": "process/0.56mm Standard @Artillery M1 Pro 0.8 nozzle.json" - }, - { - "name": "0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "0.08mm High Quality @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.08mm High Quality @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "0.12mm Fine @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.12mm Fine @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "0.12mm High Quality @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.12mm High Quality @Artillery M1 Pro 0.4 nozzle.json" + "name": "0.16mm Optimal @Artillery X1", + "sub_path": "process/0.16mm Optimal @Artillery X1.json" }, { "name": "0.15mm Optimal @Artillery Genius", @@ -158,21 +62,13 @@ "name": "0.15mm Optimal @Artillery Genius Pro", "sub_path": "process/0.15mm Optimal @Artillery Genius Pro.json" }, - { - "name": "0.16mm High Quality @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.16mm High Quality @Artillery M1 Pro 0.4 nozzle.json" - }, { "name": "0.16mm Optimal @Artillery Hornet", "sub_path": "process/0.16mm Optimal @Artillery Hornet.json" }, { - "name": "0.16mm Optimal @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.16mm Optimal @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "0.16mm Optimal @Artillery X1", - "sub_path": "process/0.16mm Optimal @Artillery X1.json" + "name": "0.20mm Standard @Artillery X1", + "sub_path": "process/0.20mm Standard @Artillery X1.json" }, { "name": "0.20mm Standard @Artillery Genius", @@ -182,49 +78,13 @@ "name": "0.20mm Standard @Artillery Genius Pro", "sub_path": "process/0.20mm Standard @Artillery Genius Pro.json" }, - { - "name": "0.20mm Standard @Artillery Hornet", - "sub_path": "process/0.20mm Standard @Artillery Hornet.json" - }, - { - "name": "0.20mm Standard @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Artillery X1", - "sub_path": "process/0.20mm Standard @Artillery X1.json" - }, { "name": "0.20mm Standard @Artillery X2", "sub_path": "process/0.20mm Standard @Artillery X2.json" }, { - "name": "0.20mm Standard @Artillery X3Plus 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Artillery X3Pro 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json" - }, - { - "name": "0.20mm Strength @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.20mm Strength @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "0.24mm Draft @Artillery Hornet", - "sub_path": "process/0.24mm Draft @Artillery Hornet.json" - }, - { - "name": "0.24mm Draft @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.4 nozzle.json" + "name": "0.20mm Standard @Artillery Hornet", + "sub_path": "process/0.20mm Standard @Artillery Hornet.json" }, { "name": "0.24mm Draft @Artillery X1", @@ -239,8 +99,52 @@ "sub_path": "process/0.25mm Draft @Artillery Genius Pro.json" }, { - "name": "0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle", - "sub_path": "process/0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle.json" + "name": "0.24mm Draft @Artillery Hornet", + "sub_path": "process/0.24mm Draft @Artillery Hornet.json" + }, + { + "name": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.08mm High Quality @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.08mm High Quality @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.12mm Fine @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.12mm Fine @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.12mm High Quality @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.12mm High Quality @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.16mm High Quality @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.16mm High Quality @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.16mm Optimal @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.16mm Optimal @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.20mm Strength @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.20mm Strength @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.24mm Draft @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.24mm Draft @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle", + "sub_path": "process/0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json" }, { "name": "0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle", @@ -279,107 +183,143 @@ "sub_path": "process/0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle.json" }, { - "name": "0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle.json" + "name": "0.20mm Standard @Artillery X3Plus 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json" }, { - "name": "0.08mm High Quality @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.08mm High Quality @Artillery X4Pro 0.4 nozzle.json" + "name": "0.20mm Standard @Artillery X3Pro 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json" }, { - "name": "0.12mm Fine @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.12mm Fine @Artillery X4Pro 0.4 nozzle.json" + "name": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", + "sub_path": "process/0.08mm High Quality @Artillery M1 Pro 0.2 nozzle.json" }, { - "name": "0.12mm High Quality @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.12mm High Quality @Artillery X4Pro 0.4 nozzle.json" + "name": "0.06mm High Quality @Artillery M1 Pro 0.2 nozzle", + "sub_path": "process/0.06mm High Quality @Artillery M1 Pro 0.2 nozzle.json" }, { - "name": "0.16mm High Quality @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.16mm High Quality @Artillery X4Pro 0.4 nozzle.json" + "name": "0.06mm Standard @Artillery M1 Pro 0.2 nozzle", + "sub_path": "process/0.06mm Standard @Artillery M1 Pro 0.2 nozzle.json" }, { - "name": "0.16mm Optimal @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.16mm Optimal @Artillery X4Pro 0.4 nozzle.json" + "name": "0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle.json" }, { - "name": "0.20mm Strength @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.20mm Strength @Artillery X4Pro 0.4 nozzle.json" + "name": "0.08mm High Quality @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.08mm High Quality @Artillery M1 Pro 0.4 nozzle.json" }, { - "name": "0.24mm Draft @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.24mm Draft @Artillery X4Pro 0.4 nozzle.json" + "name": "0.08mm Standard @Artillery M1 Pro 0.2 nozzle", + "sub_path": "process/0.08mm Standard @Artillery M1 Pro 0.2 nozzle.json" }, { - "name": "0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle", - "sub_path": "process/0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle.json" + "name": "0.10mm High Quality @Artillery M1 Pro 0.2 nozzle", + "sub_path": "process/0.10mm High Quality @Artillery M1 Pro 0.2 nozzle.json" + }, + { + "name": "0.10mm Standard @Artillery M1 Pro 0.2 nozzle", + "sub_path": "process/0.10mm Standard @Artillery M1 Pro 0.2 nozzle.json" + }, + { + "name": "0.12mm Fine @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.12mm Fine @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "0.12mm High Quality @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.12mm High Quality @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "0.12mm Standard @Artillery M1 Pro 0.2 nozzle", + "sub_path": "process/0.12mm Standard @Artillery M1 Pro 0.2 nozzle.json" + }, + { + "name": "0.14mm Standard @Artillery M1 Pro 0.2 nozzle", + "sub_path": "process/0.14mm Standard @Artillery M1 Pro 0.2 nozzle.json" + }, + { + "name": "0.16mm High Quality @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.16mm High Quality @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "0.16mm Optimal @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.16mm Optimal @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "0.24mm Standard @Artillery M1 Pro 0.6 nozzle", + "sub_path": "process/0.24mm Standard @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "0.18mm Standard @Artillery M1 Pro 0.6 nozzle", + "sub_path": "process/0.18mm Standard @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "0.20mm Standard @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "0.20mm Strength @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.20mm Strength @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "0.24mm Draft @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", + "sub_path": "process/0.24mm Draft @Artillery M1 Pro 0.8 nozzle.json" + }, + { + "name": "0.24mm Standard @Artillery M1 Pro 0.8 nozzle", + "sub_path": "process/0.24mm Standard @Artillery M1 Pro 0.8 nozzle.json" + }, + { + "name": "0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle", + "sub_path": "process/0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "0.30mm Standard @Artillery M1 Pro 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @Artillery M1 Pro 0.6 nozzle", + "sub_path": "process/0.30mm Strength @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "0.32mm Standard @Artillery M1 Pro 0.8 nozzle", + "sub_path": "process/0.32mm Standard @Artillery M1 Pro 0.8 nozzle.json" + }, + { + "name": "0.36mm Standard @Artillery M1 Pro 0.6 nozzle", + "sub_path": "process/0.36mm Standard @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "0.40mm Standard @Artillery M1 Pro 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Artillery M1 Pro 0.8 nozzle.json" + }, + { + "name": "0.42mm Standard @Artillery M1 Pro 0.6 nozzle", + "sub_path": "process/0.42mm Standard @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "0.48mm Standard @Artillery M1 Pro 0.8 nozzle", + "sub_path": "process/0.48mm Standard @Artillery M1 Pro 0.8 nozzle.json" + }, + { + "name": "0.56mm Standard @Artillery M1 Pro 0.8 nozzle", + "sub_path": "process/0.56mm Standard @Artillery M1 Pro 0.8 nozzle.json" } ], "filament_list": [ - { - "name": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", - "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", - "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", - "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json" - }, { "name": "fdm_filament_common", "sub_path": "filament/fdm_filament_common.json" }, - { - "name": "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle", - "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle", - "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle", - "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json" - }, - { - "name": "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle", - "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle", - "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle", - "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json" - }, - { - "name": "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle", - "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json" - }, - { - "name": "Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle", - "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json" - }, - { - "name": "Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle", - "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json" - }, - { - "name": "fdm_filament_abs", - "sub_path": "filament/fdm_filament_abs.json" - }, - { - "name": "fdm_filament_asa", - "sub_path": "filament/fdm_filament_asa.json" - }, - { - "name": "fdm_filament_pet", - "sub_path": "filament/fdm_filament_pet.json" - }, { "name": "fdm_filament_pla", "sub_path": "filament/fdm_filament_pla.json" @@ -389,16 +329,16 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Artillery Generic ABS", - "sub_path": "filament/Artillery Generic ABS.json" + "name": "fdm_filament_pet", + "sub_path": "filament/fdm_filament_pet.json" }, { - "name": "Artillery Generic ASA", - "sub_path": "filament/Artillery Generic ASA.json" + "name": "fdm_filament_abs", + "sub_path": "filament/fdm_filament_abs.json" }, { - "name": "Artillery Generic PETG", - "sub_path": "filament/Artillery Generic PETG.json" + "name": "fdm_filament_asa", + "sub_path": "filament/fdm_filament_asa.json" }, { "name": "Artillery Generic PLA", @@ -408,98 +348,58 @@ "name": "Artillery Generic PLA-CF", "sub_path": "filament/Artillery Generic PLA-CF.json" }, + { + "name": "Artillery Generic PETG", + "sub_path": "filament/Artillery Generic PETG.json" + }, + { + "name": "Artillery Generic ABS", + "sub_path": "filament/Artillery Generic ABS.json" + }, { "name": "Artillery Generic TPU", "sub_path": "filament/Artillery Generic TPU.json" }, { - "name": "Artillery ABS", - "sub_path": "filament/Artillery ABS.json" - }, - { - "name": "Artillery ABS @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery ASA @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery PA @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery PC @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery PET @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery PETG", - "sub_path": "filament/Artillery PETG.json" - }, - { - "name": "Artillery PETG @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json" + "name": "Artillery Generic ASA", + "sub_path": "filament/Artillery Generic ASA.json" }, { "name": "Artillery PLA Basic", "sub_path": "filament/Artillery PLA Basic.json" }, - { - "name": "Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json" - }, { "name": "Artillery PLA Matte", "sub_path": "filament/Artillery PLA Matte.json" }, - { - "name": "Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json" - }, { "name": "Artillery PLA Silk", "sub_path": "filament/Artillery PLA Silk.json" }, - { - "name": "Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json" - }, { "name": "Artillery PLA Tough", "sub_path": "filament/Artillery PLA Tough.json" }, { - "name": "Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery PVA @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json" + "name": "Artillery PETG", + "sub_path": "filament/Artillery PETG.json" }, { "name": "Artillery TPU", "sub_path": "filament/Artillery TPU.json" }, { - "name": "Artillery TPU @Artillery M1 Pro 0.4 nozzle", - "sub_path": "filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json" + "name": "Artillery ABS", + "sub_path": "filament/Artillery ABS.json" }, { "name": "Artillery ABS @Artillery M1 Pro 0.2 nozzle", "sub_path": "filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json" }, + { + "name": "Artillery ABS @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json" + }, { "name": "Artillery ABS @Artillery M1 Pro 0.6 nozzle", "sub_path": "filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json" @@ -512,6 +412,10 @@ "name": "Artillery ASA @Artillery M1 Pro 0.2 nozzle", "sub_path": "filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json" }, + { + "name": "Artillery ASA @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json" + }, { "name": "Artillery ASA @Artillery M1 Pro 0.6 nozzle", "sub_path": "filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json" @@ -524,6 +428,10 @@ "name": "Artillery PET @Artillery M1 Pro 0.2 nozzle", "sub_path": "filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json" }, + { + "name": "Artillery PET @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json" + }, { "name": "Artillery PET @Artillery M1 Pro 0.6 nozzle", "sub_path": "filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json" @@ -536,6 +444,10 @@ "name": "Artillery PETG @Artillery M1 Pro 0.2 nozzle", "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json" }, + { + "name": "Artillery PETG @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json" + }, { "name": "Artillery PETG @Artillery M1 Pro 0.6 nozzle", "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json" @@ -544,10 +456,90 @@ "name": "Artillery PETG @Artillery M1 Pro 0.8 nozzle", "sub_path": "filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json" }, + { + "name": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", + "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json" + }, + { + "name": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", + "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", + "sub_path": "filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json" + }, + { + "name": "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle", + "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json" + }, + { + "name": "Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle", + "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle", + "sub_path": "filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json" + }, + { + "name": "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle", + "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json" + }, + { + "name": "Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle", + "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle", + "sub_path": "filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json" + }, + { + "name": "Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "Artillery PA @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "Artillery PC @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle", + "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json" + }, + { + "name": "Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json" + }, + { + "name": "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle", + "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json" + }, + { + "name": "Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle", + "sub_path": "filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json" + }, { "name": "Artillery PVA @Artillery M1 Pro 0.2 nozzle", "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json" }, + { + "name": "Artillery PVA @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json" + }, { "name": "Artillery PVA @Artillery M1 Pro 0.6 nozzle", "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json" @@ -556,6 +548,10 @@ "name": "Artillery PVA @Artillery M1 Pro 0.8 nozzle", "sub_path": "filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json" }, + { + "name": "Artillery TPU @Artillery M1 Pro 0.4 nozzle", + "sub_path": "filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json" + }, { "name": "Artillery TPU @Artillery M1 Pro 0.6 nozzle", "sub_path": "filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json" @@ -570,10 +566,18 @@ "name": "fdm_machine_common", "sub_path": "machine/fdm_machine_common.json" }, + { + "name": "Artillery Sidewinder X1 0.4 nozzle", + "sub_path": "machine/Artillery Sidewinder X1 0.4 nozzle.json" + }, { "name": "Artillery Genius 0.4 nozzle", "sub_path": "machine/Artillery Genius 0.4 nozzle.json" }, + { + "name": "Artillery Sidewinder X2 0.4 nozzle", + "sub_path": "machine/Artillery Sidewinder X2 0.4 nozzle.json" + }, { "name": "Artillery Genius Pro 0.4 nozzle", "sub_path": "machine/Artillery Genius Pro 0.4 nozzle.json" @@ -583,37 +587,29 @@ "sub_path": "machine/Artillery Hornet 0.4 nozzle.json" }, { - "name": "Artillery M1 Pro 0.4 nozzle", - "sub_path": "machine/Artillery M1 Pro 0.4 nozzle.json" - }, - { - "name": "Artillery Sidewinder X1 0.4 nozzle", - "sub_path": "machine/Artillery Sidewinder X1 0.4 nozzle.json" - }, - { - "name": "Artillery Sidewinder X2 0.4 nozzle", - "sub_path": "machine/Artillery Sidewinder X2 0.4 nozzle.json" + "name": "Artillery Sidewinder X3 Pro 0.4 nozzle", + "sub_path": "machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json" }, { "name": "Artillery Sidewinder X3 Plus 0.4 nozzle", "sub_path": "machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json" }, { - "name": "Artillery Sidewinder X3 Pro 0.4 nozzle", - "sub_path": "machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json" + "name": "Artillery Sidewinder X4 Pro 0.4 nozzle", + "sub_path": "machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json" }, { "name": "Artillery Sidewinder X4 Plus 0.4 nozzle", "sub_path": "machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json" }, - { - "name": "Artillery Sidewinder X4 Pro 0.4 nozzle", - "sub_path": "machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json" - }, { "name": "Artillery M1 Pro 0.2 nozzle", "sub_path": "machine/Artillery M1 Pro 0.2 nozzle.json" }, + { + "name": "Artillery M1 Pro 0.4 nozzle", + "sub_path": "machine/Artillery M1 Pro 0.4 nozzle.json" + }, { "name": "Artillery M1 Pro 0.6 nozzle", "sub_path": "machine/Artillery M1 Pro 0.6 nozzle.json" @@ -623,4 +619,4 @@ "sub_path": "machine/Artillery M1 Pro 0.8 nozzle.json" } ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/artillery_m1_pro_buildplate_model.stl b/resources/profiles/Artillery/artillery_m1_pro_buildplate_model.stl index c0459d478c8cddd599c65a6f968d937a1339c73c..f489d6e7942d5a1f86388b792b165233f4ec7071 100644 GIT binary patch literal 487084 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 z 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≈_T~=*%S1 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 O{X|sa*K$hz@&5tm99c^M literal 26284 zcma)E36xdUmAybQ1VxQ8MvVzY4T?+-ptenXUw=7kRuphTX_Y9AHee)1V^nxiW8x6O zEH#EWK-DiWfQTq+9Nx!YE{#J6m#uN?j>e@OL!1W^T}$bG?!D*UeSg*ORevq@_}{}m&3o_Fyw6_yOlsa^ z#PH_+{YDJmdY~~IE}K)`;iI0+7?c0=#!G4ox`%W?#Q$GXGiGSLTqFq708!9&AkcmR zJEdc8*>-$-XF<*6)*iHi4BLu;S8OBEqLzRd{$kf|@Vj*0fs1c6=5A^?$k1XNir75* zgBwx=YXup$eP2OxUR^fb_7DC)^cBllzYv+k;adX2M_!#Y@ul&@*59qxaYy<}V+t}_QpD$98N7P~L`K(v@V#4wS1ZXA z+~IbE4BJ4gzz70y(3l1YXvLU%QGHDTM;@lPXH#OS|u{H_54HbP5~Jpz*a;vM##rO>*+&wzT^%eUiFE9R=92vd3B4~QUPkE$(zvb0B@tI zXMov)z7u;v_K4S-Pm`59rU4?O>p)z8%jcpkvjjH8_dz|+kmz|AsXv z0J;ND2KGF=d7#9^a{mwowFJadFMhK+Y3HNGMo#S_j%Z_tX@h!pnC9&TL`Umqt4XV1 zEs|kF+7~;IAOFX(8#kjr@&VR&kq0=L(S&Hf`Id2v;C4yQjFEnl{@QWUIV%~l>x`zJ zVOL?~&{rhGh9Vvw+Pb;{qF@h=IUeJE#~p)?=sdxX1^Ijf`X;hqtYLC5W7~ zxLrm-&yP8tC3yST`O{==kZgMw>(Rx>h@7+%uh_ORG8X8s(zMPO#=BWH^PxbJt7HNOfnymE+xM&oUO_eY-yXoc&LhmC6T?+DS(`|gPrwDP6v@+Hr87-Z6-rL21 zozEF?(ap>Upk;w!t_Jk2=Nyb9rxc-$JR-SUxEcG`dxwz-3+1iJM zK;SuPWvoTA^Qt6q9B|X5F@z{ch8E96nT3M*=*cmAkQS`7R*-RB##{b*=G41Zk@aHg zN9TljMKbIuLPoFwf@1ZV4Bj9LOhqL%3IU$}4$ zwN=owgk?fJxw4GNqbGzw9N{_;UmkX0^_0u6$hN(sedW!EV3ruo=w-(Al3`B~(pL=- z1ziV%S5$hZs2$U(ZKtL;cXh*OlsEw0G0wF8MjWc^fGSK3YAin+9ZFe+4Kr6HaS$GWWxHFk0*j1O6 zFCiIPmy|ts^8X-Gt$;ww(!TN~*zuM%4w8joQQNSg2so9KmT(I}i)7fqZhN`BJsn@d zHtr^SL52-QIKHG$1hm3+$iA;2S#GJU`(^PYG9DZ`A#Cp|g8C{W87=$BEnniS5B2XN z@x;ou7ot5yz$^TMmhDm1A`f8$tU;lC30Q;BF3G|NXiS6z1rMPWWL)=gDEpz~?6url5wCPkM}+Mv+m_X`(W(|9&=RF?rfylpk^%14xMvjzOlHYv$ zIptRt47P2NoTZ3XAdUcHL*>eSNvmKjwr9+B%LbJ;Ej~qTm|uK2uRQHq>}L@N$;INc z&nqt(Z?7W`Lgb{Cu@=dQsYM3X-$gtLBuC_`=yv5bRaKS|r1(iB$LYlH8QoKcU!D?%93Dp-qT*!b&{&t_AqXFD6i&oBSv4Lg5|*-_?RfDJ+z(&8Rv z1ZY1ZT$4}n1`pW_9 z_UCoStLvYSol-7Vy0vM{H-OmjJG)Bch7qhqa$(G(HIqx<-erPC@Eww~4Nsh0{(RzA zcHJ~auolU%vDceBl}?-XT{|8h9DIEFx#q3yI?tD!SRQh>ZMPs9k@o|UQA=LZoOb1uu?-LzT?gWck@sgCw>#Iy!PZI6$X<#tq*bsM$%tdO(!XYJK6r6;%!xOx zdg;Ey%a6}-zLO^f$*`da1fDlQWON;fi{5?k!1?bjuyN3xg5>PIpB`F%;38`~MHtd5 zSc_!Dan1n;9Qf(O3+;G3dqM}^$Sw}nA{jOmF>>yl2@Mb#T?fMbgu{|w6*hDa7-Zou zks0WI2UQu#`heJg94=^qbtJ7QBM#A~8cPT9)G7lFW>9M{7C|)@)q*Fa6=lSM`bQ@9 z4}ns?BkXC1uX(Uch#{_G5^^6x_{cR|0+X6i{X^T$2!S{TcKBKdA}54!uK|&0MFhM8 zlUfq4+E+6|TVS9&e9c3cRFw(gB9GP+t;7b}F9~Dos~OVo_8HCyk`ad@e8r?Mgs|rw zT0ODVjFK?VC%9@xK(H3710B8=0vqUAi|`ebfM6|>5xH>f!nyluMwlh6MKWwC!dFcC zLfDz;XJ|y&`UlOvWF|TrTAT1T;GfLIFkhuMfoPo;$X z^o6kFkyJBe%L03wwpc63xQ=Rue^T3O1`t~RxL;-1 zm`^e)CLUocCVB^Lu~v|A9bQ$b{sDygI}5Vgc_Rx`IUqv)qb~%s1Yui(tlX0}NZmkNa$eawj?_PR#&NqO z7qRjq^^XP!Xoa~8nb`BhEA|AH1|4&Fr3ha!QGcak60}H$4a`JayPI+Hm19s*(3vRJ z1(g|12&sRNmef4d1|#4V)}XCH`f5gKm(lc;AcU`&1VpM8o+a=~nQfW7s3?GMbI(MQ zp(V3KpDT*+6_bESwE_ZO(HhLTU6P?ylzlBEMX*=!gtdZ<>skeP$W=4ouYap?wj9xf zkjN>ghIMW?$hfYvMCu=?4`}3Q>rC~XWkN{(qX8nL>p&n5TgP$rkC_?=+6^+af;~dG z`bW?Lg0+H->li^>^YYaU9b2>&-WgKIq4*TxD<%QKS|p<-_p|TY9KP4$cmxlj6=ZnT z4+OMAOOU~GR*B`TDK82JvZl-?7|2@WMZu(2iAfCz)&f^kQ&!a&u$)z5Icv&`GJ@?{ zCbddTYCy0SxIVp(UI5EkC0?|qyeOE>n&(1=xlfD4lzhdIZ*E;9k`RA!IF*7JE{V4R{4!w5q%)c*>gcpWsEq>PlA>c+slzqKsfI zx(=_vi&lvjRT~9Zyqf1iS%z2rKxAYC2(X-0;zeu9i-L_*S@^`7=SWk8aF(hid}7cd z8F7FYtr9O95a1JQo(mPmQ)Srb2ST`4Z3zgloK@mQL;tWRB=-*?th2TR1X#|3cv1DY z08?1=Tqw)^Lu6^>U^xrrMZq-IJQpfFrOLu5)|4-`yr@N-^s^~rNlUoUphYsg0xwz+ zFB*I&v@o7(uYU+(gta9gz;YJKi?Vf+g}%`RvqgJ#&u#jlt#5OL>^sL~%;6Uv+_mjNOFLa0>ySYX?SNbt zN7x&{-jn-$QTf5ObA3fzJkfnd$h@INjJG+#yi_^CyzNFX@>D6G6gfbkx66J!D*NZ_ z-YaU0(8L-7A=A+PlULJo0PGced&0NobRG1`Alp|dB1TL59cM%A;FsD+wb)+k+=*RZ z+;&4teec$fdHk{iXFrzx?C;n6*)C^4w0GHe>Jf9zA?LL0JadH1EpSY{Qw%3Z_yi2% zfQ`<%OQ-gM;CU6%#(cJDZDnrL$8BPR_xiN2MZ0YK+Pxod`PJdywg{eybZ(^%f%Vrd z>#(~d zt5=`iS|2&1xz~+Z@$S;De;i!4Bgi8~HJ!Su49CIafjv2$>te5#z5cbf?(@HHZBVAi z=dbvj6y}xxyndBfg?%nJ-uPso$nmdJV6i*&f@TyfI1u4DeAc%*=Oqcn>xgw ztB2ot&)5GlUTkn2d_~fCF!ZlA6KVy|3G+9P<5bSwM8ZGj01&yqAga2Yas zE-#@k_0l+EzlB*M6GistG=HQQ+`K{^kLDZp=dH9q4+!kGX%(>z?6zCuZkz9{3!|CZ zwtm4S@rv6`wb(1LA6T`4{UG0Y_Avrn#^G3!W);6QDW9if#3o<>}@L4L* znqOl#f$REYkoBQEmIRS#@v{Wa-BH9dG>C)81}sh+u{hCpiV0a}k3XG+XBTp~@tVUC zcVBSbpf5hrjR!H<1*200a=7u7!yyjGa z#%O-UJ<7enwu6OUUJ=L66_dI+Sc}_bZ&MpogOD6o>ncf10RbWHD@JgyI|OBYVFY>9 zI2$yw+is)XHvaa8Kk=7`zXyPw7p;HUZMV~In-Eb8drqvhLH13Z#(^ES{*4UT%ZgSH z;u8iT{Cy5%z)UO)%mhCT_*s&8g&loc+|kE&Q+xa*0yELB%!Jc&=Qk7I6B{xRE}Fbb z)k(~T_>AI;snrdLv@RPFX@2e6ch8cvt%yilVg&an7=#{W5WqQLoIE!mf3s#;+@Hrj zNuI$pHr|4b9`C{Umu6&79&9AG6_U%`W$Vc}CpN${v@6fRy_zjpr-_T;=* z=jWs48Cr>F!0gk%2oz^~`ZgGrt*=y{m@a%`iI|%V(RTQ`3psE#nK2h1xW01V;|{@E zj?1vKy$*r#7`1%r$S$!#yol7#%h3keGn2pkM)ON6K3ysZVn6D>SDFd5o=&>{t-C9S zZunNGAc(n1ZNzgjh~xD`?-_aYA)BoY%<#|_u|{>@E{z&7rRBn7T0J6gmS`)YlbFom zH?AGE&Ab~&+Q?(|CG{%ub7*O|?@X-x%XhxkR^M0L)5PKd;n%qxLE@J9%yx288YdDC zu5~SWw^{N;j7RKu%w3H60C`?{G@dh%jrr+)XLR0v`p9J#L2>YCvTe&*%2U+F;pSCS zhiwbd`dL}$m48zE$ioR`%%zA(S~8|ZBG`+cF$KLabN07Jy zL>_;6i8vCevX}L{E4&kx-Kj&c7I8gUV+7wJ9!9F+$}>e9xkS$G5?IU zK^d8xJS)fVgu#W&JIbze_s;Ooa9Zc`#tC0Un2Bqey3acGD!b0zdhU%#T9Qh2%LkAC z+}hyhM}p?(7=@mfu+J=e<^~al%CY>Vkg}fZwSZhYO8SbwYfsUkYVG? zCm&Jy+Y(zPOKh<3bm9VW9DLBGQJph?X>Fu!g^GKY+TQQ!C8$3d`{qpV#1TwA)VO=c z5l(f$6GktpeR>VPPi%7|7;34|;t}Mz@YI}pT058TV7+oRTFcznzrzvdaj0#hrEgxo zr0v#)ZeD@wquCxR$IxQi$31si_t2MK+pV`(jEH%VF$2H#PHXnb<#z6-HfAB$avoBh z8}{(a?Y}YRj7YWEo@8W;haBm0pTuAGg!^sHg^#v=bVPHP#344~yoz2?jUHa%yQ0q5 zE-gHr|xBMsN6g3fthF{W+EVn#gXsb!G(L4!hro~ zQ}%@1aAf(`HtZOStcbHgY5>mtYAxh3qKBi~l%d#D=#?a%wzC!Dj69WdTF z#N1i5?xXFFzLj?L!FOT@J=*Q=F-y88S7`4XBc#ZkJw@PM+o|jaN1l!|#{u?ZnX(@# zg0zwm^rxxZ`<(iUBPT8seFeUxE%GIC)OcoaFIYxc&R@Cr2lzeRXK+soI`%GdpLWW9 zunt`Il13it!|)2ZPZ#ArS|yWj)M{}DF^gJ~1@8XAJBqaMCJSh)F2e@$#H}b#q_#qR z2wK$B26|XxNik5;HQk&TE?y$jG`VBh%V1+KOIL zl^oZRWmG83&|0eGC0f;$??<)r3j{KmHqB&Mi_T2cA&{3;VqOx?7oaT}HJ6dmNd;U- z*4Lt0ADwi-9f{WEjM8s0<3vVQp^OY#wmL2O4#mWAAQx?kxoD_JCpJ>s$Sk`wvrMhW zI8p@it1iq$yFPj&bmlV}+Vacgje}iLm_Jmzg@>W~3fXDf|H$4MYeIACP#>0^S7<3k zaJ#8iL>q&>b6eayv-P+>QZ#sm_Q*5P6Tm(b-Mi1dKlD8ao}n}H4D$5xcarA^uLA7P zTjTzmy<)BCA;xCY>`vVYW2YEqpZFf<63+$f4X%oNgE;%JHwbf#&N*N_uoGUUJK?ll z@kGal(RM^=%%dkf20XIh8QPR*pmP$i9^0j}4Y-aSJyvbl(Ffn@)I;+3mn}1av*(VP zpfeM~Erb=7+DK<&>|OSX(Wt&Yy##xxzyZ)0Fq(V8pZ@Ii#^JY2I \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json index 032e4427f4..9bcdcd89fb 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery ABS @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "filament_id": "P39db358", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P39db358", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery ABS @Artillery M1 Pro 0.2 nozzle", "nozzle_temperature": [ "260" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json index 875f4864c6..44ffee3a1f 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json @@ -1,9 +1,4 @@ { - "type": "filament", - "name": "Artillery ABS @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", - "instantiation": "true", "chamber_temperature": [ "50" ], @@ -19,14 +14,18 @@ "filament_settings_id": [ "Artillery ABS @Artillery M1 Pro 0.4 nozzle" ], + "is_custom_defined": "0", + "name": "Artillery ABS @Artillery M1 Pro 0.4 nozzle", "slow_down_layer_time": [ "12" ], + "instantiation": "true", + "from": "system", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ - "1.3" + "0.8" ], "filament_retraction_speed": [ "40" @@ -52,6 +51,7 @@ "hot_plate_temp_initial_layer": [ "100" ], + "inherits": "Artillery Generic PLA", "nozzle_temperature": [ "260" ], @@ -76,19 +76,19 @@ "temperature_vitrification": [ "220" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "25%" ], - "overhang_fan_speed": [ + "overhang_fan_speed": [ "80" ], - "close_fan_the_first_x_layers": [ + "close_fan_the_first_x_layers": [ "3" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.05" ], "textured_plate_temp": [ @@ -102,5 +102,7 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.2.2" + +} diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json index bfa41358b7..0f4e264ec0 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery ABS @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "filament_id": "P39db358", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P39db358", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery ABS @Artillery M1 Pro 0.6 nozzle", "nozzle_temperature": [ "260" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json index e33bbd96de..4d3243610c 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery ABS @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "filament_id": "P39db358", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P39db358", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery ABS @Artillery M1 Pro 0.8 nozzle", "nozzle_temperature": [ "260" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery ABS.json b/resources/profiles/Artillery/filament/Artillery ABS.json index 316796a1ec..1e49b383ef 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS.json +++ b/resources/profiles/Artillery/filament/Artillery ABS.json @@ -1,14 +1,11 @@ { - "type": "filament", - "name": "Artillery ABS", - "inherits": "Artillery Generic PLA", - "from": "system", - "instantiation": "true", + "instantiation": "true", + "from": "system", "compatible_printers": [ - "Artillery Sidewinder X3 Pro 0.4 nozzle", - "Artillery Sidewinder X3 Plus 0.4 nozzle", - "Artillery Sidewinder X4 Pro 0.4 nozzle", - "Artillery Sidewinder X4 Plus 0.4 nozzle" + "Artillery Sidewinder X3 Pro 0.4 nozzle", + "Artillery Sidewinder X3 Plus 0.4 nozzle", + "Artillery Sidewinder X4 Pro 0.4 nozzle", + "Artillery Sidewinder X4 Plus 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -37,6 +34,8 @@ "hot_plate_temp_initial_layer": [ "100" ], + "inherits": "Artillery Generic PLA", + "name": "Artillery ABS", "nozzle_temperature": [ "260" ], @@ -67,19 +66,20 @@ "temperature_vitrification": [ "220" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "25%" ], - "overhang_fan_speed": [ + "overhang_fan_speed": [ "80" ], - "close_fan_the_first_x_layers": [ + "close_fan_the_first_x_layers": [ "3" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.05" - ] -} \ No newline at end of file + ], + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json index fde322042a..3bc398c832 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery ASA @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "filament_id": "P87436f6", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P87436f6", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery ASA @Artillery M1 Pro 0.2 nozzle", "nozzle_temperature": [ "270" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json index 428dd19599..ed73597427 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery ASA @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", - "instantiation": "true", + "instantiation" : "true", "chamber_temperature": [ "55" ], @@ -22,13 +18,13 @@ "fan_min_speed": [ "10" ], - "filament_flow_ratio": [ + "filament_flow_ratio": [ "0.94" ], "filament_max_volumetric_speed": [ "8" ], - "filament_retract_lift_below": [ + "filament_retract_lift_below": [ "259" ], "additional_cooling_fan_speed": [ @@ -40,6 +36,9 @@ "filament_type": [ "ASA" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery ASA @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ "260" ], @@ -50,7 +49,7 @@ "5" ], "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ "0.8" @@ -73,6 +72,7 @@ "hot_plate_temp_initial_layer": [ "100" ], + "inherits": "Artillery Generic PLA", "nozzle_temperature_range_high": [ "280" ], @@ -82,22 +82,22 @@ "temperature_vitrification": [ "110" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "10%" ], - "overhang_fan_speed": [ + "overhang_fan_speed": [ "80" ], - "close_fan_the_first_x_layers": [ + "close_fan_the_first_x_layers": [ "3" ], - "slow_down_min_speed": [ + "slow_down_min_speed": [ "20" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.064" ], "textured_plate_temp": [ @@ -111,5 +111,7 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.2.2" + +} diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json index e9f26828fc..656d403e92 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery ASA @Artillery M1 Pro 0.6 nozzle", - "from": "User", - "filament_id": "P87436f6", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P87436f6", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "User", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery ASA @Artillery M1 Pro 0.6 nozzle", "nozzle_temperature": [ "270" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json index ade4239d14..868b80f2ab 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery ASA @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "filament_id": "P87436f6", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P87436f6", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery ASA @Artillery M1 Pro 0.8 nozzle", "nozzle_temperature": [ "270" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery Generic ABS.json b/resources/profiles/Artillery/filament/Artillery Generic ABS.json index c1ba7edb5c..c71c8b1728 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic ABS.json +++ b/resources/profiles/Artillery/filament/Artillery Generic ABS.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Artillery Generic ABS", - "inherits": "fdm_filament_abs", - "from": "system", - "setting_id": "GFSA04", "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "Artillery Generic ABS", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_abs", "filament_flow_ratio": [ "0.926" ], @@ -13,10 +13,10 @@ "12" ], "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle", - "Artillery Genius 0.4 nozzle", - "Artillery Sidewinder X2 0.4 nozzle", - "Artillery Genius Pro 0.4 nozzle", - "Artillery Hornet 0.4 nozzle" + "Artillery Sidewinder X1 0.4 nozzle", + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Genius Pro 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery Generic ASA.json b/resources/profiles/Artillery/filament/Artillery Generic ASA.json index 45dc8ffb37..8141add91a 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic ASA.json +++ b/resources/profiles/Artillery/filament/Artillery Generic ASA.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Artillery Generic ASA", - "inherits": "fdm_filament_asa", - "from": "system", - "setting_id": "GFSA04", "filament_id": "GFB98", + "setting_id": "GFSA04", + "name": "Artillery Generic ASA", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_asa", "filament_flow_ratio": [ "0.93" ], @@ -13,10 +13,10 @@ "12" ], "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle", - "Artillery Genius 0.4 nozzle", - "Artillery Sidewinder X2 0.4 nozzle", - "Artillery Genius Pro 0.4 nozzle", - "Artillery Hornet 0.4 nozzle" + "Artillery Sidewinder X1 0.4 nozzle", + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Genius Pro 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery Generic PETG.json b/resources/profiles/Artillery/filament/Artillery Generic PETG.json index e20a2fc1a2..8cc312cb89 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PETG.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PETG.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Artillery Generic PETG", - "inherits": "fdm_filament_pet", - "from": "system", - "setting_id": "GFSA04", "filament_id": "GFG99", + "setting_id": "GFSA04", + "name": "Artillery Generic PETG", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_pet", "reduce_fan_stop_start_freq": [ "1" ], @@ -43,10 +43,10 @@ "; filament start gcode\n" ], "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle", - "Artillery Genius 0.4 nozzle", - "Artillery Sidewinder X2 0.4 nozzle", - "Artillery Genius Pro 0.4 nozzle", - "Artillery Hornet 0.4 nozzle" + "Artillery Sidewinder X1 0.4 nozzle", + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Genius Pro 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json b/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json index 3d8e38ea61..9ee9303a52 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Artillery Generic PLA-CF", - "inherits": "fdm_filament_pla", - "from": "system", - "setting_id": "GFSA04", "filament_id": "GFL98", + "setting_id": "GFSA04", + "name": "Artillery Generic PLA-CF", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_pla", "filament_flow_ratio": [ "0.95" ], @@ -18,10 +18,10 @@ "slow_down_layer_time": [ "7" ], - "hot_plate_temp": [ + "hot_plate_temp" : [ "60" ], - "hot_plate_temp_initial_layer": [ + "hot_plate_temp_initial_layer" : [ "60" ], "nozzle_temperature_initial_layer": [ @@ -31,10 +31,10 @@ "200" ], "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle", - "Artillery Genius 0.4 nozzle", - "Artillery Sidewinder X2 0.4 nozzle", - "Artillery Genius Pro 0.4 nozzle", - "Artillery Hornet 0.4 nozzle" + "Artillery Sidewinder X1 0.4 nozzle", + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Genius Pro 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery Generic PLA.json b/resources/profiles/Artillery/filament/Artillery Generic PLA.json index a52103ae73..b62b8c8027 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PLA.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PLA.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Artillery Generic PLA", - "inherits": "fdm_filament_pla", - "from": "system", - "setting_id": "GFSA04", "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Artillery Generic PLA", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_pla", "filament_flow_ratio": [ "0.98" ], @@ -15,10 +15,10 @@ "slow_down_layer_time": [ "8" ], - "hot_plate_temp": [ + "hot_plate_temp" : [ "60" ], - "hot_plate_temp_initial_layer": [ + "hot_plate_temp_initial_layer" : [ "60" ], "nozzle_temperature_initial_layer": [ @@ -28,10 +28,10 @@ "200" ], "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle", - "Artillery Genius 0.4 nozzle", - "Artillery Sidewinder X2 0.4 nozzle", - "Artillery Genius Pro 0.4 nozzle", - "Artillery Hornet 0.4 nozzle" + "Artillery Sidewinder X1 0.4 nozzle", + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Genius Pro 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery Generic TPU.json b/resources/profiles/Artillery/filament/Artillery Generic TPU.json index 01e7d14042..ed02372bac 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic TPU.json +++ b/resources/profiles/Artillery/filament/Artillery Generic TPU.json @@ -1,19 +1,19 @@ { "type": "filament", - "name": "Artillery Generic TPU", - "inherits": "fdm_filament_tpu", - "from": "system", - "setting_id": "GFSA04", "filament_id": "GFU99", + "setting_id": "GFSA04", + "name": "Artillery Generic TPU", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_tpu", "filament_max_volumetric_speed": [ "3.2" ], "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle", - "Artillery Genius 0.4 nozzle", - "Artillery Sidewinder X2 0.4 nozzle", - "Artillery Genius Pro 0.4 nozzle", - "Artillery Hornet 0.4 nozzle" + "Artillery Sidewinder X1 0.4 nozzle", + "Artillery Genius 0.4 nozzle", + "Artillery Sidewinder X2 0.4 nozzle", + "Artillery Genius Pro 0.4 nozzle", + "Artillery Hornet 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json index eac9a4c0f7..6a0e48d07e 100644 --- a/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PA @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" @@ -14,19 +10,19 @@ "100" ], "fan_max_speed": [ - "100" + "90" ], "fan_min_speed": [ - "100" + "60" ], "filament_flow_ratio": [ - "1.04" + "0.99" ], "filament_max_volumetric_speed": [ - "14" + "8" ], "additional_cooling_fan_speed": [ - "100" + "70" ], "filament_settings_id": [ "Artillery PA @Artillery M1 Pro 0.4 nozzle" @@ -34,23 +30,30 @@ "filament_type": [ "PA" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery PA @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ - "210" + "240" ], "nozzle_temperature_initial_layer": [ - "210" + "240" ], - "nozzle_temperature_range_high": [ + "nozzle_temperature_range_high": [ + "280" + ], + "nozzle_temperature_range_low": [ "240" ], "slow_down_layer_time": [ - "10" + "6" ], + "version": "2.1.2.2", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ - "1.3" + "0.8" ], "filament_retraction_speed": [ "30" @@ -62,27 +65,28 @@ "Artillery" ], "filament_z_hop": [ - "0.4" + "0.6" ], + "inherits": "Artillery Generic PLA", "temperature_vitrification": [ - "60" + "108" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "hot_plate_temp": [ + "hot_plate_temp": [ "50" ], "hot_plate_temp_initial_layer": [ "50" ], - "slow_down_min_speed": [ - "20" + "slow_down_min_speed": [ + "10" ], - "filament_retract_lift_below": [ + "filament_retract_lift_below": [ "259" ], - "filament_deretraction_speed": [ + "filament_deretraction_speed": [ "30" ], "textured_plate_temp": [ @@ -97,7 +101,16 @@ "cool_plate_temp_initial_layer": [ "100" ], - "pressure_advance": [ - "0.032" + "chamber_temperature": [ + "50" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "overhang_fan_threshold": [ + "0%" + ], + "pressure_advance": [ + "0.07" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json index d1f6ebe215..22e1e22ad6 100644 --- a/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" @@ -34,26 +30,30 @@ "filament_type": [ "PA-CF" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ "250" ], "nozzle_temperature_initial_layer": [ "250" ], - "nozzle_temperature_range_high": [ + "nozzle_temperature_range_high": [ "280" ], - "nozzle_temperature_range_low": [ + "nozzle_temperature_range_low": [ "230" ], "slow_down_layer_time": [ "2" ], + "version": "2.1.2.2", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ - "1.3" + "0.8" ], "filament_retraction_speed": [ "30" @@ -67,25 +67,26 @@ "filament_z_hop": [ "0.6" ], + "inherits": "Artillery Generic PLA", "temperature_vitrification": [ "108" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "hot_plate_temp": [ + "hot_plate_temp": [ "50" ], "hot_plate_temp_initial_layer": [ "50" ], - "slow_down_min_speed": [ + "slow_down_min_speed": [ "10" ], - "filament_retract_lift_below": [ + "filament_retract_lift_below": [ "259" ], - "filament_deretraction_speed": [ + "filament_deretraction_speed": [ "30" ], "textured_plate_temp": [ @@ -100,22 +101,25 @@ "cool_plate_temp_initial_layer": [ "110" ], - "overhang_fan_speed": [ + "overhang_fan_speed": [ "80" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "0%" ], - "filament_z_hop_types": [ + "filament_z_hop_types": [ "Normal Lift" ], - "chamber_temperature": [ + "chamber_temperature": [ "55" ], - "close_fan_the_first_x_layers": [ - "3" + "close_fan_the_first_x_layers":[ + "3" + ], + "reduce_fan_stop_start_freq": [ + "0" ], - "pressure_advance": [ + "pressure_advance": [ "0.092" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json index 40bd3de77a..e76b8887e5 100644 --- a/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PC @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" @@ -11,22 +7,22 @@ "0" ], "fan_cooling_layer_time": [ - "100" + "30" ], "fan_max_speed": [ - "100" + "0" ], "fan_min_speed": [ - "100" + "0" ], "filament_flow_ratio": [ - "1.04" + "0.94" ], "filament_max_volumetric_speed": [ - "14" + "6" ], "additional_cooling_fan_speed": [ - "100" + "0" ], "filament_settings_id": [ "Artillery PC @Artillery M1 Pro 0.4 nozzle" @@ -34,23 +30,30 @@ "filament_type": [ "PC" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery PC @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ - "210" + "295" ], "nozzle_temperature_initial_layer": [ - "210" + "295" ], - "nozzle_temperature_range_high": [ - "240" + "nozzle_temperature_range_high": [ + "300" + ], + "nozzle_temperature_range_low": [ + "250" ], "slow_down_layer_time": [ - "10" + "2" ], + "version": "2.1.2.2", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ - "1.3" + "0.8" ], "filament_retraction_speed": [ "30" @@ -64,40 +67,56 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", "temperature_vitrification": [ - "60" + "120" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "hot_plate_temp": [ + "hot_plate_temp": [ "50" ], "hot_plate_temp_initial_layer": [ "50" ], - "slow_down_min_speed": [ - "20" + "slow_down_min_speed": [ + "0" ], - "filament_retract_lift_below": [ + "filament_retract_lift_below": [ "259" ], - "filament_deretraction_speed": [ + "filament_deretraction_speed": [ "30" ], "textured_plate_temp": [ - "100" + "110" ], "textured_plate_temp_initial_layer": [ - "100" + "110" ], "cool_plate_temp": [ - "100" + "110" ], "cool_plate_temp_initial_layer": [ - "100" + "110" ], - "pressure_advance": [ - "0.032" + "close_fan_the_first_x_layers": [ + "3" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "60" + ], + "chamber_temperature": [ + "50" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "pressure_advance": [ + "0.03" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json index ef0de50e6d..503985a830 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery PET @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "filament_id": "P11851ba", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P11851ba", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PET @Artillery M1 Pro 0.2 nozzle", "nozzle_temperature": [ "250" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json index 7e1b1bdd19..5ea3106aab 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PET @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "chamber_temperature": [ "0" @@ -37,11 +33,14 @@ "filament_type": [ "PET" ], + "is_custom_defined": "0", + "name": "Artillery PET @Artillery M1 Pro 0.4 nozzle", "slow_down_layer_time": [ "12" ], + "from": "system", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ "0.8" @@ -61,6 +60,7 @@ "hot_plate_temp_initial_layer": [ "100" ], + "inherits": "Artillery Generic PLA", "nozzle_temperature": [ "240" ], @@ -76,20 +76,17 @@ "temperature_vitrification": [ "70" ], - "close_fan_the_first_x_layers": [ + "close_fan_the_first_x_layers": [ "3" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "10%" ], - "overhang_fan_speed": [ - "90" - ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ - "0.063" + "pressure_advance": [ + "0.08" ], "textured_plate_temp": [ "80" @@ -100,16 +97,20 @@ "cool_plate_temp": [ "80" ], - "cool_plate_temp_initial_layer": [ + "cool_plate_temp_initial_layer": [ "80" ], - "filament_flow_ratio": [ - "1.029" + "filament_flow_ratio": [ + "0.97" ], - "slow_down_min_speed": [ + "slow_down_min_speed": [ "20" ], - "filament_deretraction_speed": [ + "overhang_fan_speed": [ + "100" + ], + "filament_deretraction_speed": [ "30" - ] -} \ No newline at end of file + ], + "version": "2.1.2.2" +} diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json index 9c29ae18b6..989a0545e3 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery PET @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "filament_id": "P11851ba", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P11851ba", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PET @Artillery M1 Pro 0.6 nozzle", "nozzle_temperature": [ "250" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json index 4df0aae950..b9edb2bbcf 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery PET @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "filament_id": "P11851ba", - "instantiation": "true", + "instantiation" : "true", "activate_air_filtration": [ "0" ], @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P11851ba", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PET @Artillery M1 Pro 0.8 nozzle", "nozzle_temperature": [ "250" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "100" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json index d1882eccae..143d245597 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PETG @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "filament_id": "P284941e", "instantiation": "true", "activate_air_filtration": [ "0" @@ -109,6 +105,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P284941e", "filament_is_support": [ "0" ], @@ -220,6 +217,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -232,6 +230,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PETG @Artillery M1 Pro 0.2 nozzle", "nozzle_temperature": [ "250" ], @@ -282,5 +282,6 @@ ], "textured_cool_plate_temp_initial_layer": [ "40" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json index 4f51108e50..45ee2edd1b 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PETG @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" @@ -19,7 +15,7 @@ "additional_cooling_fan_speed": [ "50" ], - "filament_density": [ + "filament_density": [ "1.27" ], "filament_settings_id": [ @@ -28,8 +24,11 @@ "filament_start_gcode": [ "; filament start gcode " ], + "is_custom_defined": "0", + "name": "Artillery PETG @Artillery M1 Pro 0.4 nozzle", + "from": "system", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ "0.8" @@ -37,7 +36,7 @@ "filament_retraction_speed": [ "30" ], - "filament_deretraction_speed": [ + "filament_deretraction_speed": [ "30" ], "filament_type": [ @@ -67,11 +66,12 @@ "cool_plate_temp_initial_layer": [ "70" ], + "inherits": "Artillery Generic PLA", "nozzle_temperature": [ - "240" + "250" ], "nozzle_temperature_initial_layer": [ - "240" + "250" ], "fan_max_speed": [ "90" @@ -88,31 +88,32 @@ "temperature_vitrification": [ "70" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "10%" ], - "overhang_fan_speed": [ + "overhang_fan_speed": [ "100" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "nozzle_temperature_range_high": [ + "nozzle_temperature_range_high": [ "270" ], "nozzle_temperature_range_low": [ "220" ], - "filament_flow_ratio": [ - "1.029" + "filament_flow_ratio": [ + "0.95" ], - "slow_down_min_speed": [ + "slow_down_min_speed": [ "20" ], - "filament_retract_before_wipe": [ + "filament_retract_before_wipe": [ "0%" ], - "pressure_advance": [ + "pressure_advance": [ "0.063" - ] -} \ No newline at end of file + ], + "version": "2.1.2.2" +} diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json index e870a95cb7..42d8875e23 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PETG @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "filament_id": "P284941e", "instantiation": "true", "activate_air_filtration": [ "0" @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P284941e", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PETG @Artillery M1 Pro 0.6 nozzle", "nozzle_temperature": [ "250" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "70" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json index 4f39e4a55f..73a422fa8b 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PETG @Artillery M1 Pro 0.8 nozzle", - "from": "User", - "filament_id": "P284941e", "instantiation": "true", "activate_air_filtration": [ "0" @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P284941e", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "User", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PETG @Artillery M1 Pro 0.8 nozzle", "nozzle_temperature": [ "250" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "70" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PETG.json b/resources/profiles/Artillery/filament/Artillery PETG.json index 183f728e71..81f5ea07b8 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG.json +++ b/resources/profiles/Artillery/filament/Artillery PETG.json @@ -1,14 +1,11 @@ -{ - "type": "filament", - "name": "Artillery PETG", - "inherits": "Artillery Generic PLA", - "from": "system", - "instantiation": "true", +{ + "instantiation": "true", + "from": "system", "compatible_printers": [ - "Artillery Sidewinder X3 Pro 0.4 nozzle", - "Artillery Sidewinder X3 Plus 0.4 nozzle", - "Artillery Sidewinder X4 Pro 0.4 nozzle", - "Artillery Sidewinder X4 Plus 0.4 nozzle" + "Artillery Sidewinder X3 Pro 0.4 nozzle", + "Artillery Sidewinder X3 Plus 0.4 nozzle", + "Artillery Sidewinder X4 Pro 0.4 nozzle", + "Artillery Sidewinder X4 Plus 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -37,6 +34,8 @@ "hot_plate_temp_initial_layer": [ "70" ], + "inherits": "Artillery Generic PLA", + "name": "Artillery PETG", "nozzle_temperature": [ "250" ], @@ -67,19 +66,20 @@ "temperature_vitrification": [ "220" ], - "close_fan_the_first_x_layers": [ + "close_fan_the_first_x_layers": [ "3" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "10%" ], - "overhang_fan_speed": [ + "overhang_fan_speed": [ "90" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.05" - ] -} \ No newline at end of file + ], + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json index 82a992ac9c..e1c1d0333f 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "filament_id": "Pfcf9c4c", "instantiation": "true", "activate_air_filtration": [ "1" @@ -103,6 +99,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "Pfcf9c4c", "filament_is_support": [ "0" ], @@ -214,6 +211,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -226,6 +224,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", "nozzle_temperature": [ "210" ], @@ -282,5 +282,6 @@ ], "textured_plate_temp_initial_layer": [ "45" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json index bc40c2bdf9..c3fef89192 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "filament_id": "Pfcf9c4c", "instantiation": "true", "activate_air_filtration": [ "1" @@ -103,6 +99,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "Pfcf9c4c", "filament_is_support": [ "0" ], @@ -214,6 +211,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -226,6 +224,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", "nozzle_temperature": [ "210" ], @@ -282,5 +282,6 @@ ], "textured_plate_temp_initial_layer": [ "45" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json index 722a0c0ee8..7dd29bb24c 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "filament_id": "Pfcf9c4c", "instantiation": "true", "activate_air_filtration": [ "1" @@ -103,6 +99,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "Pfcf9c4c", "filament_is_support": [ "0" ], @@ -214,6 +211,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -226,6 +224,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", "nozzle_temperature": [ "210" ], @@ -282,5 +282,6 @@ ], "textured_plate_temp_initial_layer": [ "45" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json index ab2a670623..1d2285b59a 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", - "from": "system", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle" @@ -10,6 +6,9 @@ "filament_type": [ "PLA Basic" ], + "compatible_printers": [ + "Artillery M1 Pro 0.2 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -25,7 +24,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.2 nozzle" - ] -} \ No newline at end of file + "from": "system", + "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json index b6bf142c7a..9ef3421488 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" @@ -20,7 +16,7 @@ "100" ], "filament_flow_ratio": [ - "0.95" + "0.98" ], "filament_max_volumetric_speed": [ "27" @@ -34,20 +30,24 @@ "filament_type": [ "PLA Basic" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ - "210" + "220" ], "nozzle_temperature_initial_layer": [ "220" ], - "nozzle_temperature_range_high": [ + "nozzle_temperature_range_high": [ "240" ], "slow_down_layer_time": [ "6" ], + "version": "2.1.2.2", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -64,13 +64,14 @@ "filament_z_hop": [ "0.6" ], + "inherits": "Artillery Generic PLA", "temperature_vitrification": [ "60" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "hot_plate_temp": [ + "hot_plate_temp": [ "50" ], "hot_plate_temp_initial_layer": [ @@ -88,10 +89,10 @@ "cool_plate_temp_initial_layer": [ "50" ], - "slow_down_min_speed": [ + "slow_down_min_speed": [ "15" ], - "pressure_advance": [ + "pressure_advance": [ "0.032" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json index bf26b66778..772edb303f 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", - "from": "system", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle" @@ -10,6 +6,9 @@ "filament_type": [ "PLA Basic" ], + "compatible_printers": [ + "Artillery M1 Pro 0.6 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -25,7 +24,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.6 nozzle" - ] + "from": "system", + "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle", + "version": "2.1.1.0" } \ No newline at end of file diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json index 3521807ef5..360b037266 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", - "from": "system", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle" @@ -10,6 +6,9 @@ "filament_type": [ "PLA Basic" ], + "compatible_printers": [ + "Artillery M1 Pro 0.6 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -25,7 +24,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.8 nozzle" - ] -} \ No newline at end of file + "from": "system", + "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json index 45f6ae72a0..690128d0e5 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "100" @@ -34,6 +30,9 @@ "filament_type": [ "PLA Basic+" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ "210" ], @@ -43,8 +42,9 @@ "slow_down_layer_time": [ "6" ], + "version": "2.1.1.0", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -61,13 +61,14 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", "temperature_vitrification": [ "190" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.032" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic.json b/resources/profiles/Artillery/filament/Artillery PLA Basic.json index 2bd2f060c5..2bf66529a3 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic.json @@ -1,14 +1,11 @@ { - "type": "filament", - "name": "Artillery PLA Basic", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", + "from": "system", "compatible_printers": [ - "Artillery Sidewinder X3 Pro 0.4 nozzle", - "Artillery Sidewinder X3 Plus 0.4 nozzle", - "Artillery Sidewinder X4 Pro 0.4 nozzle", - "Artillery Sidewinder X4 Plus 0.4 nozzle" + "Artillery Sidewinder X3 Pro 0.4 nozzle", + "Artillery Sidewinder X3 Plus 0.4 nozzle", + "Artillery Sidewinder X4 Pro 0.4 nozzle", + "Artillery Sidewinder X4 Plus 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -31,6 +28,8 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", + "name": "Artillery PLA Basic", "nozzle_temperature": [ "210" ], @@ -55,10 +54,11 @@ "temperature_vitrification": [ "190" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.046" - ] -} \ No newline at end of file + ], + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json index a266d79ff0..c3a9e6947e 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", - "from": "system", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle" @@ -10,6 +6,9 @@ "filament_type": [ "PLA Matte" ], + "compatible_printers": [ + "Artillery M1 Pro 0.2 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -25,7 +24,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.2 nozzle" - ] -} \ No newline at end of file + "from": "system", + "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json index 08ed5ffb0a..1d57a27bd4 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" @@ -20,7 +16,7 @@ "100" ], "filament_flow_ratio": [ - "0.95" + "1" ], "filament_max_volumetric_speed": [ "27" @@ -34,8 +30,11 @@ "filament_type": [ "PLA Matte" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ - "210" + "220" ], "nozzle_temperature_initial_layer": [ "220" @@ -55,8 +54,9 @@ "slow_down_layer_time": [ "6" ], + "version": "2.1.2.2", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -73,16 +73,17 @@ "filament_z_hop": [ "0.6" ], + "inherits": "Artillery Generic PLA", "temperature_vitrification": [ "60" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "slow_down_min_speed": [ + "slow_down_min_speed": [ "15" ], - "pressure_advance": [ - "0.032" + "pressure_advance": [ + "0.038" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json index 13b36fd2c9..c82a16511e 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", - "from": "system", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle" @@ -10,6 +6,9 @@ "filament_type": [ "PLA Matte" ], + "compatible_printers": [ + "Artillery M1 Pro 0.6 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -25,7 +24,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.6 nozzle" - ] -} \ No newline at end of file + "from": "system", + "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json index c46519bb0f..44b8c532bb 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", - "from": "system", "instantiation": "true", "filament_max_volumetric_speed": [ "12" @@ -13,6 +9,9 @@ "filament_type": [ "PLA Silk" ], + "compatible_printers": [ + "Artillery M1 Pro 0.8 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -28,7 +27,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.8 nozzle" - ] + "from": "system", + "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle", + "version": "2.1.1.0" } \ No newline at end of file diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte.json b/resources/profiles/Artillery/filament/Artillery PLA Matte.json index 858272c274..73313c4b2a 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte.json @@ -1,14 +1,11 @@ { - "type": "filament", - "name": "Artillery PLA Matte", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", + "from": "system", "compatible_printers": [ - "Artillery Sidewinder X3 Pro 0.4 nozzle", - "Artillery Sidewinder X3 Plus 0.4 nozzle", - "Artillery Sidewinder X4 Pro 0.4 nozzle", - "Artillery Sidewinder X4 Plus 0.4 nozzle" + "Artillery Sidewinder X3 Pro 0.4 nozzle", + "Artillery Sidewinder X3 Plus 0.4 nozzle", + "Artillery Sidewinder X4 Pro 0.4 nozzle", + "Artillery Sidewinder X4 Plus 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -31,6 +28,8 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", + "name": "Artillery PLA Matte", "nozzle_temperature": [ "210" ], @@ -55,10 +54,11 @@ "temperature_vitrification": [ "190" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.046" - ] -} \ No newline at end of file + ], + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json index dd56353128..7034900df8 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", - "from": "system", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle" @@ -10,6 +6,9 @@ "filament_type": [ "PLA Silk" ], + "compatible_printers": [ + "Artillery M1 Pro 0.2 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -25,7 +24,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.2 nozzle" - ] -} \ No newline at end of file + "from": "system", + "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json index f28ef2632e..9d3fb99bb1 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json @@ -1,9 +1,5 @@ { - "type": "filament", - "name": "Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", - "instantiation": "true", + "instantiation" : "true", "complete_print_exhaust_fan_speed": [ "0" ], @@ -25,6 +21,9 @@ "filament_settings_id": [ "Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ "220" ], @@ -34,20 +33,21 @@ "slow_down_layer_time": [ "6" ], + "version": "2.1.2.2", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ - "1.1" + "0.8" ], "filament_retraction_speed": [ "20" ], - "filament_deretraction_speed": [ + "filament_deretraction_speed": [ "20" ], "additional_cooling_fan_speed": [ - "100" + "50" ], "filament_start_gcode": [ "" @@ -61,6 +61,7 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", "filament_max_volumetric_speed": [ "8" ], @@ -76,25 +77,25 @@ "cool_plate_temp_initial_layer": [ "50" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.05" ], - "hot_plate_temp": [ + "hot_plate_temp": [ "50" ], "hot_plate_temp_initial_layer": [ "50" ], - "slow_down_min_speed": [ + "slow_down_min_speed": [ "20" ], - "filament_retract_lift_below": [ + "filament_retract_lift_below": [ "259" ], - "temperature_vitrification": [ + "temperature_vitrification": [ "60" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json index 786ae45125..9717c16f1b 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", - "from": "system", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle" @@ -10,6 +6,9 @@ "filament_type": [ "PLA Silk" ], + "compatible_printers": [ + "Artillery M1 Pro 0.6 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -25,7 +24,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.6 nozzle" - ] -} \ No newline at end of file + "from": "system", + "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json index 4df235ee49..e5609ffe4b 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle", - "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", - "from": "User", "instantiation": "true", "filament_max_volumetric_speed": [ "12" @@ -13,6 +9,9 @@ "filament_type": [ "PLA Silk" ], + "compatible_printers": [ + "Artillery M1 Pro 0.8 nozzle" + ], "slow_down_layer_time": [ "6" ], @@ -28,7 +27,9 @@ "cool_plate_temp_initial_layer": [ "50" ], - "compatible_printers": [ - "Artillery M1 Pro 0.8 nozzle" - ] -} \ No newline at end of file + "from": "User", + "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", + "is_custom_defined": "0", + "name": "Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk.json b/resources/profiles/Artillery/filament/Artillery PLA Silk.json index 87434301f3..81a37fd9b8 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk.json @@ -1,14 +1,11 @@ { - "type": "filament", - "name": "Artillery PLA Silk", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", + "from": "system", "compatible_printers": [ - "Artillery Sidewinder X3 Pro 0.4 nozzle", - "Artillery Sidewinder X3 Plus 0.4 nozzle", - "Artillery Sidewinder X4 Pro 0.4 nozzle", - "Artillery Sidewinder X4 Plus 0.4 nozzle" + "Artillery Sidewinder X3 Pro 0.4 nozzle", + "Artillery Sidewinder X3 Plus 0.4 nozzle", + "Artillery Sidewinder X4 Pro 0.4 nozzle", + "Artillery Sidewinder X4 Plus 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -31,6 +28,8 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", + "name": "Artillery PLA Silk", "nozzle_temperature": [ "210" ], @@ -55,10 +54,11 @@ "temperature_vitrification": [ "190" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.046" - ] -} \ No newline at end of file + ], + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA Tough.json b/resources/profiles/Artillery/filament/Artillery PLA Tough.json index 01141db114..a4178368af 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Tough.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Tough.json @@ -1,14 +1,11 @@ { - "type": "filament", - "name": "Artillery PLA Tough", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", + "from": "system", "compatible_printers": [ - "Artillery Sidewinder X3 Pro 0.4 nozzle", - "Artillery Sidewinder X3 Plus 0.4 nozzle", - "Artillery Sidewinder X4 Pro 0.4 nozzle", - "Artillery Sidewinder X4 Plus 0.4 nozzle" + "Artillery Sidewinder X3 Pro 0.4 nozzle", + "Artillery Sidewinder X3 Plus 0.4 nozzle", + "Artillery Sidewinder X4 Pro 0.4 nozzle", + "Artillery Sidewinder X4 Plus 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -31,6 +28,8 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", + "name": "Artillery PLA Tough", "nozzle_temperature": [ "220" ], @@ -55,16 +54,17 @@ "temperature_vitrification": [ "190" ], - "hot_plate_temp": [ + "hot_plate_temp": [ "65" ], "hot_plate_temp_initial_layer": [ "65" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.046" - ] -} \ No newline at end of file + ], + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json index 187e2d67f9..8b85182124 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" @@ -26,7 +22,7 @@ "14" ], "additional_cooling_fan_speed": [ - "100" + "50" ], "filament_settings_id": [ "Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle" @@ -34,23 +30,27 @@ "filament_type": [ "PLA-CF" ], + "from": "system", + "is_custom_defined": "0", + "name": "Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ - "210" + "220" ], "nozzle_temperature_initial_layer": [ - "210" + "220" ], - "nozzle_temperature_range_high": [ + "nozzle_temperature_range_high": [ "240" ], "slow_down_layer_time": [ "10" ], + "version": "2.1.2.2", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ - "1.3" + "0.8" ], "filament_retraction_speed": [ "30" @@ -64,28 +64,29 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", "temperature_vitrification": [ "60" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "hot_plate_temp": [ + "hot_plate_temp": [ "50" ], "hot_plate_temp_initial_layer": [ "50" ], - "slow_down_min_speed": [ + "slow_down_min_speed": [ "20" ], - "filament_retract_lift_below": [ + "filament_retract_lift_below": [ "259" ], - "filament_deretraction_speed": [ + "filament_deretraction_speed": [ "30" ], - "pressure_advance": [ + "pressure_advance": [ "0.032" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json index 722389db32..f3c549f363 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PVA @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "filament_id": "P8163162", "instantiation": "true", "activate_air_filtration": [ "0" @@ -103,6 +99,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P8163162", "filament_is_support": [ "0" ], @@ -214,6 +211,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -226,6 +224,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PVA @Artillery M1 Pro 0.2 nozzle", "nozzle_temperature": [ "220" ], @@ -282,5 +282,6 @@ ], "textured_plate_temp_initial_layer": [ "45" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json index be8b3080d0..84b6ac9d06 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PVA @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "chamber_temperature": [ "50" @@ -37,6 +33,8 @@ "hot_plate_temp_initial_layer": [ "60" ], + "is_custom_defined": "0", + "name": "Artillery PVA @Artillery M1 Pro 0.4 nozzle", "nozzle_temperature": [ "220" ], @@ -52,8 +50,9 @@ "slow_down_layer_time": [ "7" ], + "from": "system", "compatible_printers": [ - "Artillery M1 Pro 0.4 nozzle" + "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -70,25 +69,27 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", "filament_max_volumetric_speed": [ "16" ], "temperature_vitrification": [ "220" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "25%" ], - "overhang_fan_speed": [ + "overhang_fan_speed": [ "80" ], - "close_fan_the_first_x_layers": [ + "close_fan_the_first_x_layers": [ "3" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.05" - ] -} \ No newline at end of file + ], + "version": "2.1.2.2" +} diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json index 8c5bd08fd2..e6f227a32f 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PVA @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "filament_id": "P8163162", "instantiation": "true", "activate_air_filtration": [ "0" @@ -103,6 +99,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P8163162", "filament_is_support": [ "0" ], @@ -214,6 +211,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -226,6 +224,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PVA @Artillery M1 Pro 0.6 nozzle", "nozzle_temperature": [ "220" ], @@ -282,5 +282,6 @@ ], "textured_plate_temp_initial_layer": [ "45" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json index 0fbfd43a63..d74b0a8844 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery PVA @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "filament_id": "P8163162", "instantiation": "true", "activate_air_filtration": [ "0" @@ -103,6 +99,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P8163162", "filament_is_support": [ "0" ], @@ -214,6 +211,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -226,6 +224,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery PVA @Artillery M1 Pro 0.8 nozzle", "nozzle_temperature": [ "240" ], @@ -282,5 +282,6 @@ ], "textured_plate_temp_initial_layer": [ "45" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json index e120c0279a..824a8bd787 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery TPU @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", "close_fan_the_first_x_layers": [ "1" @@ -23,21 +19,24 @@ "60" ], "additional_cooling_fan_speed": [ - "100" + "50" ], + "is_custom_defined": "0", + "name": "Artillery TPU @Artillery M1 Pro 0.4 nozzle", + "from": "system", "compatible_printers": [ "Artillery M1 Pro 0.4 nozzle" ], "filament_retraction_length": [ "0.4" ], - "filament_retract_lift_below": [ + "filament_retract_lift_below": [ "259" ], "filament_retraction_speed": [ "30" ], - "filament_deretraction_speed": [ + "filament_deretraction_speed": [ "30" ], "filament_start_gcode": [ @@ -52,6 +51,7 @@ "filament_z_hop": [ "0.4" ], + "inherits": "Artillery Generic PLA", "nozzle_temperature": [ "230" ], @@ -94,7 +94,7 @@ "pressure_advance": [ "0.08" ], - "filament_flow_ratio": [ + "filament_flow_ratio": [ "1.067" ], "textured_plate_temp": [ @@ -108,5 +108,6 @@ ], "cool_plate_temp_initial_layer": [ "60" - ] + ], + "version": "2.1.2.2" } \ No newline at end of file diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json index e8d65fb86f..0f4c56f05e 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery TPU @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "filament_id": "P2fbf0c0", "instantiation": "true", "activate_air_filtration": [ "0" @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P2fbf0c0", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery TPU @Artillery M1 Pro 0.6 nozzle", "nozzle_temperature": [ "220" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "60" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json index 7ffea128a6..ac6e40ecaa 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json @@ -1,8 +1,4 @@ { - "type": "filament", - "name": "Artillery TPU @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "filament_id": "P2fbf0c0", "instantiation": "true", "activate_air_filtration": [ "0" @@ -97,6 +93,7 @@ "filament_flow_ratio": [ "0.98" ], + "filament_id": "P2fbf0c0", "filament_is_support": [ "0" ], @@ -208,6 +205,7 @@ "filament_z_hop_types": [ "nil" ], + "from": "system", "full_fan_speed_layer": [ "0" ], @@ -220,6 +218,8 @@ "idle_temperature": [ "0" ], + "is_custom_defined": "0", + "name": "Artillery TPU @Artillery M1 Pro 0.8 nozzle", "nozzle_temperature": [ "220" ], @@ -282,5 +282,6 @@ ], "cool_plate_temp_initial_layer": [ "60" - ] -} \ No newline at end of file + ], + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/filament/Artillery TPU.json b/resources/profiles/Artillery/filament/Artillery TPU.json index f9d57e4309..184e10e8ac 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU.json +++ b/resources/profiles/Artillery/filament/Artillery TPU.json @@ -1,14 +1,11 @@ { - "type": "filament", - "name": "Artillery TPU", - "inherits": "Artillery Generic PLA", - "from": "system", "instantiation": "true", + "from": "system", "compatible_printers": [ - "Artillery Sidewinder X3 Pro 0.4 nozzle", - "Artillery Sidewinder X3 Plus 0.4 nozzle", - "Artillery Sidewinder X4 Pro 0.4 nozzle", - "Artillery Sidewinder X4 Plus 0.4 nozzle" + "Artillery Sidewinder X3 Pro 0.4 nozzle", + "Artillery Sidewinder X3 Plus 0.4 nozzle", + "Artillery Sidewinder X4 Pro 0.4 nozzle", + "Artillery Sidewinder X4 Plus 0.4 nozzle" ], "filament_retraction_length": [ "1.3" @@ -37,6 +34,8 @@ "hot_plate_temp_initial_layer": [ "45" ], + "inherits": "Artillery Generic PLA", + "name": "Artillery TPU", "nozzle_temperature": [ "220" ], @@ -67,16 +66,17 @@ "temperature_vitrification": [ "190" ], - "filament_density": [ + "filament_density": [ "1.22" ], - "overhang_fan_threshold": [ + "overhang_fan_threshold": [ "95%" ], - "enable_pressure_advance": [ + "enable_pressure_advance": [ "1" ], - "pressure_advance": [ + "pressure_advance": [ "0.06" - ] -} \ No newline at end of file + ], + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/filament/fdm_filament_abs.json b/resources/profiles/Artillery/filament/fdm_filament_abs.json index 3578d1bfda..7e478a37f3 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_abs.json +++ b/resources/profiles/Artillery/filament/fdm_filament_abs.json @@ -1,25 +1,25 @@ { "type": "filament", "name": "fdm_filament_abs", - "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "cool_plate_temp": [ + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ "105" ], - "eng_plate_temp": [ + "eng_plate_temp" : [ "105" ], - "hot_plate_temp": [ + "hot_plate_temp" : [ "105" ], - "cool_plate_temp_initial_layer": [ + "cool_plate_temp_initial_layer" : [ "105" ], - "eng_plate_temp_initial_layer": [ + "eng_plate_temp_initial_layer" : [ "105" ], - "hot_plate_temp_initial_layer": [ + "hot_plate_temp_initial_layer" : [ "105" ], "slow_down_for_layer_cooling": [ @@ -79,4 +79,4 @@ "slow_down_layer_time": [ "3" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/fdm_filament_asa.json b/resources/profiles/Artillery/filament/fdm_filament_asa.json index f9c03db19d..29a752a4ee 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_asa.json +++ b/resources/profiles/Artillery/filament/fdm_filament_asa.json @@ -1,25 +1,25 @@ { "type": "filament", "name": "fdm_filament_asa", - "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "cool_plate_temp": [ + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ "105" ], - "eng_plate_temp": [ + "eng_plate_temp" : [ "105" ], - "hot_plate_temp": [ + "hot_plate_temp" : [ "105" ], - "cool_plate_temp_initial_layer": [ + "cool_plate_temp_initial_layer" : [ "105" ], - "eng_plate_temp_initial_layer": [ + "eng_plate_temp_initial_layer" : [ "105" ], - "hot_plate_temp_initial_layer": [ + "hot_plate_temp_initial_layer" : [ "105" ], "slow_down_for_layer_cooling": [ @@ -79,4 +79,4 @@ "slow_down_layer_time": [ "3" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/fdm_filament_common.json b/resources/profiles/Artillery/filament/fdm_filament_common.json index 72cbf0a809..5212d445a5 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_common.json +++ b/resources/profiles/Artillery/filament/fdm_filament_common.json @@ -3,22 +3,22 @@ "name": "fdm_filament_common", "from": "system", "instantiation": "false", - "cool_plate_temp": [ + "cool_plate_temp" : [ "60" ], - "eng_plate_temp": [ + "eng_plate_temp" : [ "60" ], - "hot_plate_temp": [ + "hot_plate_temp" : [ "60" ], - "cool_plate_temp_initial_layer": [ + "cool_plate_temp_initial_layer" : [ "60" ], - "eng_plate_temp_initial_layer": [ + "eng_plate_temp_initial_layer" : [ "60" ], - "hot_plate_temp_initial_layer": [ + "hot_plate_temp_initial_layer" : [ "60" ], "overhang_fan_threshold": [ @@ -132,4 +132,4 @@ "temperature_vitrification": [ "100" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/fdm_filament_pet.json b/resources/profiles/Artillery/filament/fdm_filament_pet.json index f679e9968f..2f98be665f 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_pet.json +++ b/resources/profiles/Artillery/filament/fdm_filament_pet.json @@ -1,25 +1,25 @@ { "type": "filament", "name": "fdm_filament_pet", - "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "cool_plate_temp": [ + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ "60" ], - "eng_plate_temp": [ + "eng_plate_temp" : [ "0" ], - "hot_plate_temp": [ + "hot_plate_temp" : [ "80" ], - "cool_plate_temp_initial_layer": [ + "cool_plate_temp_initial_layer" : [ "60" ], - "eng_plate_temp_initial_layer": [ + "eng_plate_temp_initial_layer" : [ "0" ], - "hot_plate_temp_initial_layer": [ + "hot_plate_temp_initial_layer" : [ "80" ], "slow_down_for_layer_cooling": [ @@ -73,4 +73,4 @@ "filament_start_gcode": [ "; filament start gcode\n" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/fdm_filament_pla.json b/resources/profiles/Artillery/filament/fdm_filament_pla.json index c9f7f456f3..de2f3c2a71 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_pla.json +++ b/resources/profiles/Artillery/filament/fdm_filament_pla.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "fdm_filament_pla", - "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", + "inherits": "fdm_filament_common", "fan_cooling_layer_time": [ "100" ], @@ -19,22 +19,22 @@ "filament_cost": [ "20" ], - "cool_plate_temp": [ + "cool_plate_temp" : [ "35" ], - "eng_plate_temp": [ + "eng_plate_temp" : [ "0" ], - "hot_plate_temp": [ + "hot_plate_temp" : [ "45" ], - "cool_plate_temp_initial_layer": [ + "cool_plate_temp_initial_layer" : [ "35" ], - "eng_plate_temp_initial_layer": [ + "eng_plate_temp_initial_layer" : [ "0" ], - "hot_plate_temp_initial_layer": [ + "hot_plate_temp_initial_layer" : [ "45" ], "nozzle_temperature_initial_layer": [ @@ -85,4 +85,4 @@ "filament_start_gcode": [ "; filament start gcode\n" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/filament/fdm_filament_tpu.json b/resources/profiles/Artillery/filament/fdm_filament_tpu.json index 8191c3116e..d5cc57fbcc 100644 --- a/resources/profiles/Artillery/filament/fdm_filament_tpu.json +++ b/resources/profiles/Artillery/filament/fdm_filament_tpu.json @@ -1,25 +1,25 @@ { "type": "filament", "name": "fdm_filament_tpu", - "inherits": "fdm_filament_common", "from": "system", "instantiation": "false", - "cool_plate_temp": [ + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ "30" ], - "eng_plate_temp": [ + "eng_plate_temp" : [ "30" ], - "hot_plate_temp": [ + "hot_plate_temp" : [ "35" ], - "cool_plate_temp_initial_layer": [ + "cool_plate_temp_initial_layer" : [ "30" ], - "eng_plate_temp_initial_layer": [ + "eng_plate_temp_initial_layer" : [ "30" ], - "hot_plate_temp_initial_layer": [ + "hot_plate_temp_initial_layer" : [ "35" ], "fan_cooling_layer_time": [ @@ -79,4 +79,4 @@ "filament_start_gcode": [ "; filament start gcode\n" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json index b9ce5022c0..13d4ce86ad 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json @@ -1,116 +1,116 @@ { "type": "machine", - "name": "Artillery Genius 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", "setting_id": "GM003", + "name": "Artillery Genius 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_machine_common", "printer_model": "Artillery Genius", "default_print_profile": "0.20mm Standard @Artillery Genius", "nozzle_diameter": [ "0.4" ], "bed_exclude_area": [ - "0x0" + "0x0" ], "printable_area": [ - "0x0", - "220x0", - "220x220", - "0x220" + "0x0", + "220x0", + "220x220", + "0x220" ], "printable_height": "250", - "nozzle_type": "brass", - "auxiliary_fan": "0", - "machine_max_acceleration_extruding": [ - "1000", - "1250" - ], - "machine_max_acceleration_retracting": [ - "1000", - "1250" - ], - "machine_max_acceleration_travel": [ - "1000", - "1250" - ], - "machine_max_acceleration_x": [ - "2000", - "1000" - ], - "machine_max_acceleration_y": [ - "2000", - "1000" - ], - "machine_max_acceleration_z": [ - "500", - "200" - ], - "machine_max_speed_e": [ - "120", - "120" - ], - "machine_max_speed_x": [ - "500", - "200" - ], - "machine_max_speed_y": [ - "500", - "200" - ], - "machine_max_speed_z": [ - "12", - "12" - ], - "machine_max_jerk_e": [ - "3", - "2.5" - ], - "machine_max_jerk_x": [ - "7", - "10" - ], - "machine_max_jerk_y": [ - "7", - "10" - ], - "machine_max_jerk_z": [ - "0.2", - "0.4" - ], - "max_layer_height": [ - "0.32" - ], - "min_layer_height": [ - "0.08" - ], - "printer_settings_id": "Artillery", - "retraction_minimum_travel": [ - "1" - ], - "retract_before_wipe": [ - "0%" - ], - "retraction_length": [ - "1" - ], - "retract_length_toolchange": [ - "4" - ], - "retraction_speed": [ - "35" - ], - "deretraction_speed": [ - "0" - ], - "single_extruder_multi_material": "1", - "change_filament_gcode": "", - "machine_pause_gcode": "M0", - "default_filament_profile": [ - "Artillery Generic PLA" - ], + "nozzle_type": "brass", + "auxiliary_fan": "0", + "machine_max_acceleration_extruding": [ + "1000", + "1250" + ], + "machine_max_acceleration_retracting": [ + "1000", + "1250" + ], + "machine_max_acceleration_travel": [ + "1000", + "1250" + ], + "machine_max_acceleration_x": [ + "2000", + "1000" + ], + "machine_max_acceleration_y": [ + "2000", + "1000" + ], + "machine_max_acceleration_z": [ + "500", + "200" + ], + "machine_max_speed_e": [ + "120", + "120" + ], + "machine_max_speed_x": [ + "500", + "200" + ], + "machine_max_speed_y": [ + "500", + "200" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "3", + "2.5" + ], + "machine_max_jerk_x": [ + "7", + "10" + ], + "machine_max_jerk_y": [ + "7", + "10" + ], + "machine_max_jerk_z": [ + "0.2", + "0.4" + ], + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Artillery", + "retraction_minimum_travel": [ + "1" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "1" + ], + "retract_length_toolchange": [ + "4" + ], + "retraction_speed": [ + "35" + ], + "deretraction_speed": [ + "0" + ], + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "machine_pause_gcode": "M0", + "default_filament_profile": [ + "Artillery Generic PLA" + ], "machine_start_gcode": "M83; extruder relative mode\nG28; home all axes\nM109 S[nozzle_temperature_initial_layer]; hotend temperature\nM140 S[bed_temperature_initial_layer_single]; heatbed temperature\nM190 S[bed_temperature_initial_layer_single]; wait for the bed to heat up\nM109 S[nozzle_temperature_initial_layer]; wait for the extruder to heat up\nG92 E0; reset extruder\nG1 X20 Y5 Z0.3 F5000.0; move to start-line position\nG1 Z0.3 F1000; print height\nG1 X200 Y5 F1500.0 E15; draw 1st line\nG1 X200 Y5.3 Z0.3 F5000.0; move to side a little\nG1 X5.3 Y5.3 Z0.3 F1500.0 E30; draw 2nd line\nG1 Z3 F3000; move z up little to prevent scratching of surface", "machine_end_gcode": "G91; Relative positionning\nG1 E-2 Z0.2 F2400; Retract and raise Z\nG1 X5 Y5 F3000; Wipe out\nG1 Z10; Raise Z more\nG90; Absolute positionning\nG1 X0 Y100; Present print\nM106 S0; Turn-off fan\nM104 S0; Turn-off hotend\nM140 S0; Turn-off bed\nM84 X Y E; Disable all steppers but Z", "layer_change_gcode": "", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery Genius Pro 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Genius Pro 0.4 nozzle.json index 2e4a4835bb..c871b99927 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Genius Pro 0.4 nozzle.json @@ -1,116 +1,117 @@ { "type": "machine", - "name": "Artillery Genius Pro 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", "setting_id": "GM003", + "name": "Artillery Genius Pro 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_machine_common", "printer_model": "Artillery Genius Pro", "default_print_profile": "0.20mm Standard @Artillery Genius Pro", "nozzle_diameter": [ "0.4" ], "bed_exclude_area": [ - "0x0" + "0x0" ], "printable_area": [ - "0x0", - "220x0", - "220x220", - "0x220" + "0x0", + "220x0", + "220x220", + "0x220" ], "printable_height": "250", - "nozzle_type": "brass", - "auxiliary_fan": "0", - "machine_max_acceleration_extruding": [ - "1000", - "1250" - ], - "machine_max_acceleration_retracting": [ - "1000", - "1250" - ], - "machine_max_acceleration_travel": [ - "1000", - "1250" - ], - "machine_max_acceleration_x": [ - "2000", - "1000" - ], - "machine_max_acceleration_y": [ - "2000", - "1000" - ], - "machine_max_acceleration_z": [ - "500", - "200" - ], - "machine_max_speed_e": [ - "120", - "120" - ], - "machine_max_speed_x": [ - "500", - "200" - ], - "machine_max_speed_y": [ - "500", - "200" - ], - "machine_max_speed_z": [ - "12", - "12" - ], - "machine_max_jerk_e": [ - "3", - "2.5" - ], - "machine_max_jerk_x": [ - "7", - "10" - ], - "machine_max_jerk_y": [ - "7", - "10" - ], - "machine_max_jerk_z": [ - "0.2", - "0.4" - ], - "max_layer_height": [ - "0.32" - ], - "min_layer_height": [ - "0.08" - ], - "printer_settings_id": "Artillery", - "retraction_minimum_travel": [ - "1" - ], - "retract_before_wipe": [ - "0%" - ], - "retraction_length": [ - "1" - ], - "retract_length_toolchange": [ - "4" - ], - "retraction_speed": [ - "35" - ], - "deretraction_speed": [ - "0" - ], - "single_extruder_multi_material": "1", - "change_filament_gcode": "", - "machine_pause_gcode": "M0", - "default_filament_profile": [ - "Artillery Generic PLA" - ], + "nozzle_type": "brass", + "auxiliary_fan": "0", + "machine_max_acceleration_extruding": [ + "1000", + "1250" + ], + "machine_max_acceleration_retracting": [ + "1000", + "1250" + ], + "machine_max_acceleration_travel": [ + "1000", + "1250" + ], + "machine_max_acceleration_x": [ + "2000", + "1000" + ], + "machine_max_acceleration_y": [ + "2000", + "1000" + ], + "machine_max_acceleration_z": [ + "500", + "200" + ], + "machine_max_speed_e": [ + "120", + "120" + ], + "machine_max_speed_x": [ + "500", + "200" + ], + "machine_max_speed_y": [ + "500", + "200" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "3", + "2.5" + ], + "machine_max_jerk_x": [ + "7", + "10" + ], + "machine_max_jerk_y": [ + "7", + "10" + ], + "machine_max_jerk_z": [ + "0.2", + "0.4" + ], + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Artillery", + "retraction_minimum_travel": [ + "1" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "1" + ], + "retract_length_toolchange": [ + "4" + ], + "retraction_speed": [ + "35" + ], + "deretraction_speed": [ + "0" + ], + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "machine_pause_gcode": "M0", + "default_filament_profile": [ + "Artillery Generic PLA" + ], "machine_start_gcode": "M83; extruder relative mode\nG28; home all axes\nG29 S12000; bed mesh leveling\nM104 S[nozzle_temperature_initial_layer]; set hotend temperature\nM140 S[bed_temperature_initial_layer_single]; set heatbed temperature\nG90; Absolute Positioning\nG1 Y0 F5000; Move to front\nG1 X0 F5000; Move to origin\nM190 S[bed_temperature_initial_layer_single]; wait for the bed to heat up\nM109 S[nozzle_temperature_initial_layer]; wait for the extruder to heat up\nG92 E0; reset extruder\nG1 X20 Y5 Z0.3 F5000.0; move to start-line position\nG1 Z0.3 F1000; print height\nG1 X200 Y5 F1500.0 E15; draw 1st line\nG1 X200 Y5.3 Z0.3 F5000.0; move to side a little\nG1 X5.3 Y5.3 Z0.3 F1500.0 E30; draw 2nd line\nG1 Z3 F3000; move z up little to prevent scratching of surface", "machine_end_gcode": "G91; Relative positionning\nG1 E-2 Z0.2 F2400; Retract and raise Z\nG1 X5 Y5 F3000; Wipe out\nG1 Z10; Raise Z more\nG90; Absolute positionning\nG1 X0 Y100; Present print\nM106 S0; Turn-off fan\nM104 S0; Turn-off hotend\nM140 S0; Turn-off bed\nM84 X Y E; Disable all steppers but Z", "layer_change_gcode": "", "scan_first_layer": "0" -} \ No newline at end of file +} + diff --git a/resources/profiles/Artillery/machine/Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/machine/Artillery M1 Pro 0.2 nozzle.json index 68bff14ed7..ffd79e1475 100644 --- a/resources/profiles/Artillery/machine/Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery M1 Pro 0.2 nozzle.json @@ -1,10 +1,7 @@ { - "type": "machine", - "name": "Artillery M1 Pro 0.2 nozzle", - "from": "system", - "instantiation": "true", "adaptive_bed_mesh_margin": "0", "auxiliary_fan": "1", + "instantiation" : "true", "bbl_use_printhost": "0", "bed_custom_model": "", "bed_custom_texture": "", @@ -44,10 +41,12 @@ "fan_kickstart": "0", "fan_speedup_overhangs": "1", "fan_speedup_time": "0", + "from": "system", "gcode_flavor": "klipper", "head_wrap_detect_zone": [], "high_current_on_filament_swap": "0", "host_type": "octoprint", + "is_custom_defined": "0", "layer_change_gcode": "G92 E0\n{if layer_num==2}\n\n;filter_fan\nM106 P3 S{during_print_exhaust_fan_speed[0]*255/100.0};\n\n;auxiliary_fan\nM106 P2 S{additional_cooling_fan_speed[0]*255/100.0}\n\n{endif}\n\n\n", "long_retractions_when_cut": [ "0" @@ -133,6 +132,7 @@ "min_layer_height": [ "0.04" ], + "name": "Artillery M1 Pro 0.2 nozzle", "nozzle_diameter": [ "0.2" ], @@ -455,6 +455,7 @@ "upward_compatible_machine": [], "use_firmware_retraction": "0", "use_relative_e_distances": "1", + "version": "2.1.1.0", "wipe": [ "0" ], @@ -468,4 +469,4 @@ "Auto Lift" ], "z_offset": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery M1 Pro 0.4 nozzle.json index 114caaa827..cd632c4c1b 100644 --- a/resources/profiles/Artillery/machine/Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery M1 Pro 0.4 nozzle.json @@ -1,14 +1,9 @@ { - "type": "machine", - "name": "Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", - "setting_id": "GM007", - "instantiation": "true", "is_artillery": "1", "emit_machine_limits_to_gcode": "1", + "is_custom_defined": "0", "layer_change_gcode": "G92 E0\n{if layer_num==2}\n\n;filter_fan\nM106 P3 S{during_print_exhaust_fan_speed[0]*255/100.0};\n\n;auxiliary_fan\nM106 P2 S{additional_cooling_fan_speed[0]*255/100.0}\n\n{endif}\n\n", - "machine_end_gcode": ";===== G-CODE START =====================\n;===== machine: M1 PRO =========================\n;===== date: 20250729 =====================\n\n;===== Raise Z-Axis =====================\nM400 ; wait for buffer to clear\nG90\nG92 E0 ; zero the extruder\nG1 E-3 F1800 ; retract\n\n{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F300 ; Move print head up{endif} \nG1 X260 Y250 F3600 ; move to safe pos \nM400\nTIMELAPSE_TAKE_FRAME\n{if max_layer_z < 50}G1 Z50 F300 ; Move print head further up{endif}\n;===== Default Settings =====================\nM400\nM106 S255\nM141 S0\nM106 P1 S255\nM104 S160\nG4 P10000\nM109 S160\nM106 S0 ;turn off cool fan\nM141 S0 ;turn off PTC\nM106 P2 S0 ;turn off chamber fan\nM106 P1 S0 ;turn off PTC fan\nM106 P3 S0 ;turn off filter fan\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nSET_VELOCITY_LIMIT VELOCITY=500;\nSET_VELOCITY_LIMIT ACCEL=6000;\nSET_VELOCITY_LIMIT MINIMUM_CRUISE_RATIO=0.2;\nSET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY=5;\nG21; set units to millimeters\nM104 S0\nM140 S0\nM400\nM84 X Y Z E ; disable motors\nM400\n;===== G-CODE END =====================", + "machine_end_gcode": ";===== G-CODE START =====================\n;===== machine: M1 PRO =========================\n;===== date: 20250729 =====================\n\n;===== Raise Z-Axis =====================\nM400 ; wait for buffer to clear\nG90\nG92 E0 ; zero the extruder\nG1 E-3 F1800 ; retract\n\n{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F300 ; Move print head up{endif} \nG90\nG1 X200 Y260 F21000\nG1 X200 Y275 F6000\nG1 X160 Y275 F6000\nG1 X137 Y275 F3000\nM400\nTIMELAPSE_TAKE_FRAME\n{if max_layer_z < 50}G1 Z50 F300 ; Move print head further up{endif}\n;===== Default Settings =====================\nM400\nM106 S255\nM141 S0\nM106 P1 S255\nM104 S160\nG4 P10000\nM109 S160\nM106 S0 ;turn off cool fan\nM141 S0 ;turn off PTC\nM106 P2 S0 ;turn off chamber fan\nM106 P1 S0 ;turn off PTC fan\nM106 P3 S0 ;turn off filter fan\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nSET_VELOCITY_LIMIT VELOCITY=500;\nSET_VELOCITY_LIMIT ACCEL=6000;\nSET_VELOCITY_LIMIT MINIMUM_CRUISE_RATIO=0.2;\nSET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY=5;\nG21; set units to millimeters\nM104 S0\nM140 S0\nM400\nM84 X Y Z E ; disable motors\nM400\n;===== G-CODE END =====================", "machine_max_acceleration_extruding": [ "20000", "1250" @@ -57,7 +52,8 @@ "20", "12" ], - "machine_start_gcode": ";===== START G-CODE =====================\n;===== machine: M1 PRO =========================\n;===== size: X260 Y260 Z260 =====================\n;===== date: 20250708 =====================\n;===== Filament Temperature Configuration =====================\n;Nozzle_Preheat_Temp:140\n;Bed_Preheat_Temp:[bed_temperature_initial_layer_single]\n{if (nozzle_temperature_initial_layer[0] >250)};Filament_Common_Extrusion_Temp:[nozzle_temperature_initial_layer]{else};Filament_Common_Extrusion_Temp:250{endif}\n;Nozzle_Init_Layer_Temp:[nozzle_temperature_initial_layer]\n;Filament_Softening_Temp:[nozzle_temperature_range_low]\n\n;===== Default Settings =====================\nM106 S0 ;turn off cool fan\nM141 S0 ;turn off PTC\nM106 P2 S0 ;turn off chamber fan\nM106 P1 S0 ;turn off PTC fan\nM106 P3 S0 ;turn off filter fan\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nSET_VELOCITY_LIMIT VELOCITY=500;\nSET_VELOCITY_LIMIT ACCEL=6000;\nSET_VELOCITY_LIMIT MINIMUM_CRUISE_RATIO=0.2;\nSET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY=5;\nG21; set units to millimeters\nG90\n\n;===== Preheat While Zeroing =====================\nM106 P1 S153\n\nM140 S[bed_temperature_initial_layer_single];\n\n{if filament_type[initial_no_support_extruder]==\"ABS\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\n{if filament_type[initial_no_support_extruder]==\"PC\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\n{if filament_type[initial_no_support_extruder]==\"ASA\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\n{if filament_type[initial_no_support_extruder]==\"PA\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\n{if filament_type[initial_no_support_extruder]==\"PA-CF\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\nM106 P2 S0\nM106 S0;\nG4 P500\n\n;===== Wait heating =====================\nG28\nG1 X20 Y5.8 Z0.2 F18000\n\n;===== Set Print Temperature =====================\nM106 S120;\nG4 P500\nM104 S[first_layer_temperature];\n\n{if (bed_temperature_initial_layer_single >0)}\nM190 S[bed_temperature_initial_layer_single];\n{else}\nM140 S[bed_temperature_initial_layer_single];\n{endif}\n\nM109 S[first_layer_temperature];\nM106 S0;\nG4 P500\n\n;===== Wipe Nozzle Extrude Line =====================\nG1 X80 Y-0.5 Z5 F18000\nM400\nG1 X80 Y-0.5 Z0.3 F600\nM400\n\nG92 E0\nG1 Z0.3 E8 F300\nM400\n\nG92 E0\nG1 X180 Y-0.5 Z0.3 F1800.0 E10.0;draw line\n\nG92 E0\nG1 X180 Y-2 Z0.3 F1800.0 E0.15;draw line\n\nG92 E0\nG1 X90 Y-2 Z0.3 F1800.0 E9;draw line\n\nG92 E0\nG1 X90 Y0 Z0.2 E0.2 F1800;\n\nG92 E0\nG1 Z0.6 F600\nM400\n\nG1 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} F9000\nM400\n\n;===== END G-CODE =====================\n\n\n\n", + "machine_start_gcode":";===== START G-CODE =====================\n;===== machine: M1 PRO =========================\n;===== size: X260 Y260 Z260 =====================\n;===== date: 20250708 =====================\n;===== Filament Temperature Configuration =====================\n;Nozzle_Preheat_Temp:140\n;Bed_Preheat_Temp:[bed_temperature_initial_layer_single]\n{if (nozzle_temperature_initial_layer[0] >250)};Filament_Common_Extrusion_Temp:[nozzle_temperature_initial_layer]{else};Filament_Common_Extrusion_Temp:250{endif}\n;Nozzle_Init_Layer_Temp:[nozzle_temperature_initial_layer]\n;Filament_Softening_Temp:[nozzle_temperature_range_low]\n\n;===== Default Settings =====================\nM106 S0 ;turn off cool fan\nM141 S0 ;turn off PTC\nM106 P2 S0 ;turn off chamber fan\nM106 P1 S0 ;turn off PTC fan\nM106 P3 S0 ;turn off filter fan\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nSET_VELOCITY_LIMIT VELOCITY=500;\nSET_VELOCITY_LIMIT ACCEL=6000;\nSET_VELOCITY_LIMIT MINIMUM_CRUISE_RATIO=0.2;\nSET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY=5;\nG21; set units to millimeters\nG90\n\n;===== Preheat While Zeroing =====================\nM106 P1 S153\n\nM140 S[bed_temperature_initial_layer_single];\n\n{if filament_type[initial_no_support_extruder]==\"ABS\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\n{if filament_type[initial_no_support_extruder]==\"PC\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\n{if filament_type[initial_no_support_extruder]==\"ASA\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\n{if filament_type[initial_no_support_extruder]==\"PA\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\n{if filament_type[initial_no_support_extruder]==\"PA-CF\"}\nM106 P1 S255\nM106 P2 S60\nG4 P5000\nM191 S47;\nM141 S{chamber_temperature[0]};\n{endif}\n\nM106 P2 S0\nM106 S0;\nG4 P500\n\n;===== Wait heating =====================\nG28\nG1 X20 Y2 Z0 F18000\n\n;===== Set Print Temperature =====================\nM106 S120;\nG4 P500\nM104 S[first_layer_temperature];\n\n{if (bed_temperature_initial_layer_single >0)}\nM190 S[bed_temperature_initial_layer_single];\n{else}\nM140 S[bed_temperature_initial_layer_single];\n{endif}\n\nM109 S[first_layer_temperature];\nM106 S0;\nG4 P500\n\n;===== Wipe Nozzle Extrude Line =====================\nG1 X20 Y2 Z0 F18000\nM400\n\nG92 E0\nG0 E4;\nM400\n\nG92 E0\nG1 X240 Y2 Z0.2 F1800.0 E11.0;\n\nG92 E0\nG1 X240 Y10 Z0.2 F1800.0 E1;\n\nG92 E0\nG1 X239.5\nG0 E0.2\n\nG92 E0\nG0 Y2.5 E0.125\n\nG92 E0\nG1 X20 F1800.0 E11;\n\nM400\nG92 E0\nG1 Z0.6 F600\nM400\n\nG1 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} F9000\nM400\n\n;===== END G-CODE =====================\n\n\n", + "name": "Artillery M1 Pro 0.4 nozzle", "print_host": "192.168.3.29", "printable_area": [ "0x0", @@ -69,9 +65,16 @@ "retraction_length": [ "1.3" ], + "version": "2.1.2.2", "z_hop": [ "0.6" ], + + "type": "machine", + "setting_id": "GM007", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", "printer_model": "Artillery M1 Pro", "nozzle_diameter": [ "0.4" @@ -211,7 +214,6 @@ ], "thumbnails_format": "PNG", "time_cost": "0", - "time_lapse_gcode": "TIMELAPSE_TAKE_FRAME", "upward_compatible_machine": [], "use_firmware_retraction": "0", "use_relative_e_distances": "1", @@ -224,5 +226,6 @@ "z_hop_types": [ "Slope Lift" ], - "z_offset": "0" -} \ No newline at end of file + "z_offset": "0", + "time_lapse_gcode": "TIMELAPSE_TAKE_FRAME" +} diff --git a/resources/profiles/Artillery/machine/Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/machine/Artillery M1 Pro 0.6 nozzle.json index cca8f1024f..8e99b9893b 100644 --- a/resources/profiles/Artillery/machine/Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery M1 Pro 0.6 nozzle.json @@ -1,10 +1,7 @@ { - "type": "machine", - "name": "Artillery M1 Pro 0.6 nozzle", - "from": "system", - "instantiation": "true", "adaptive_bed_mesh_margin": "0", "auxiliary_fan": "1", + "instantiation" : "true", "bbl_use_printhost": "0", "bed_custom_model": "", "bed_custom_texture": "", @@ -44,10 +41,12 @@ "fan_kickstart": "0", "fan_speedup_overhangs": "1", "fan_speedup_time": "0", + "from": "system", "gcode_flavor": "klipper", "head_wrap_detect_zone": [], "high_current_on_filament_swap": "0", "host_type": "octoprint", + "is_custom_defined": "0", "layer_change_gcode": "G92 E0\n{if layer_num==2}\n\n;filter_fan\nM106 P3 S{during_print_exhaust_fan_speed[0]*255/100.0};\n\n;auxiliary_fan\nM106 P2 S{additional_cooling_fan_speed[0]*255/100.0}\n\n{endif}\n\n\n", "long_retractions_when_cut": [ "0" @@ -133,6 +132,7 @@ "min_layer_height": [ "0.08" ], + "name": "Artillery M1 Pro 0.6 nozzle", "nozzle_diameter": [ "0.6" ], @@ -455,6 +455,7 @@ "upward_compatible_machine": [], "use_firmware_retraction": "0", "use_relative_e_distances": "1", + "version": "2.1.1.0", "wipe": [ "0" ], @@ -468,4 +469,4 @@ "Auto Lift" ], "z_offset": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/machine/Artillery M1 Pro 0.8 nozzle.json index 46aa56c70a..e8a492c5ad 100644 --- a/resources/profiles/Artillery/machine/Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery M1 Pro 0.8 nozzle.json @@ -1,10 +1,7 @@ { - "type": "machine", - "name": "Artillery M1 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", "adaptive_bed_mesh_margin": "0", "auxiliary_fan": "1", + "instantiation" : "true", "bbl_use_printhost": "0", "bed_custom_model": "", "bed_custom_texture": "", @@ -44,10 +41,12 @@ "fan_kickstart": "0", "fan_speedup_overhangs": "1", "fan_speedup_time": "0", + "from": "system", "gcode_flavor": "klipper", "head_wrap_detect_zone": [], "high_current_on_filament_swap": "0", "host_type": "octoprint", + "is_custom_defined": "0", "layer_change_gcode": "G92 E0\n{if layer_num==2}\n\n;filter_fan\nM106 P3 S{during_print_exhaust_fan_speed[0]*255/100.0};\n\n;auxiliary_fan\nM106 P2 S{additional_cooling_fan_speed[0]*255/100.0}\n\n{endif}\n\n\n", "long_retractions_when_cut": [ "0" @@ -133,6 +132,7 @@ "min_layer_height": [ "0.16" ], + "name": "Artillery M1 Pro 0.8 nozzle", "nozzle_diameter": [ "0.8" ], @@ -455,6 +455,7 @@ "upward_compatible_machine": [], "use_firmware_retraction": "0", "use_relative_e_distances": "1", + "version": "2.1.1.0", "wipe": [ "0" ], @@ -468,4 +469,4 @@ "Auto Lift" ], "z_offset": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json index 2551f15203..d1e6d9b6a0 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Artillery Sidewinder X3 Plus 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", "setting_id": "GM005", + "name": "Artillery Sidewinder X3 Plus 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_machine_common", "printer_model": "Artillery Sidewinder X3 Plus", "default_print_profile": "0.20mm Standard @Artillery Genius", "default_filament_profile": [ @@ -51,6 +51,7 @@ "head_wrap_detect_zone": [], "high_current_on_filament_swap": "0", "host_type": "octoprint", + "is_custom_defined": "0", "layer_change_gcode": "", "machine_end_gcode": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM211 S1", "machine_load_filament_time": "0", @@ -211,6 +212,7 @@ "upward_compatible_machine": [], "use_firmware_retraction": "0", "use_relative_e_distances": "0", + "version": "2.0.2.0", "wipe": [ "0" ], @@ -224,4 +226,4 @@ "Normal Lift" ], "z_offset": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json index 26cb3daca0..42b0fcbc56 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X3 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Artillery Sidewinder X3 Pro 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", "setting_id": "GM004", + "name": "Artillery Sidewinder X3 Pro 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_machine_common", "printer_model": "Artillery Sidewinder X3 Pro", "default_print_profile": "0.20mm Standard @Artillery Genius", "printer_settings_id": "Artillery X3 Pro 0.4 nozzle", @@ -12,8 +12,8 @@ "0.4" ], "default_filament_profile": [ - "Artillery PLA Basic" - ], + "Artillery PLA Basic" + ], "adaptive_bed_mesh_margin": "0", "auxiliary_fan": "0", "bbl_use_printhost": "0", @@ -54,6 +54,7 @@ "head_wrap_detect_zone": [], "high_current_on_filament_swap": "0", "host_type": "octoprint", + "is_custom_defined": "0", "layer_change_gcode": "", "machine_end_gcode": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM211 S1", "machine_load_filament_time": "0", @@ -211,6 +212,7 @@ "upward_compatible_machine": [], "use_firmware_retraction": "0", "use_relative_e_distances": "0", + "version": "2.0.2.0", "wipe": [ "0" ], @@ -224,4 +226,5 @@ "Normal Lift" ], "z_offset": "0" -} \ No newline at end of file + } + diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json index a16628e7f3..e914ad2c99 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Artillery Sidewinder X4 Plus 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", "setting_id": "GM006", + "name": "Artillery Sidewinder X4 Plus 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_machine_common", "printer_model": "Artillery Sidewinder X4 Plus", "printer_settings_id": "Artillery X4Plus 0.4 nozzle", "nozzle_diameter": [ @@ -54,6 +54,7 @@ "head_wrap_detect_zone": [], "high_current_on_filament_swap": "0", "host_type": "octoprint", + "is_custom_defined": "0", "layer_change_gcode": "G92 E0", "machine_end_gcode": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 E-1 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z1 ;Raise Z more\nG90 ;Absolute positionning\nG1 X-5 Y305 F3000 ;Wipe out\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", @@ -211,6 +212,7 @@ "upward_compatible_machine": [], "use_firmware_retraction": "0", "use_relative_e_distances": "1", + "version": "2.0.2.0", "wipe": [ "0" ], @@ -224,4 +226,4 @@ "Normal Lift" ], "z_offset": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus.json index 74c986ed45..7fcb3997fb 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Plus.json @@ -9,4 +9,4 @@ "bed_texture": "", "hotend_model": "", "default_materials": "Artillery PLA Basic;Artillery PLA Matte;Artillery PLA Silk;Artillery PLA Tough;Artillery PETG;Artillery TPU;Artillery ABS;" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json index 2198d8ed37..1e4826ea5b 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Artillery Sidewinder X4 Pro 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", "setting_id": "GM007", + "name": "Artillery Sidewinder X4 Pro 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_machine_common", "printer_model": "Artillery Sidewinder X4 Pro", "printer_settings_id": "Artillery X4Pro 0.4 nozzle", "nozzle_diameter": [ @@ -54,6 +54,7 @@ "head_wrap_detect_zone": [], "high_current_on_filament_swap": "0", "host_type": "octoprint", + "is_custom_defined": "0", "layer_change_gcode": "G92 E0", "machine_end_gcode": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 E-1 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z1 ;Raise Z more\nG90 ;Absolute positionning\nG1 X-5 Y250 F3000 ;Wipe out\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", "machine_load_filament_time": "0", @@ -211,6 +212,7 @@ "upward_compatible_machine": [], "use_firmware_retraction": "0", "use_relative_e_distances": "1", + "version": "2.0.2.0", "wipe": [ "0" ], @@ -224,4 +226,4 @@ "Normal Lift" ], "z_offset": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro.json index c09955a5da..b16b568e81 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X4 Pro.json @@ -9,4 +9,4 @@ "bed_texture": "", "hotend_model": "", "default_materials": "Artillery PLA Basic;Artillery PLA Matte;Artillery PLA Silk;Artillery PLA Tough;Artillery PETG;Artillery TPU;Artillery ABS;" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/machine/fdm_machine_common.json b/resources/profiles/Artillery/machine/fdm_machine_common.json index afbc469189..829d928e43 100644 --- a/resources/profiles/Artillery/machine/fdm_machine_common.json +++ b/resources/profiles/Artillery/machine/fdm_machine_common.json @@ -136,4 +136,4 @@ "0" ], "z_hop_types": "Normal Lift" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/process/0.06mm High Quality @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/process/0.06mm High Quality @Artillery M1 Pro 0.2 nozzle.json index 62833e4165..83b932f5be 100644 --- a/resources/profiles/Artillery/process/0.06mm High Quality @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/process/0.06mm High Quality @Artillery M1 Pro 0.2 nozzle.json @@ -1,10 +1,11 @@ { - "type": "process", - "name": "0.06mm High Quality @Artillery M1 Pro 0.2 nozzle", - "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", - "from": "system", "instantiation": "true", + "from": "system", + "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", "initial_layer_speed": "30", + "is_custom_defined": "0", "layer_height": "0.06", - "print_settings_id": "0.06mm High Quality @Artillery M1 Pro 0.2 nozzle" -} \ No newline at end of file + "name": "0.06mm High Quality @Artillery M1 Pro 0.2 nozzle", + "print_settings_id": "0.06mm High Quality @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.06mm Standard @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/process/0.06mm Standard @Artillery M1 Pro 0.2 nozzle.json index eac469621d..067fb2ce15 100644 --- a/resources/profiles/Artillery/process/0.06mm Standard @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/process/0.06mm Standard @Artillery M1 Pro 0.2 nozzle.json @@ -1,13 +1,14 @@ { - "type": "process", - "name": "0.06mm Standard @Artillery M1 Pro 0.2 nozzle", - "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", - "from": "system", "instantiation": "true", "default_acceleration": "10000", + "from": "system", + "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", "initial_layer_speed": "30", + "is_custom_defined": "0", "layer_height": "0.06", + "name": "0.06mm Standard @Artillery M1 Pro 0.2 nozzle", "outer_wall_acceleration": "5000", "outer_wall_speed": "120", - "print_settings_id": "0.06mm Standard @Artillery M1 Pro 0.2 nozzle" -} \ No newline at end of file + "print_settings_id": "0.06mm Standard @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle.json index 6782b66043..ed58861bc0 100644 --- a/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle.json @@ -1,14 +1,13 @@ { - "type": "process", - "name": "0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", "instantiation": "true", "default_acceleration": "10000", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", - "gap_infill_speed": "200", + "from": "system", + "gap_infill_speed": "350", "initial_layer_infill_speed": "80", - "inner_wall_speed": "300", + "inner_wall_speed": "350", + "is_custom_defined": "0", + "name": "0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle", "outer_wall_speed": "200", "print_settings_id": "0.08mm Extra Fine @Artillery M1 Pro 0.4 nozzle", "slow_down_layers": "3", @@ -18,6 +17,7 @@ "top_surface_pattern": "monotonicline", "travel_speed": "500", "tree_support_branch_diameter_double_wall": "1", + "version": "2.1.2.2", "wall_generator": "classic", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", @@ -25,6 +25,7 @@ "outer_wall_line_width": "0.42", "support_line_width": "0.42", "top_surface_line_width": "0.42", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -37,7 +38,7 @@ "bridge_density": "100%", "bridge_flow": "1", "bridge_no_support": "0", - "bridge_speed": "70", + "bridge_speed": "50", "brim_ears_detection_length": "1", "brim_ears_max_angle": "125", "brim_object_gap": "0", @@ -54,7 +55,7 @@ "detect_thin_wall": "1", "dont_filter_internal_bridges": "disabled", "draft_shield": "disabled", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "elefant_foot_compensation_layers": "1", "enable_arc_fitting": "0", "enable_overhang_speed": "1", @@ -86,7 +87,7 @@ "infill_direction": "45", "infill_jerk": "9", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "0", + "initial_layer_acceleration": "500", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", @@ -99,9 +100,9 @@ "internal_bridge_flow": "1", "internal_bridge_speed": "150%", "internal_solid_infill_acceleration": "100%", - "internal_solid_infill_pattern": "monotonic", - "internal_solid_infill_speed": "300", - "ironing_angle": "0", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "350", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -120,7 +121,7 @@ "min_feature_size": "25%", "min_length_factor": "0.5", "min_width_top_surface": "300%", - "minimum_sparse_infill_area": "10", + "minimum_sparse_infill_area": "15", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", "notes": "", @@ -129,9 +130,9 @@ "ooze_prevention": "0", "outer_wall_acceleration": "5000", "outer_wall_jerk": "9", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "overhang_reverse": "0", "overhang_reverse_internal_only": "0", @@ -195,8 +196,8 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.45", - "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", + "sparse_infill_pattern": "grid", + "sparse_infill_speed": "450", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", "spiral_mode_smooth": "0", @@ -229,10 +230,10 @@ "timelapse_type": "0", "top_shell_thickness": "0.8", "top_solid_infill_flow_ratio": "1", - "top_surface_acceleration": "0", + "top_surface_acceleration": "20000", "top_surface_jerk": "9", - "top_surface_speed": "100", - "travel_acceleration": "0", + "top_surface_speed": "200", + "travel_acceleration": "1000", "travel_jerk": "12", "travel_speed_z": "0", "tree_support_adaptive_layer_height": "1", @@ -280,5 +281,6 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" + +} diff --git a/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle.json index f50d9d0e7b..af4db28f6b 100644 --- a/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle.json @@ -1,14 +1,14 @@ { - "type": "process", - "name": "0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", "layer_height": "0.08", + "name": "0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle", "outer_wall_line_width": "0.42", "print_settings_id": "0.08mm Extra Fine @Artillery X4Plus 0.4 nozzle", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle.json index 56e5a6dfc0..5ddb03c228 100644 --- a/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle.json @@ -1,14 +1,14 @@ { - "type": "process", - "name": "0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle", - "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", "from": "system", - "instantiation": "true", + "instantiation": "true", + "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", "layer_height": "0.08", + "name": "0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle", "outer_wall_line_width": "0.42", "print_settings_id": "0.08mm Extra Fine @Artillery X4Pro 0.4 nozzle", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.08mm High Quality @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/process/0.08mm High Quality @Artillery M1 Pro 0.2 nozzle.json index 2f78eb25c1..005573d593 100644 --- a/resources/profiles/Artillery/process/0.08mm High Quality @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/process/0.08mm High Quality @Artillery M1 Pro 0.2 nozzle.json @@ -1,7 +1,4 @@ { - "type": "process", - "name": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", - "from": "system", "instantiation": "true", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", @@ -48,6 +45,7 @@ "flush_into_infill": "0", "flush_into_objects": "0", "flush_into_support": "1", + "from": "system", "fuzzy_skin": "none", "fuzzy_skin_first_layer": "0", "fuzzy_skin_point_distance": "0.8", @@ -93,12 +91,13 @@ "internal_solid_infill_line_width": "0.22", "internal_solid_infill_pattern": "zig-zag", "internal_solid_infill_speed": "150", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", "ironing_speed": "15", "ironing_type": "no ironing", + "is_custom_defined": "0", "is_infill_first": "0", "layer_height": "0.08", "line_width": "0.22", @@ -117,6 +116,7 @@ "minimum_sparse_infill_area": "15", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", + "name": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", "notes": "", "only_one_wall_first_layer": "0", "only_one_wall_top": "0", @@ -263,6 +263,7 @@ "tree_support_tip_diameter": "0.8", "tree_support_top_rate": "30%", "tree_support_wall_count": "0", + "version": "2.1.1.0", "wall_direction": "auto", "wall_distribution_count": "1", "wall_filament": "1", @@ -297,4 +298,4 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/process/0.08mm High Quality @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.08mm High Quality @Artillery M1 Pro 0.4 nozzle.json index f83d5abd27..1b30482fe0 100644 --- a/resources/profiles/Artillery/process/0.08mm High Quality @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.08mm High Quality @Artillery M1 Pro 0.4 nozzle.json @@ -1,17 +1,17 @@ { - "type": "process", - "name": "0.08mm High Quality @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", + "instantiation": "true", "default_acceleration": "4000", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", - "gap_infill_speed": "200", + "from": "system", + "gap_infill_speed": "210", "initial_layer_infill_speed": "80", + "is_custom_defined": "0", + "name": "0.08mm High Quality @Artillery M1 Pro 0.4 nozzle", "print_settings_id": "0.08mm High Quality @Artillery M1 Pro 0.4 nozzle", "slow_down_layers": "3", "top_shell_layers": "9", "travel_speed": "500", + "version": "2.1.1.0", "initial_layer_print_height": "0.2", "inner_wall_speed": "120", "internal_solid_infill_line_width": "0.42", @@ -23,6 +23,7 @@ "sparse_infill_speed": "150", "support_line_width": "0.42", "top_surface_line_width": "0.42", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -35,7 +36,7 @@ "bridge_density": "100%", "bridge_flow": "1", "bridge_no_support": "0", - "bridge_speed": "70", + "bridge_speed": "50", "brim_ears_detection_length": "1", "brim_ears_max_angle": "125", "brim_object_gap": "0", @@ -52,7 +53,7 @@ "detect_thin_wall": "1", "dont_filter_internal_bridges": "disabled", "draft_shield": "disabled", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "elefant_foot_compensation_layers": "1", "enable_arc_fitting": "0", "enable_overhang_speed": "1", @@ -84,7 +85,7 @@ "infill_direction": "45", "infill_jerk": "9", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "0", + "initial_layer_acceleration": "500", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", @@ -97,8 +98,8 @@ "internal_bridge_flow": "1", "internal_bridge_speed": "150%", "internal_solid_infill_acceleration": "100%", - "internal_solid_infill_pattern": "monotonic", - "ironing_angle": "0", + "internal_solid_infill_pattern": "zig-zag", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -117,7 +118,7 @@ "min_feature_size": "25%", "min_length_factor": "0.5", "min_width_top_surface": "300%", - "minimum_sparse_infill_area": "10", + "minimum_sparse_infill_area": "15", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", "notes": "", @@ -125,9 +126,9 @@ "only_one_wall_top": "0", "ooze_prevention": "0", "outer_wall_jerk": "9", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "overhang_reverse": "0", "overhang_reverse_internal_only": "0", @@ -226,11 +227,11 @@ "timelapse_type": "0", "top_shell_thickness": "0.8", "top_solid_infill_flow_ratio": "1", - "top_surface_acceleration": "0", + "top_surface_acceleration": "2000", "top_surface_jerk": "9", - "top_surface_pattern": "monotonic", - "top_surface_speed": "100", - "travel_acceleration": "0", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "150", + "travel_acceleration": "10000", "travel_jerk": "12", "travel_speed_z": "0", "tree_support_adaptive_layer_height": "1", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} diff --git a/resources/profiles/Artillery/process/0.08mm High Quality @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.08mm High Quality @Artillery X4Plus 0.4 nozzle.json index 8bcd20f416..efd2a72caf 100644 --- a/resources/profiles/Artillery/process/0.08mm High Quality @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.08mm High Quality @Artillery X4Plus 0.4 nozzle.json @@ -1,20 +1,20 @@ { - "type": "process", - "name": "0.08mm High Quality @Artillery X4Plus 0.4 nozzle", - "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", + "from": "system", + "instantiation": "true", "default_acceleration": "3000", + "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", "initial_layer_print_height": "0.2", "inner_wall_speed": "120", "internal_solid_infill_line_width": "0.42", "internal_solid_infill_speed": "150", "layer_height": "0.08", + "name": "0.08mm High Quality @Artillery X4Plus 0.4 nozzle", "outer_wall_acceleration": "2000", "outer_wall_line_width": "0.42", "outer_wall_speed": "60", "print_settings_id": "0.08mm High Quality @Artillery X4Plus 0.4 nozzle", "sparse_infill_speed": "150", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.08mm High Quality @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.08mm High Quality @Artillery X4Pro 0.4 nozzle.json index 6d00c14176..aa0930cc29 100644 --- a/resources/profiles/Artillery/process/0.08mm High Quality @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.08mm High Quality @Artillery X4Pro 0.4 nozzle.json @@ -1,20 +1,20 @@ { - "type": "process", - "name": "0.08mm High Quality @Artillery X4Pro 0.4 nozzle", - "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", "from": "system", - "instantiation": "true", + "instantiation": "true", "default_acceleration": "3000", + "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", "initial_layer_print_height": "0.2", "inner_wall_speed": "120", "internal_solid_infill_line_width": "0.42", "internal_solid_infill_speed": "150", "layer_height": "0.08", + "name": "0.08mm High Quality @Artillery X4Pro 0.4 nozzle", "outer_wall_acceleration": "2000", "outer_wall_line_width": "0.42", "outer_wall_speed": "60", "print_settings_id": "0.08mm High Quality @Artillery X4Pro 0.4 nozzle", "sparse_infill_speed": "150", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.08mm Standard @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/process/0.08mm Standard @Artillery M1 Pro 0.2 nozzle.json index fa2f4dbd91..b8984d11af 100644 --- a/resources/profiles/Artillery/process/0.08mm Standard @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/process/0.08mm Standard @Artillery M1 Pro 0.2 nozzle.json @@ -1,11 +1,12 @@ { - "type": "process", - "name": "0.08mm Standard @Artillery M1 Pro 0.2 nozzle", - "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "default_acceleration": "10000", + "from": "system", + "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", + "is_custom_defined": "0", + "name": "0.08mm Standard @Artillery M1 Pro 0.2 nozzle", "outer_wall_acceleration": "5000", "outer_wall_speed": "120", - "print_settings_id": "0.08mm Standard @Artillery M1 Pro 0.2 nozzle" -} \ No newline at end of file + "print_settings_id": "0.08mm Standard @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.10mm High Quality @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/process/0.10mm High Quality @Artillery M1 Pro 0.2 nozzle.json index 07c209d6ec..7271794fd6 100644 --- a/resources/profiles/Artillery/process/0.10mm High Quality @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/process/0.10mm High Quality @Artillery M1 Pro 0.2 nozzle.json @@ -1,9 +1,10 @@ { - "type": "process", - "name": "0.10mm High Quality @Artillery M1 Pro 0.2 nozzle", - "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", + "instantiation": "true", "from": "system", - "instantiation": "true", + "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", + "is_custom_defined": "0", "layer_height": "0.1", - "print_settings_id": "0.10mm High Quality @Artillery M1 Pro 0.2 nozzle" -} \ No newline at end of file + "name": "0.10mm High Quality @Artillery M1 Pro 0.2 nozzle", + "print_settings_id": "0.10mm High Quality @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.10mm Standard @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/process/0.10mm Standard @Artillery M1 Pro 0.2 nozzle.json index 345ae3491a..fb3109249f 100644 --- a/resources/profiles/Artillery/process/0.10mm Standard @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/process/0.10mm Standard @Artillery M1 Pro 0.2 nozzle.json @@ -1,15 +1,16 @@ { - "type": "process", - "name": "0.10mm Standard @Artillery M1 Pro 0.2 nozzle", - "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "default_acceleration": "10000", + "from": "system", + "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", + "is_custom_defined": "0", "layer_height": "0.1", + "name": "0.10mm Standard @Artillery M1 Pro 0.2 nozzle", "outer_wall_acceleration": "5000", "outer_wall_speed": "120", "print_settings_id": "0.10mm Standard @Artillery M1 Pro 0.2 nozzle", "sparse_infill_pattern": "zig-zag", "support_style": "default", - "support_type": "tree(auto)" -} \ No newline at end of file + "support_type": "tree(auto)", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.12mm Fine @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.12mm Fine @Artillery M1 Pro 0.4 nozzle.json index 817bb4adfa..05977ed277 100644 --- a/resources/profiles/Artillery/process/0.12mm Fine @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.12mm Fine @Artillery M1 Pro 0.4 nozzle.json @@ -1,29 +1,30 @@ { - "type": "process", - "name": "0.12mm Fine @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", + "instantiation": "true", "bottom_shell_layers": "5", "default_acceleration": "10000", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", - "gap_infill_speed": "200", + "from": "system", + "gap_infill_speed": "350", "initial_layer_infill_speed": "80", - "inner_wall_speed": "300", + "inner_wall_speed": "350", + "is_custom_defined": "0", + "name": "0.12mm Fine @Artillery M1 Pro 0.4 nozzle", "outer_wall_speed": "200", "print_settings_id": "0.12mm Fine @Artillery M1 Pro 0.4 nozzle", "slow_down_layers": "3", - "sparse_infill_speed": "400", + "sparse_infill_speed": "430", "top_shell_layers": "5", "top_shell_thickness": "0.6", "top_surface_pattern": "monotonicline", "travel_speed": "700", + "version": "2.1.2.2", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", "layer_height": "0.12", "outer_wall_line_width": "0.42", "support_line_width": "0.42", "top_surface_line_width": "0.42", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -35,7 +36,7 @@ "bridge_density": "100%", "bridge_flow": "1", "bridge_no_support": "0", - "bridge_speed": "70", + "bridge_speed": "50", "brim_ears_detection_length": "1", "brim_ears_max_angle": "125", "brim_object_gap": "0", @@ -52,7 +53,7 @@ "detect_thin_wall": "1", "dont_filter_internal_bridges": "disabled", "draft_shield": "disabled", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "elefant_foot_compensation_layers": "1", "enable_arc_fitting": "0", "enable_overhang_speed": "1", @@ -84,7 +85,7 @@ "infill_direction": "45", "infill_jerk": "9", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "0", + "initial_layer_acceleration": "500", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", @@ -97,9 +98,9 @@ "internal_bridge_flow": "1", "internal_bridge_speed": "150%", "internal_solid_infill_acceleration": "100%", - "internal_solid_infill_pattern": "monotonic", - "internal_solid_infill_speed": "300", - "ironing_angle": "0", + "internal_solid_infill_pattern": "zig", + "internal_solid_infill_speed": "350", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -127,9 +128,9 @@ "ooze_prevention": "0", "outer_wall_acceleration": "5000", "outer_wall_jerk": "9", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "overhang_reverse": "0", "overhang_reverse_internal_only": "0", @@ -193,7 +194,7 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.45", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "grid", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", "spiral_mode_smooth": "0", @@ -227,12 +228,12 @@ "thick_internal_bridges": "1", "timelapse_type": "0", "top_solid_infill_flow_ratio": "1", - "top_surface_acceleration": "0", + "top_surface_acceleration": "2000", "top_surface_jerk": "9", - "top_surface_speed": "100", - "travel_acceleration": "0", + "top_surface_speed": "200", + "travel_acceleration": "10000", "travel_jerk": "12", - "travel_speed_z": "0", + "travel_speed_z": "500", "tree_support_adaptive_layer_height": "1", "tree_support_angle_slow": "25", "tree_support_auto_brim": "1", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} diff --git a/resources/profiles/Artillery/process/0.12mm Fine @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.12mm Fine @Artillery X4Plus 0.4 nozzle.json index 5eb11491d8..1788f71322 100644 --- a/resources/profiles/Artillery/process/0.12mm Fine @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.12mm Fine @Artillery X4Plus 0.4 nozzle.json @@ -1,14 +1,14 @@ { - "type": "process", - "name": "0.12mm Fine @Artillery X4Plus 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", "layer_height": "0.12", + "name": "0.12mm Fine @Artillery X4Plus 0.4 nozzle", "outer_wall_line_width": "0.42", "print_settings_id": "0.12mm Fine @Artillery X4Plus 0.4 nozzle", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.12mm Fine @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.12mm Fine @Artillery X4Pro 0.4 nozzle.json index c9d200b4d1..5c9c9fe7d7 100644 --- a/resources/profiles/Artillery/process/0.12mm Fine @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.12mm Fine @Artillery X4Pro 0.4 nozzle.json @@ -1,14 +1,14 @@ { - "type": "process", - "name": "0.12mm Fine @Artillery X4Pro 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", "layer_height": "0.12", + "name": "0.12mm Fine @Artillery X4Pro 0.4 nozzle", "outer_wall_line_width": "0.42", "print_settings_id": "0.12mm Fine @Artillery X4Pro 0.4 nozzle", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.12mm High Quality @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.12mm High Quality @Artillery M1 Pro 0.4 nozzle.json index 62dc77f66d..bef33a7bf0 100644 --- a/resources/profiles/Artillery/process/0.12mm High Quality @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.12mm High Quality @Artillery M1 Pro 0.4 nozzle.json @@ -1,29 +1,30 @@ { - "type": "process", - "name": "0.12mm High Quality @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", + "instantiation": "true", "bottom_shell_layers": "5", "default_acceleration": "4000", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", - "gap_infill_speed": "200", + "from": "system", + "gap_infill_speed": "230", "inner_wall_speed": "150", + "is_custom_defined": "0", + "name": "0.12mm High Quality @Artillery M1 Pro 0.4 nozzle", "print_settings_id": "0.12mm High Quality @Artillery M1 Pro 0.4 nozzle", "slow_down_layers": "3", "top_shell_thickness": "0.6", "top_surface_pattern": "monotonicline", "travel_speed": "500", + "version": "2.1.2.2", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", - "internal_solid_infill_speed": "150", + "internal_solid_infill_speed": "180", "layer_height": "0.12", "outer_wall_acceleration": "2000", "outer_wall_line_width": "0.42", "outer_wall_speed": "60", - "sparse_infill_speed": "150", + "sparse_infill_speed": "180", "support_line_width": "0.42", "top_surface_line_width": "0.42", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -35,7 +36,7 @@ "bridge_density": "100%", "bridge_flow": "1", "bridge_no_support": "0", - "bridge_speed": "70", + "bridge_speed": "50", "brim_ears_detection_length": "1", "brim_ears_max_angle": "125", "brim_object_gap": "0", @@ -84,7 +85,7 @@ "infill_direction": "45", "infill_jerk": "9", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "0", + "initial_layer_acceleration": "500", "initial_layer_infill_speed": "30", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", @@ -98,8 +99,8 @@ "internal_bridge_flow": "1", "internal_bridge_speed": "150%", "internal_solid_infill_acceleration": "100%", - "internal_solid_infill_pattern": "monotonic", - "ironing_angle": "0", + "internal_solid_infill_pattern": "zig-zag", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -118,7 +119,7 @@ "min_feature_size": "25%", "min_length_factor": "0.5", "min_width_top_surface": "300%", - "minimum_sparse_infill_area": "10", + "minimum_sparse_infill_area": "15", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", "notes": "", @@ -126,9 +127,9 @@ "only_one_wall_top": "0", "ooze_prevention": "0", "outer_wall_jerk": "9", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "overhang_reverse": "0", "overhang_reverse_internal_only": "0", @@ -227,10 +228,10 @@ "timelapse_type": "0", "top_shell_layers": "4", "top_solid_infill_flow_ratio": "1", - "top_surface_acceleration": "0", + "top_surface_acceleration": "2000", "top_surface_jerk": "9", - "top_surface_speed": "100", - "travel_acceleration": "0", + "top_surface_speed": "150", + "travel_acceleration": "10000", "travel_jerk": "12", "travel_speed_z": "0", "tree_support_adaptive_layer_height": "1", @@ -280,5 +281,6 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" + +} diff --git a/resources/profiles/Artillery/process/0.12mm High Quality @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.12mm High Quality @Artillery X4Plus 0.4 nozzle.json index 59a7885c79..9e8a9c0948 100644 --- a/resources/profiles/Artillery/process/0.12mm High Quality @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.12mm High Quality @Artillery X4Plus 0.4 nozzle.json @@ -1,20 +1,20 @@ { - "type": "process", - "name": "0.12mm High Quality @Artillery X4Plus 0.4 nozzle", - "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", + "from": "system", + "instantiation": "true", "default_acceleration": "3000", + "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", "initial_layer_print_height": "0.2", "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.42", "internal_solid_infill_speed": "180", "layer_height": "0.12", + "name": "0.12mm High Quality @Artillery X4Plus 0.4 nozzle", "outer_wall_acceleration": "2000", "outer_wall_line_width": "0.42", "outer_wall_speed": "60", "print_settings_id": "0.12mm High Quality @Artillery X4Plus 0.4 nozzle", "sparse_infill_speed": "180", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.12mm High Quality @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.12mm High Quality @Artillery X4Pro 0.4 nozzle.json index 2e2a3e9b2c..9398afd476 100644 --- a/resources/profiles/Artillery/process/0.12mm High Quality @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.12mm High Quality @Artillery X4Pro 0.4 nozzle.json @@ -1,20 +1,20 @@ { - "type": "process", - "name": "0.12mm High Quality @Artillery X4Pro 0.4 nozzle", - "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", + "from": "system", + "instantiation": "true", "default_acceleration": "3000", + "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", "initial_layer_print_height": "0.2", "inner_wall_speed": "120", "internal_solid_infill_line_width": "0.42", "internal_solid_infill_speed": "150", "layer_height": "0.12", + "name": "0.12mm High Quality @Artillery X4Pro 0.4 nozzle", "outer_wall_acceleration": "2000", "outer_wall_line_width": "0.42", "outer_wall_speed": "60", "print_settings_id": "0.12mm High Quality @Artillery X4Pro 0.4 nozzle", "sparse_infill_speed": "150", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.12mm Standard @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/process/0.12mm Standard @Artillery M1 Pro 0.2 nozzle.json index 89201e2f78..aea53f4632 100644 --- a/resources/profiles/Artillery/process/0.12mm Standard @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/process/0.12mm Standard @Artillery M1 Pro 0.2 nozzle.json @@ -1,12 +1,13 @@ { - "type": "process", - "name": "0.12mm Standard @Artillery M1 Pro 0.2 nozzle", - "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "default_acceleration": "10000", + "from": "system", + "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", + "is_custom_defined": "0", "layer_height": "0.12", + "name": "0.12mm Standard @Artillery M1 Pro 0.2 nozzle", "outer_wall_acceleration": "5000", "outer_wall_speed": "120", - "print_settings_id": "0.12mm Standard @Artillery M1 Pro 0.2 nozzle" -} \ No newline at end of file + "print_settings_id": "0.12mm Standard @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.14mm Standard @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/process/0.14mm Standard @Artillery M1 Pro 0.2 nozzle.json index 589065bc37..54e38d105c 100644 --- a/resources/profiles/Artillery/process/0.14mm Standard @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/process/0.14mm Standard @Artillery M1 Pro 0.2 nozzle.json @@ -1,12 +1,13 @@ { - "type": "process", - "name": "0.14mm Standard @Artillery M1 Pro 0.2 nozzle", - "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "default_acceleration": "10000", + "from": "system", + "inherits": "0.08mm High Quality @Artillery M1 Pro 0.2 nozzle", + "is_custom_defined": "0", "layer_height": "0.14", + "name": "0.14mm Standard @Artillery M1 Pro 0.2 nozzle", "outer_wall_acceleration": "5000", "outer_wall_speed": "120", - "print_settings_id": "0.14mm Standard @Artillery M1 Pro 0.2 nozzle" -} \ No newline at end of file + "print_settings_id": "0.14mm Standard @Artillery M1 Pro 0.2 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius Pro.json b/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius Pro.json index 0d16158521..3949a4c781 100644 --- a/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius Pro.json +++ b/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius Pro.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.15mm Optimal @Artillery Genius Pro", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.15", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "3", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "0", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0.15", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "2", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.15", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "60", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "110", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Genius Pro 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Optimal @Artillery Genius Pro", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.15", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.15", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius Pro 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius.json b/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius.json index 6ee9a5d362..3d799e54ea 100644 --- a/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius.json +++ b/resources/profiles/Artillery/process/0.15mm Optimal @Artillery Genius.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.15mm Optimal @Artillery Genius", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.15", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "7", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "0", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.15", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "60", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "110", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Genius 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Optimal @Artillery Genius", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.15", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.15", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.16mm High Quality @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.16mm High Quality @Artillery M1 Pro 0.4 nozzle.json index c5a47dce99..70b398b3b1 100644 --- a/resources/profiles/Artillery/process/0.16mm High Quality @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.16mm High Quality @Artillery M1 Pro 0.4 nozzle.json @@ -1,15 +1,13 @@ { - "type": "process", - "name": "0.16mm High Quality @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", "bottom_shell_layers": "4", "default_acceleration": "4000", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", + "from": "system", "gap_infill_speed": "200", "initial_layer_infill_speed": "80", "internal_solid_infill_speed": "200", + "is_custom_defined": "0", + "name": "0.16mm High Quality @Artillery M1 Pro 0.4 nozzle", "print_settings_id": "0.16mm High Quality @Artillery M1 Pro 0.4 nozzle", "slow_down_layers": "3", "sparse_infill_speed": "200", @@ -17,6 +15,8 @@ "top_shell_thickness": "1", "top_surface_pattern": "monotonicline", "travel_speed": "500", + "version": "2.1.2.2", + "instantiation": "true", "initial_layer_print_height": "0.2", "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.42", @@ -26,6 +26,7 @@ "outer_wall_speed": "60", "support_line_width": "0.42", "top_surface_line_width": "0.42", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -37,7 +38,7 @@ "bridge_density": "100%", "bridge_flow": "1", "bridge_no_support": "0", - "bridge_speed": "70", + "bridge_speed": "50", "brim_ears_detection_length": "1", "brim_ears_max_angle": "125", "brim_object_gap": "0", @@ -54,7 +55,7 @@ "detect_thin_wall": "1", "dont_filter_internal_bridges": "disabled", "draft_shield": "disabled", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "elefant_foot_compensation_layers": "1", "enable_arc_fitting": "0", "enable_overhang_speed": "1", @@ -86,7 +87,7 @@ "infill_direction": "45", "infill_jerk": "9", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "0", + "initial_layer_acceleration": "500", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", @@ -100,7 +101,7 @@ "internal_bridge_speed": "150%", "internal_solid_infill_acceleration": "100%", "internal_solid_infill_pattern": "monotonic", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -127,9 +128,9 @@ "only_one_wall_top": "0", "ooze_prevention": "0", "outer_wall_jerk": "9", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "overhang_reverse": "0", "overhang_reverse_internal_only": "0", @@ -193,7 +194,7 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.45", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "grid", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", "spiral_mode_smooth": "0", @@ -227,10 +228,10 @@ "thick_internal_bridges": "1", "timelapse_type": "0", "top_solid_infill_flow_ratio": "1", - "top_surface_acceleration": "0", + "top_surface_acceleration": "2000", "top_surface_jerk": "9", - "top_surface_speed": "100", - "travel_acceleration": "0", + "top_surface_speed": "150", + "travel_acceleration": "10000", "travel_jerk": "12", "travel_speed_z": "0", "tree_support_adaptive_layer_height": "1", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} diff --git a/resources/profiles/Artillery/process/0.16mm High Quality @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.16mm High Quality @Artillery X4Plus 0.4 nozzle.json index 181381f77a..3e2d8e1819 100644 --- a/resources/profiles/Artillery/process/0.16mm High Quality @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.16mm High Quality @Artillery X4Plus 0.4 nozzle.json @@ -1,20 +1,20 @@ { - "type": "process", - "name": "0.16mm High Quality @Artillery X4Plus 0.4 nozzle", - "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", + "from": "system", + "instantiation": "true", "default_acceleration": "3000", + "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", "initial_layer_print_height": "0.2", "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.42", "internal_solid_infill_speed": "180", "layer_height": "0.16", + "name": "0.16mm High Quality @Artillery X4Plus 0.4 nozzle", "outer_wall_acceleration": "2000", "outer_wall_line_width": "0.42", "outer_wall_speed": "60", "print_settings_id": "0.16mm High Quality @Artillery X4Plus 0.4 nozzle", "sparse_infill_speed": "180", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.16mm High Quality @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.16mm High Quality @Artillery X4Pro 0.4 nozzle.json index c925ceff9b..9306e639c2 100644 --- a/resources/profiles/Artillery/process/0.16mm High Quality @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.16mm High Quality @Artillery X4Pro 0.4 nozzle.json @@ -1,20 +1,20 @@ { - "type": "process", - "name": "0.16mm High Quality @Artillery X4Pro 0.4 nozzle", - "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", + "from": "system", + "instantiation": "true", "default_acceleration": "3000", + "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", "initial_layer_print_height": "0.2", "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.42", "internal_solid_infill_speed": "180", "layer_height": "0.16", + "name": "0.16mm High Quality @Artillery X4Pro 0.4 nozzle", "outer_wall_acceleration": "2000", "outer_wall_line_width": "0.42", "outer_wall_speed": "60", "print_settings_id": "0.16mm High Quality @Artillery X4Pro 0.4 nozzle", "sparse_infill_speed": "180", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery Hornet.json b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery Hornet.json index 2fe10e2e7a..06268f64b8 100644 --- a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery Hornet.json +++ b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery Hornet.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.16mm Optimal @Artillery Hornet", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.16", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "7", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "500", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.16", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "40", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Hornet 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Artillery Hornet", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.16", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.16", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Hornet 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery M1 Pro 0.4 nozzle.json index 79729dfa9a..e282e8f608 100644 --- a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery M1 Pro 0.4 nozzle.json @@ -1,19 +1,18 @@ { - "type": "process", - "name": "0.16mm Optimal @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", + "instantiation": "true", "bottom_shell_layers": "4", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", - "gap_infill_speed": "200", + "from": "system", + "gap_infill_speed": "300", "initial_layer_infill_speed": "80", "inner_wall_speed": "300", - "internal_solid_infill_speed": "200", + "internal_solid_infill_speed": "300", + "is_custom_defined": "0", + "name": "0.16mm Optimal @Artillery M1 Pro 0.4 nozzle", "outer_wall_speed": "200", "print_settings_id": "0.16mm Optimal @Artillery M1 Pro 0.4 nozzle", "slow_down_layers": "3", - "sparse_infill_speed": "300", + "sparse_infill_speed": "330", "support_style": "default", "support_type": "tree(auto)", "top_shell_layers": "6", @@ -21,12 +20,14 @@ "top_surface_pattern": "monotonicline", "travel_speed": "500", "tree_support_branch_diameter_double_wall": "1", + "version": "2.1.2.2", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", "layer_height": "0.16", "outer_wall_line_width": "0.42", "support_line_width": "0.42", "top_surface_line_width": "0.42", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -38,7 +39,7 @@ "bridge_density": "100%", "bridge_flow": "1", "bridge_no_support": "0", - "bridge_speed": "70", + "bridge_speed": "50", "brim_ears_detection_length": "1", "brim_ears_max_angle": "125", "brim_object_gap": "0", @@ -49,14 +50,14 @@ ], "compatible_printers_condition": "", "counterbore_hole_bridging": "none", - "default_acceleration": "5000", + "default_acceleration": "10000", "default_jerk": "0", "detect_narrow_internal_solid_infill": "1", "detect_overhang_wall": "1", "detect_thin_wall": "1", "dont_filter_internal_bridges": "disabled", "draft_shield": "disabled", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "elefant_foot_compensation_layers": "1", "enable_arc_fitting": "0", "enable_overhang_speed": "1", @@ -88,7 +89,7 @@ "infill_direction": "45", "infill_jerk": "9", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "0", + "initial_layer_acceleration": "500", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", "initial_layer_min_bead_width": "85%", @@ -102,7 +103,7 @@ "internal_bridge_speed": "150%", "internal_solid_infill_acceleration": "100%", "internal_solid_infill_pattern": "monotonic", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -121,7 +122,7 @@ "min_feature_size": "25%", "min_length_factor": "0.5", "min_width_top_surface": "300%", - "minimum_sparse_infill_area": "10", + "minimum_sparse_infill_area": "15", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", "notes": "", @@ -130,9 +131,9 @@ "ooze_prevention": "0", "outer_wall_acceleration": "5000", "outer_wall_jerk": "9", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "overhang_reverse": "0", "overhang_reverse_internal_only": "0", @@ -196,7 +197,7 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.45", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "grid", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", "spiral_mode_smooth": "0", @@ -228,10 +229,10 @@ "thick_internal_bridges": "1", "timelapse_type": "0", "top_solid_infill_flow_ratio": "1", - "top_surface_acceleration": "0", + "top_surface_acceleration": "2000", "top_surface_jerk": "9", - "top_surface_speed": "100", - "travel_acceleration": "0", + "top_surface_speed": "200", + "travel_acceleration": "10000", "travel_jerk": "12", "travel_speed_z": "0", "tree_support_adaptive_layer_height": "1", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} diff --git a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X1.json b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X1.json index bb0d883315..1b92d76eb1 100644 --- a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X1.json +++ b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X1.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.16mm Optimal @Artillery X1", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.16", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "7", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "500", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.16", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "40", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Artillery X1", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.16", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.16", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Sidewinder X1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X4Plus 0.4 nozzle.json index 0072427bcd..38d3d16c80 100644 --- a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X4Plus 0.4 nozzle.json @@ -1,18 +1,18 @@ { - "type": "process", - "name": "0.16mm Optimal @Artillery X4Plus 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.42", "internal_solid_infill_speed": "180", "layer_height": "0.16", + "name": "0.16mm Optimal @Artillery X4Plus 0.4 nozzle", "outer_wall_line_width": "0.42", "outer_wall_speed": "60", "print_settings_id": "0.16mm Optimal @Artillery X4Plus 0.4 nozzle", "sparse_infill_speed": "180", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X4Pro 0.4 nozzle.json index fa9bc49dc8..0268b2b3d9 100644 --- a/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.16mm Optimal @Artillery X4Pro 0.4 nozzle.json @@ -1,16 +1,16 @@ { - "type": "process", - "name": "0.16mm Optimal @Artillery X4Pro 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "internal_solid_infill_line_width": "0.42", "internal_solid_infill_speed": "180", "layer_height": "0.16", + "name": "0.16mm Optimal @Artillery X4Pro 0.4 nozzle", "outer_wall_line_width": "0.42", "print_settings_id": "0.16mm Optimal @Artillery X4Pro 0.4 nozzle", "sparse_infill_speed": "180", "support_line_width": "0.42", - "top_surface_line_width": "0.42" -} \ No newline at end of file + "top_surface_line_width": "0.42", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.18mm Standard @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/process/0.18mm Standard @Artillery M1 Pro 0.6 nozzle.json index 77f75b6395..fa4f82f176 100644 --- a/resources/profiles/Artillery/process/0.18mm Standard @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/process/0.18mm Standard @Artillery M1 Pro 0.6 nozzle.json @@ -1,10 +1,11 @@ { - "type": "process", - "name": "0.18mm Standard @Artillery M1 Pro 0.6 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "instantiation": "true", "from": "system", - "instantiation": "true", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "is_custom_defined": "0", "layer_height": "0.18", + "name": "0.18mm Standard @Artillery M1 Pro 0.6 nozzle", "print_settings_id": "0.18mm Standard @Artillery M1 Pro 0.6 nozzle", - "slow_down_layers": "3" -} \ No newline at end of file + "slow_down_layers": "3", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius Pro.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius Pro.json index d1c80ad469..3308221025 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius Pro.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius Pro.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery Genius Pro", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.2", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "3", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "0", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0.15", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "2", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "2", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "60", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "3", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "110", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Genius Pro 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Artillery Genius Pro", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.2", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "2", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "3", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius Pro 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius.json index c5acc30dfc..0c46ef2f30 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Genius.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery Genius", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.2", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "7", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "0", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "60", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "110", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Genius 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Artillery Genius", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.2", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery Hornet.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Hornet.json index fa93ff6baf..6fe69f9ca0 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery Hornet.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery Hornet.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery Hornet", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.2", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "7", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "500", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "40", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Hornet 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Artillery Hornet", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.2", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Hornet 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery M1 Pro 0.4 nozzle.json index e7464ceaac..178035db06 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery M1 Pro 0.4 nozzle.json @@ -1,16 +1,14 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", "bottom_shell_layers": "3", "brim_type": "no_brim", "default_acceleration": "10000", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", + "from": "system", "gap_infill_speed": "250", "initial_layer_infill_speed": "80", "inner_wall_speed": "300", + "is_custom_defined": "0", + "name": "0.20mm Standard @Artillery M1 Pro 0.4 nozzle", "outer_wall_speed": "200", "print_settings_id": "0.20mm Standard @Artillery M1 Pro 0.4 nozzle", "reduce_crossing_wall": "0", @@ -26,7 +24,10 @@ "travel_speed": "700", "tree_support_branch_diameter_angle": "5", "tree_support_branch_diameter_double_wall": "0", + "version": "2.1.2.2", "wall_generator": "arachne", + "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -56,7 +57,7 @@ "draft_shield": "disabled", "elefant_foot_compensation": "0.15", "elefant_foot_compensation_layers": "1", - "enable_arc_fitting": "1", + "enable_arc_fitting": "0", "enable_overhang_speed": "1", "enable_prime_tower": "1", "enable_support": "0", @@ -103,7 +104,7 @@ "internal_solid_infill_line_width": "0.42", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "250", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -197,7 +198,7 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.45", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "grid", "sparse_infill_speed": "270", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", @@ -205,7 +206,7 @@ "staggered_inner_seams": "1", "standby_temperature_delta": "-5", "support_angle": "0", - "support_base_pattern": "rectilinear", + "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", "support_bottom_interface_spacing": "0.5", "support_bottom_z_distance": "0.2", @@ -221,11 +222,11 @@ "support_interface_speed": "80", "support_interface_top_layers": "2", "support_line_width": "0.42", - "support_object_xy_distance": "0.35", + "support_object_xy_distance": "0.5", "support_on_build_plate_only": "0", "support_remove_small_overhang": "1", "support_threshold_angle": "30", - "support_top_z_distance": "0.2", + "support_top_z_distance": "0.16", "thick_bridges": "0", "thick_internal_bridges": "1", "timelapse_type": "0", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "25%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"25%" +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X1.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X1.json index b4d0c14121..8089fc885a 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X1.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X1.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery X1", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.2", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "4", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "500", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "40", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Artillery X1", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.2", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Sidewinder X1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X2.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X2.json index f0299548ba..6d8f5f6706 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X2.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X2.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery X2", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.2", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "4", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "500", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "40", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Sidewinder X2 0.4 nozzle" - ] + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Artillery X2", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.2", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Sidewinder X2 0.4 nozzle" + ] } \ No newline at end of file diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json index 095eca39f6..49365c0134 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Plus 0.4 nozzle.json @@ -1,9 +1,7 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery X3Plus 0.4 nozzle", - "inherits": "fdm_process_common", "from": "system", - "instantiation": "true", + "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -87,12 +85,13 @@ "internal_solid_infill_line_width": "0.42", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "150", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", "ironing_speed": "15", "ironing_type": "no ironing", + "is_custom_defined": "0", "is_infill_first": "0", "layer_height": "0.2", "line_width": "0.42", @@ -110,6 +109,7 @@ "minimum_sparse_infill_area": "10", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", + "name": "0.20mm Standard @Artillery X3Plus 0.4 nozzle", "notes": "", "only_one_wall_first_layer": "0", "only_one_wall_top": "0", @@ -248,6 +248,7 @@ "tree_support_tip_diameter": "0.8", "tree_support_top_rate": "30%", "tree_support_wall_count": "0", + "version": "2.0.2.0", "wall_direction": "auto", "wall_distribution_count": "1", "wall_filament": "1", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json index 4f2ba17308..c31434033a 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X3Pro 0.4 nozzle.json @@ -1,9 +1,7 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery X3Pro 0.4 nozzle", - "inherits": "fdm_process_common", "from": "system", - "instantiation": "true", + "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -87,12 +85,13 @@ "internal_solid_infill_line_width": "0.42", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "150", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", "ironing_speed": "15", "ironing_type": "no ironing", + "is_custom_defined": "0", "is_infill_first": "0", "layer_height": "0.2", "line_width": "0.42", @@ -110,6 +109,7 @@ "minimum_sparse_infill_area": "10", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", + "name": "0.20mm Standard @Artillery X3Pro 0.4 nozzle", "notes": "", "only_one_wall_first_layer": "0", "only_one_wall_top": "0", @@ -248,6 +248,7 @@ "tree_support_tip_diameter": "0.8", "tree_support_top_rate": "30%", "tree_support_wall_count": "0", + "version": "2.0.2.0", "wall_direction": "auto", "wall_distribution_count": "1", "wall_filament": "1", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json index 6cd017a2a2..57ff0fae5f 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Plus 0.4 nozzle.json @@ -1,9 +1,7 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "inherits": "fdm_process_common", "from": "system", - "instantiation": "true", + "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -87,12 +85,13 @@ "internal_solid_infill_line_width": "0.42", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "300", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", "ironing_speed": "15", "ironing_type": "no ironing", + "is_custom_defined": "0", "is_infill_first": "0", "layer_height": "0.2", "line_width": "0.42", @@ -110,6 +109,7 @@ "minimum_sparse_infill_area": "10", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", + "name": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", "notes": "", "only_one_wall_first_layer": "0", "only_one_wall_top": "0", @@ -248,6 +248,7 @@ "tree_support_tip_diameter": "0.8", "tree_support_top_rate": "30%", "tree_support_wall_count": "0", + "version": "2.0.2.0", "wall_direction": "auto", "wall_distribution_count": "1", "wall_filament": "1", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" + "top_bottom_infill_wall_overlap":"15%" } \ No newline at end of file diff --git a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json index 205850caa9..0566900fff 100644 --- a/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Standard @Artillery X4Pro 0.4 nozzle.json @@ -1,9 +1,7 @@ { - "type": "process", - "name": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "inherits": "fdm_process_common", "from": "system", - "instantiation": "true", + "instantiation": "true", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -87,12 +85,13 @@ "internal_solid_infill_line_width": "0.42", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "300", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", "ironing_speed": "15", "ironing_type": "no ironing", + "is_custom_defined": "0", "is_infill_first": "0", "layer_height": "0.2", "line_width": "0.42", @@ -110,6 +109,7 @@ "minimum_sparse_infill_area": "10", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", + "name": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", "notes": "", "only_one_wall_first_layer": "0", "only_one_wall_top": "0", @@ -248,6 +248,7 @@ "tree_support_tip_diameter": "0.8", "tree_support_top_rate": "30%", "tree_support_wall_count": "0", + "version": "2.0.2.0", "wall_direction": "auto", "wall_distribution_count": "1", "wall_filament": "1", @@ -280,5 +281,6 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} + diff --git a/resources/profiles/Artillery/process/0.20mm Strength @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Strength @Artillery M1 Pro 0.4 nozzle.json index 3c82b8e353..c9445dde03 100644 --- a/resources/profiles/Artillery/process/0.20mm Strength @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Strength @Artillery M1 Pro 0.4 nozzle.json @@ -1,13 +1,11 @@ { - "type": "process", - "name": "0.20mm Strength @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", "bottom_shell_layers": "3", "default_acceleration": "10000", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", - "gap_infill_speed": "200", + "from": "system", + "gap_infill_speed": "250", + "is_custom_defined": "0", + "name": "0.20mm Strength @Artillery M1 Pro 0.4 nozzle", "print_settings_id": "0.20mm Strength @Artillery M1 Pro 0.4 nozzle", "slow_down_layers": "3", "support_style": "default", @@ -17,8 +15,11 @@ "travel_speed": "500", "tree_support_branch_diameter_angle": "15", "tree_support_branch_diameter_double_wall": "1", + "version": "2.1.2.2", + "instantiation": "true", "outer_wall_speed": "60", "wall_loops": "6", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -30,7 +31,7 @@ "bridge_density": "100%", "bridge_flow": "1", "bridge_no_support": "0", - "bridge_speed": "70", + "bridge_speed": "50", "brim_ears_detection_length": "1", "brim_ears_max_angle": "125", "brim_object_gap": "0", @@ -47,7 +48,7 @@ "detect_thin_wall": "1", "dont_filter_internal_bridges": "disabled", "draft_shield": "disabled", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.15", "elefant_foot_compensation_layers": "1", "enable_arc_fitting": "0", "enable_overhang_speed": "1", @@ -79,7 +80,7 @@ "infill_direction": "45", "infill_jerk": "9", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "0", + "initial_layer_acceleration": "500", "initial_layer_infill_speed": "30", "initial_layer_jerk": "9", "initial_layer_line_width": "0.5", @@ -90,15 +91,15 @@ "inner_wall_acceleration": "0", "inner_wall_jerk": "9", "inner_wall_line_width": "0.45", - "inner_wall_speed": "200", + "inner_wall_speed": "300", "interface_shells": "0", "internal_bridge_flow": "1", "internal_bridge_speed": "150%", "internal_solid_infill_acceleration": "100%", "internal_solid_infill_line_width": "0.42", - "internal_solid_infill_pattern": "monotonic", - "internal_solid_infill_speed": "300", - "ironing_angle": "0", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "250", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -118,7 +119,7 @@ "min_feature_size": "25%", "min_length_factor": "0.5", "min_width_top_surface": "300%", - "minimum_sparse_infill_area": "10", + "minimum_sparse_infill_area": "15", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", "notes": "", @@ -129,8 +130,8 @@ "outer_wall_jerk": "9", "outer_wall_line_width": "0.42", "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", "overhang_4_4_speed": "10", "overhang_reverse": "0", "overhang_reverse_internal_only": "0", @@ -191,11 +192,11 @@ "small_perimeter_threshold": "0", "solid_infill_filament": "1", "sparse_infill_acceleration": "100%", - "sparse_infill_density": "15%", + "sparse_infill_density": "25%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.45", - "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", + "sparse_infill_pattern": "grid", + "sparse_infill_speed": "270", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", "spiral_mode_smooth": "0", @@ -228,12 +229,12 @@ "thick_internal_bridges": "1", "timelapse_type": "0", "top_solid_infill_flow_ratio": "1", - "top_surface_acceleration": "0", + "top_surface_acceleration": "2000", "top_surface_jerk": "9", "top_surface_line_width": "0.42", "top_surface_pattern": "monotonic", - "top_surface_speed": "100", - "travel_acceleration": "0", + "top_surface_speed": "200", + "travel_acceleration": "10000", "travel_jerk": "12", "travel_speed_z": "0", "tree_support_adaptive_layer_height": "1", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"25%" +} diff --git a/resources/profiles/Artillery/process/0.20mm Strength @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Strength @Artillery X4Plus 0.4 nozzle.json index e11485212b..0d5a5dd78e 100644 --- a/resources/profiles/Artillery/process/0.20mm Strength @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Strength @Artillery X4Plus 0.4 nozzle.json @@ -1,10 +1,10 @@ { - "type": "process", - "name": "0.20mm Strength @Artillery X4Plus 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", + "name": "0.20mm Strength @Artillery X4Plus 0.4 nozzle", "outer_wall_speed": "60", "print_settings_id": "0.20mm Strength @Artillery X4Plus 0.4 nozzle", + "version": "2.0.2.0", "wall_loops": "6" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/process/0.20mm Strength @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.20mm Strength @Artillery X4Pro 0.4 nozzle.json index 9bc49fa84d..e5d9596964 100644 --- a/resources/profiles/Artillery/process/0.20mm Strength @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.20mm Strength @Artillery X4Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { - "type": "process", - "name": "0.20mm Strength @Artillery X4Pro 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", + "name": "0.20mm Strength @Artillery X4Pro 0.4 nozzle", "outer_wall_speed": "60", "print_settings_id": "0.20mm Strength @Artillery X4Pro 0.4 nozzle", + "version": "2.0.2.0", "wall_loops": "6" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/process/0.24mm Draft @Artillery Hornet.json b/resources/profiles/Artillery/process/0.24mm Draft @Artillery Hornet.json index 0d20a1c6c9..cf7f73c2b6 100644 --- a/resources/profiles/Artillery/process/0.24mm Draft @Artillery Hornet.json +++ b/resources/profiles/Artillery/process/0.24mm Draft @Artillery Hornet.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.24mm Draft @Artillery Hornet", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.24", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "7", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "500", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.24", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "40", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Hornet 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Artillery Hornet", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.24", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.24", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Hornet 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.4 nozzle.json index b0bbf7da19..53b758d9d7 100644 --- a/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.4 nozzle.json @@ -1,13 +1,11 @@ { - "type": "process", - "name": "0.24mm Draft @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", "bottom_shell_layers": "3", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", + "from": "system", "gap_infill_speed": "200", "inner_wall_speed": "300", + "is_custom_defined": "0", + "name": "0.24mm Draft @Artillery M1 Pro 0.4 nozzle", "outer_wall_speed": "200", "print_settings_id": "0.24mm Draft @Artillery M1 Pro 0.4 nozzle", "slow_down_layers": "3", @@ -16,8 +14,11 @@ "top_shell_thickness": "1", "tree_support_branch_diameter_angle": "15", "tree_support_branch_diameter_double_wall": "1", + "version": "2.1.1.0", + "instantiation": "true", "initial_layer_print_height": "0.2", "layer_height": "0.24", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -96,7 +97,7 @@ "internal_solid_infill_line_width": "0.42", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "300", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -191,7 +192,7 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.45", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "grid", "sparse_infill_speed": "200", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} diff --git a/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.6 nozzle.json index e2e13de246..6fa8741c2d 100644 --- a/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.6 nozzle.json @@ -1,8 +1,5 @@ { - "type": "process", - "name": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -48,6 +45,7 @@ "flush_into_infill": "0", "flush_into_objects": "0", "flush_into_support": "1", + "from": "system", "fuzzy_skin": "none", "fuzzy_skin_first_layer": "0", "fuzzy_skin_point_distance": "0.8", @@ -93,12 +91,13 @@ "internal_solid_infill_line_width": "0.62", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "150", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", "ironing_speed": "15", "ironing_type": "no ironing", + "is_custom_defined": "0", "is_infill_first": "0", "layer_height": "0.24", "line_width": "0.62", @@ -117,6 +116,7 @@ "minimum_sparse_infill_area": "15", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", + "name": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", "notes": "", "only_one_wall_first_layer": "0", "only_one_wall_top": "0", @@ -200,7 +200,7 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.62", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "grid", "sparse_infill_speed": "100", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", @@ -263,6 +263,7 @@ "tree_support_tip_diameter": "0.8", "tree_support_top_rate": "30%", "tree_support_wall_count": "0", + "version": "2.1.1.0", "wall_direction": "auto", "wall_distribution_count": "1", "wall_filament": "1", @@ -297,4 +298,4 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.8 nozzle.json index 73faaa0416..cc51cd88f1 100644 --- a/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/process/0.24mm Draft @Artillery M1 Pro 0.8 nozzle.json @@ -1,8 +1,5 @@ { - "type": "process", - "name": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -48,6 +45,7 @@ "flush_into_infill": "0", "flush_into_objects": "0", "flush_into_support": "1", + "from": "system", "fuzzy_skin": "none", "fuzzy_skin_first_layer": "0", "fuzzy_skin_point_distance": "0.8", @@ -93,12 +91,13 @@ "internal_solid_infill_line_width": "0.82", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "150", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", "ironing_speed": "15", "ironing_type": "no ironing", + "is_custom_defined": "0", "is_infill_first": "0", "layer_height": "0.24", "line_width": "0.82", @@ -117,6 +116,7 @@ "minimum_sparse_infill_area": "10", "mmu_segmented_region_interlocking_depth": "0", "mmu_segmented_region_max_width": "0", + "name": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", "notes": "", "only_one_wall_first_layer": "0", "only_one_wall_top": "0", @@ -200,7 +200,7 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.82", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "grid", "sparse_infill_speed": "100", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", @@ -263,6 +263,7 @@ "tree_support_tip_diameter": "0.8", "tree_support_top_rate": "30%", "tree_support_wall_count": "0", + "version": "2.1.1.0", "wall_direction": "auto", "wall_distribution_count": "1", "wall_filament": "1", @@ -297,4 +298,4 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/process/0.24mm Draft @Artillery X1.json b/resources/profiles/Artillery/process/0.24mm Draft @Artillery X1.json index 786b8fbd7a..95d1bc0e70 100644 --- a/resources/profiles/Artillery/process/0.24mm Draft @Artillery X1.json +++ b/resources/profiles/Artillery/process/0.24mm Draft @Artillery X1.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.24mm Draft @Artillery X1", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.24", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "3", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "500", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.24", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "40", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Sidewinder X1 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Artillery X1", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.24", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.24", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "40", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Sidewinder X1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.24mm Draft @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.24mm Draft @Artillery X4Plus 0.4 nozzle.json index b67dedd7cf..1b579d27e6 100644 --- a/resources/profiles/Artillery/process/0.24mm Draft @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.24mm Draft @Artillery X4Plus 0.4 nozzle.json @@ -1,11 +1,11 @@ { - "type": "process", - "name": "0.24mm Draft @Artillery X4Plus 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "layer_height": "0.24", + "name": "0.24mm Draft @Artillery X4Plus 0.4 nozzle", "outer_wall_speed": "120", - "print_settings_id": "0.24mm Draft @Artillery X4Plus 0.4 nozzle" -} \ No newline at end of file + "print_settings_id": "0.24mm Draft @Artillery X4Plus 0.4 nozzle", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.24mm Draft @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.24mm Draft @Artillery X4Pro 0.4 nozzle.json index ea118fc33d..1413321fa0 100644 --- a/resources/profiles/Artillery/process/0.24mm Draft @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.24mm Draft @Artillery X4Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { - "type": "process", - "name": "0.24mm Draft @Artillery X4Pro 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "layer_height": "0.24", - "print_settings_id": "0.24mm Draft @Artillery X4Pro 0.4 nozzle" -} \ No newline at end of file + "name": "0.24mm Draft @Artillery X4Pro 0.4 nozzle", + "print_settings_id": "0.24mm Draft @Artillery X4Pro 0.4 nozzle", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.24mm Standard @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/process/0.24mm Standard @Artillery M1 Pro 0.6 nozzle.json index dee34543bf..48a37fb9f1 100644 --- a/resources/profiles/Artillery/process/0.24mm Standard @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/process/0.24mm Standard @Artillery M1 Pro 0.6 nozzle.json @@ -1,9 +1,10 @@ { - "type": "process", - "name": "0.24mm Standard @Artillery M1 Pro 0.6 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "detect_thin_wall": "0", - "print_settings_id": "0.24mm Standard @Artillery M1 Pro 0.6 nozzle" -} \ No newline at end of file + "from": "system", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "is_custom_defined": "0", + "name": "0.24mm Standard @Artillery M1 Pro 0.6 nozzle", + "print_settings_id": "0.24mm Standard @Artillery M1 Pro 0.6 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.24mm Standard @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/process/0.24mm Standard @Artillery M1 Pro 0.8 nozzle.json index cdddaac679..c0411156e7 100644 --- a/resources/profiles/Artillery/process/0.24mm Standard @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/process/0.24mm Standard @Artillery M1 Pro 0.8 nozzle.json @@ -1,9 +1,10 @@ { - "type": "process", - "name": "0.24mm Standard @Artillery M1 Pro 0.8 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "bottom_shell_layers": "3", - "print_settings_id": "0.24mm Standard @Artillery M1 Pro 0.8 nozzle" -} \ No newline at end of file + "from": "system", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", + "is_custom_defined": "0", + "name": "0.24mm Standard @Artillery M1 Pro 0.8 nozzle", + "print_settings_id": "0.24mm Standard @Artillery M1 Pro 0.8 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius Pro.json b/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius Pro.json index bad1ddf499..dbab72ebe4 100644 --- a/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius Pro.json +++ b/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius Pro.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.25mm Draft @Artillery Genius Pro", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.25", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "2", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "0", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0.15", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "2", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.25", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "60", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "2", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "110", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Genius Pro 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Draft @Artillery Genius Pro", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.25", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "2", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.25", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "2", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius Pro 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius.json b/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius.json index 1556d4a0e5..77b9468bd7 100644 --- a/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius.json +++ b/resources/profiles/Artillery/process/0.25mm Draft @Artillery Genius.json @@ -1,108 +1,108 @@ { - "type": "process", - "name": "0.25mm Draft @Artillery Genius", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "GP004", - "instantiation": "true", - "adaptive_layer_height": "1", - "reduce_crossing_wall": "0", - "layer_height": "0.25", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "7", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "70", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "0", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.5", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "4", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "3", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.25", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "1", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "1", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "60", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "60", - "inner_wall_speed": "60", - "internal_solid_infill_speed": "30", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "60", - "travel_speed": "110", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "Artillery Genius 0.4 nozzle" - ] -} \ No newline at end of file + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Draft @Artillery Genius", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "adaptive_layer_height": "1", + "reduce_crossing_wall": "0", + "layer_height": "0.25", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "70", + "brim_width": "0", + "brim_object_gap": "0", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "0", + "top_surface_acceleration": "0", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "outer_wall_line_width": "0.4", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.5", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_acceleration": "0", + "travel_acceleration": "0", + "inner_wall_acceleration": "0", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.25", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "inner_wall_line_width": "0.45", + "wall_loops": "4", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "3", + "minimum_sparse_infill_area": "10", + "internal_solid_infill_line_width": "0", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "grid", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.25", + "support_filament": "0", + "support_line_width": "0.4", + "support_interface_loop_pattern": "1", + "support_interface_filament": "0", + "support_interface_top_layers": "3", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "1", + "support_interface_speed": "100%", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "2.5", + "support_speed": "60", + "support_threshold_angle": "30", + "support_object_xy_distance": "50%", + "tree_support_branch_angle": "40", + "tree_support_wall_count": "0", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.4", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "35%", + "initial_layer_infill_speed": "35%", + "outer_wall_speed": "60", + "inner_wall_speed": "60", + "internal_solid_infill_speed": "30", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "110", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Artillery Genius 0.4 nozzle" + ] +} diff --git a/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle.json index 82d05cd7f9..5cacad9760 100644 --- a/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle.json @@ -1,14 +1,12 @@ { - "type": "process", - "name": "0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "true", "bottom_shell_layers": "3", "default_acceleration": "10000", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_M1Pro.gcode", + "from": "system", "gap_infill_speed": "200", "initial_layer_infill_speed": "80", + "is_custom_defined": "0", + "name": "0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle", "outer_wall_speed": "200", "print_settings_id": "0.28mm Extra Draft @Artillery M1 Pro 0.4 nozzle", "reduce_crossing_wall": "1", @@ -20,8 +18,11 @@ "travel_speed": "500", "tree_support_branch_diameter_angle": "15", "tree_support_branch_diameter_double_wall": "1", + "version": "2.1.1.0", + "instantiation": "true", "initial_layer_print_height": "0.2", "layer_height": "0.28", + "inherits": "fdm_process_common", "accel_to_decel_enable": "1", "accel_to_decel_factor": "50%", "alternate_extra_wall": "0", @@ -99,7 +100,7 @@ "internal_solid_infill_line_width": "0.42", "internal_solid_infill_pattern": "monotonic", "internal_solid_infill_speed": "300", - "ironing_angle": "0", + "ironing_angle": "-1", "ironing_flow": "15%", "ironing_pattern": "zig-zag", "ironing_spacing": "0.1", @@ -193,7 +194,7 @@ "sparse_infill_density": "15%", "sparse_infill_filament": "1", "sparse_infill_line_width": "0.45", - "sparse_infill_pattern": "gyroid", + "sparse_infill_pattern": "grid", "sparse_infill_speed": "200", "spiral_mode": "0", "spiral_mode_max_xy_smoothing": "200%", @@ -280,5 +281,5 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0", - "top_bottom_infill_wall_overlap": "15%" -} \ No newline at end of file + "top_bottom_infill_wall_overlap":"15%" +} diff --git a/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle.json b/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle.json index 27c259d105..d9fc1e5200 100644 --- a/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle.json @@ -1,11 +1,11 @@ { - "type": "process", - "name": "0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Plus 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "layer_height": "0.28", + "name": "0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle", "outer_wall_speed": "120", - "print_settings_id": "0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle" -} \ No newline at end of file + "print_settings_id": "0.28mm Extra Draft @Artillery X4Plus 0.4 nozzle", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle.json b/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle.json index 8fa494c6bb..96132a726b 100644 --- a/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/process/0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { - "type": "process", - "name": "0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle", + "from": "system", + "instantiation": "true", "inherits": "0.20mm Standard @Artillery X4Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", "initial_layer_print_height": "0.2", "layer_height": "0.28", - "print_settings_id": "0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle" -} \ No newline at end of file + "name": "0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle", + "print_settings_id": "0.28mm Extra Draft @Artillery X4Pro 0.4 nozzle", + "version": "2.0.2.0" +} diff --git a/resources/profiles/Artillery/process/0.30mm Standard @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/process/0.30mm Standard @Artillery M1 Pro 0.6 nozzle.json index 5ef572b610..2bb7e23560 100644 --- a/resources/profiles/Artillery/process/0.30mm Standard @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/process/0.30mm Standard @Artillery M1 Pro 0.6 nozzle.json @@ -1,10 +1,11 @@ { - "type": "process", - "name": "0.30mm Standard @Artillery M1 Pro 0.6 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "detect_thin_wall": "0", + "from": "system", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "is_custom_defined": "0", "layer_height": "0.3", - "print_settings_id": "0.30mm Standard @Artillery M1 Pro 0.6 nozzle" -} \ No newline at end of file + "name": "0.30mm Standard @Artillery M1 Pro 0.6 nozzle", + "print_settings_id": "0.30mm Standard @Artillery M1 Pro 0.6 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.30mm Strength @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/process/0.30mm Strength @Artillery M1 Pro 0.6 nozzle.json index 0f0a856f9b..db0babc433 100644 --- a/resources/profiles/Artillery/process/0.30mm Strength @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/process/0.30mm Strength @Artillery M1 Pro 0.6 nozzle.json @@ -1,13 +1,14 @@ { - "type": "process", - "name": "0.30mm Strength @Artillery M1 Pro 0.6 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "instantiation": "true", "from": "system", - "instantiation": "true", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", "initial_layer_infill_speed": "55", "initial_layer_speed": "35", + "is_custom_defined": "0", "layer_height": "0.3", + "name": "0.30mm Strength @Artillery M1 Pro 0.6 nozzle", "print_settings_id": "0.30mm Strength @Artillery M1 Pro 0.6 nozzle", "sparse_infill_density": "25%", + "version": "2.1.1.0", "wall_loops": "4" -} \ No newline at end of file +} diff --git a/resources/profiles/Artillery/process/0.32mm Standard @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/process/0.32mm Standard @Artillery M1 Pro 0.8 nozzle.json index 2ab29f261f..699938afcb 100644 --- a/resources/profiles/Artillery/process/0.32mm Standard @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/process/0.32mm Standard @Artillery M1 Pro 0.8 nozzle.json @@ -1,10 +1,11 @@ { - "type": "process", - "name": "0.32mm Standard @Artillery M1 Pro 0.8 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "bottom_shell_layers": "3", + "from": "system", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", + "is_custom_defined": "0", "layer_height": "0.32", - "print_settings_id": "0.32mm Standard @Artillery M1 Pro 0.8 nozzle" -} \ No newline at end of file + "name": "0.32mm Standard @Artillery M1 Pro 0.8 nozzle", + "print_settings_id": "0.32mm Standard @Artillery M1 Pro 0.8 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.36mm Standard @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/process/0.36mm Standard @Artillery M1 Pro 0.6 nozzle.json index c946d0eb70..c13383cf1d 100644 --- a/resources/profiles/Artillery/process/0.36mm Standard @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/process/0.36mm Standard @Artillery M1 Pro 0.6 nozzle.json @@ -1,9 +1,10 @@ { - "type": "process", - "name": "0.36mm Standard @Artillery M1 Pro 0.6 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "instantiation": "true", "from": "system", - "instantiation": "true", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "is_custom_defined": "0", "layer_height": "0.36", - "print_settings_id": "0.36mm Standard @Artillery M1 Pro 0.6 nozzle" -} \ No newline at end of file + "name": "0.36mm Standard @Artillery M1 Pro 0.6 nozzle", + "print_settings_id": "0.36mm Standard @Artillery M1 Pro 0.6 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.40mm Standard @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/process/0.40mm Standard @Artillery M1 Pro 0.8 nozzle.json index fde7dcc99a..8912d49e23 100644 --- a/resources/profiles/Artillery/process/0.40mm Standard @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/process/0.40mm Standard @Artillery M1 Pro 0.8 nozzle.json @@ -1,10 +1,11 @@ { - "type": "process", - "name": "0.40mm Standard @Artillery M1 Pro 0.8 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "bottom_shell_layers": "3", + "from": "system", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", + "is_custom_defined": "0", "layer_height": "0.4", - "print_settings_id": "0.40mm Standard @Artillery M1 Pro 0.8 nozzle" -} \ No newline at end of file + "name": "0.40mm Standard @Artillery M1 Pro 0.8 nozzle", + "print_settings_id": "0.40mm Standard @Artillery M1 Pro 0.8 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.42mm Standard @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/process/0.42mm Standard @Artillery M1 Pro 0.6 nozzle.json index 5b67eca303..74772b84b1 100644 --- a/resources/profiles/Artillery/process/0.42mm Standard @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/process/0.42mm Standard @Artillery M1 Pro 0.6 nozzle.json @@ -1,9 +1,10 @@ { - "type": "process", - "name": "0.42mm Standard @Artillery M1 Pro 0.6 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "instantiation": "true", "from": "system", - "instantiation": "true", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.6 nozzle", + "is_custom_defined": "0", "layer_height": "0.42", - "print_settings_id": "0.42mm Standard @Artillery M1 Pro 0.6 nozzle" -} \ No newline at end of file + "name": "0.42mm Standard @Artillery M1 Pro 0.6 nozzle", + "print_settings_id": "0.42mm Standard @Artillery M1 Pro 0.6 nozzle", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.48mm Standard @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/process/0.48mm Standard @Artillery M1 Pro 0.8 nozzle.json index adff882f6d..6645fbb8e0 100644 --- a/resources/profiles/Artillery/process/0.48mm Standard @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/process/0.48mm Standard @Artillery M1 Pro 0.8 nozzle.json @@ -1,11 +1,12 @@ { - "type": "process", - "name": "0.48mm Standard @Artillery M1 Pro 0.8 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "bottom_shell_layers": "3", + "from": "system", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", + "is_custom_defined": "0", "layer_height": "0.48", + "name": "0.48mm Standard @Artillery M1 Pro 0.8 nozzle", "print_settings_id": "0.48mm Standard @Artillery M1 Pro 0.8 nozzle", - "slow_down_layers": "3" -} \ No newline at end of file + "slow_down_layers": "3", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/0.56mm Standard @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/process/0.56mm Standard @Artillery M1 Pro 0.8 nozzle.json index 88523c512f..354b669cc0 100644 --- a/resources/profiles/Artillery/process/0.56mm Standard @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/process/0.56mm Standard @Artillery M1 Pro 0.8 nozzle.json @@ -1,14 +1,15 @@ { - "type": "process", - "name": "0.56mm Standard @Artillery M1 Pro 0.8 nozzle", - "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", + "instantiation": "true", "bottom_shell_layers": "3", + "from": "system", + "inherits": "0.24mm Draft @Artillery M1 Pro 0.8 nozzle", + "is_custom_defined": "0", "layer_height": "0.56", + "name": "0.56mm Standard @Artillery M1 Pro 0.8 nozzle", "print_settings_id": "0.56mm Standard @Artillery M1 Pro 0.8 nozzle", "support_style": "default", "support_type": "tree(auto)", "tree_support_branch_diameter_angle": "15", - "tree_support_branch_diameter_double_wall": "1" -} \ No newline at end of file + "tree_support_branch_diameter_double_wall": "1", + "version": "2.1.1.0" +} diff --git a/resources/profiles/Artillery/process/fdm_process_common.json b/resources/profiles/Artillery/process/fdm_process_common.json index aeea1e640e..7672f7a219 100644 --- a/resources/profiles/Artillery/process/fdm_process_common.json +++ b/resources/profiles/Artillery/process/fdm_process_common.json @@ -23,6 +23,7 @@ "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.15", + "outer_wall_line_width": "0.4", "wall_infill_order": "inner wall/outer wall/infill", "line_width": "0.4", @@ -102,4 +103,5 @@ "gap_infill_speed": "30", "travel_speed": "200", "enable_arc_fitting": "0" -} \ No newline at end of file + +}