From 8ae358e9bc465dba52845017c0bd56daae79a1e2 Mon Sep 17 00:00:00 2001 From: HYzd766 <108379794+HYzd766@users.noreply.github.com> Date: Mon, 15 Apr 2024 22:20:11 +0800 Subject: [PATCH] Update QIDI profiles (#5017) * Qidi.Json * Qidi.json * Qidi.json --- resources/profiles/Qidi.json | 593 +++++++++++------- .../QIDI ABS Odorless @0.2 nozzle.json | 35 ++ .../QIDI ABS Odorless @0.8 nozzle.json | 41 ++ ... ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json | 46 ++ ... ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json | 46 ++ ... ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json | 46 ++ ... ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json | 46 ++ .../Qidi/filament/QIDI ABS Odorless.json | 50 ++ .../filament/QIDI ABS Rapido 0.2 nozzle.json | 7 +- .../filament/QIDI ABS Rapido 0.8 nozzle.json | 9 +- ...DI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json | 6 +- ...DI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json | 4 +- ...DI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json | 4 +- ...DI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json | 6 +- .../Qidi/filament/QIDI ABS Rapido.json | 21 +- .../QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json | 51 ++ .../QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json | 51 ++ .../QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json | 51 ++ .../profiles/Qidi/filament/QIDI ABS-GF.json | 68 ++ ...QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ABS-GF10.json | 39 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json | 6 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json | 6 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json | 6 +- .../profiles/Qidi/filament/QIDI ABS-GF25.json | 23 +- .../QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json | 24 + .../QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json | 42 ++ .../QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json | 42 ++ .../QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json | 42 ++ .../QIDI ASA @Qidi X-Max 3 0.2 nozzle.json | 27 + .../QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json | 27 + .../QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json | 27 + .../profiles/Qidi/filament/QIDI ASA.json | 93 +++ ...QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json | 6 +- ...QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json | 36 ++ ...QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json | 6 +- .../profiles/Qidi/filament/QIDI PA-Ultra.json | 24 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json | 4 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json | 4 +- .../profiles/Qidi/filament/QIDI PA12-CF.json | 26 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json | 4 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PAHT-CF.json | 23 +- .../QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json | 6 +- .../QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json | 4 +- .../profiles/Qidi/filament/QIDI PET-CF.json | 25 +- .../filament/QIDI PETG Tough 0.2 nozzle.json | 13 +- .../filament/QIDI PETG Tough 0.6 nozzle.json | 8 +- .../filament/QIDI PETG Tough 0.8 nozzle.json | 6 +- ...DI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json | 30 + ...DI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Tough.json | 22 +- .../filament/QIDI PLA Rapido 0.2 nozzle.json | 7 +- .../filament/QIDI PLA Rapido 0.8 nozzle.json | 8 +- .../filament/QIDI PLA Rapido @0.6 nozzle.json | 32 + ...DI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json | 4 +- ...DI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json | 4 +- ...DI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../QIDI PLA Rapido Matte @0.2 nozzle.json | 32 + .../QIDI PLA Rapido Matte @0.6 nozzle.json | 32 + .../QIDI PLA Rapido Matte @0.8 nozzle.json | 32 + ... Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json | 51 ++ ... Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json | 51 ++ ... Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json | 51 ++ ... Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json | 51 ++ .../Qidi/filament/QIDI PLA Rapido Matte.json | 35 ++ .../Qidi/filament/QIDI PLA Rapido.json | 8 +- .../filament/QIDI PLA-CF @0.6 nozzle.json | 20 + .../filament/QIDI PLA-CF @0.8 nozzle.json | 23 + .../QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json | 30 + .../QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json | 30 + .../QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json | 30 + ...Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json | 4 +- .../profiles/Qidi/filament/Qidi ASA-Aero.json | 34 +- ...i Generic ABS @Qidi Q1 Pro 0.2 nozzle.json | 7 +- ...i Generic ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...i Generic ABS @Qidi Q1 Pro 0.6 nozzle.json | 7 +- ...i Generic ABS @Qidi Q1 Pro 0.8 nozzle.json | 7 +- ... Generic ABS @Qidi X-Max 3 0.2 nozzle.json | 7 +- ...Generic ABS @Qidi X-Plus 3 0.2 nozzle.json | 7 +- ...eneric ABS @Qidi X-Smart 3 0.2 nozzle.json | 7 +- .../Qidi/filament/Qidi Generic ABS.json | 32 +- ...i Generic ASA @Qidi Q1 Pro 0.2 nozzle.json | 50 +- ...i Generic ASA @Qidi Q1 Pro 0.4 nozzle.json | 4 +- ...i Generic ASA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... Generic ASA @Qidi X-Max 3 0.2 nozzle.json | 7 +- ...Generic ASA @Qidi X-Plus 3 0.2 nozzle.json | 7 +- ...eneric ASA @Qidi X-Smart 3 0.2 nozzle.json | 7 +- .../Qidi/filament/Qidi Generic ASA.json | 31 +- .../Qidi/filament/Qidi Generic PA-CF.json | 8 +- .../Qidi/filament/Qidi Generic PA.json | 11 +- .../Qidi/filament/Qidi Generic PC.json | 7 +- ... Generic PETG @Qidi Q1 Pro 0.2 nozzle.json | 8 +- ... Generic PETG @Qidi Q1 Pro 0.4 nozzle.json | 45 +- ... Generic PETG @Qidi Q1 Pro 0.6 nozzle.json | 10 +- ... Generic PETG @Qidi Q1 Pro 0.8 nozzle.json | 8 +- ...Generic PETG @Qidi X-Max 3 0.2 nozzle.json | 8 +- ...eneric PETG @Qidi X-Plus 3 0.2 nozzle.json | 8 +- ...neric PETG @Qidi X-Smart 3 0.2 nozzle.json | 8 +- .../Qidi/filament/Qidi Generic PETG-CF.json | 28 +- .../Qidi/filament/Qidi Generic PETG.json | 41 +- ...i Generic PLA @Qidi Q1 Pro 0.2 nozzle.json | 6 +- ...i Generic PLA @Qidi Q1 Pro 0.4 nozzle.json | 6 +- ...i Generic PLA @Qidi Q1 Pro 0.6 nozzle.json | 4 +- ...i Generic PLA @Qidi Q1 Pro 0.8 nozzle.json | 4 +- ... Generic PLA @Qidi X-Max 3 0.2 nozzle.json | 4 +- ...Generic PLA @Qidi X-Plus 3 0.2 nozzle.json | 4 +- ...eneric PLA @Qidi X-Smart 3 0.2 nozzle.json | 4 +- .../Qidi/filament/Qidi Generic PLA Silk.json | 52 +- .../Qidi/filament/Qidi Generic PLA-CF.json | 47 +- .../Qidi/filament/Qidi Generic PLA.json | 36 +- .../Qidi/filament/Qidi Generic PVA.json | 36 +- ...neric TPU 95A @Qidi Q1 Pro 0.8 nozzle.json | 39 ++ .../Qidi/filament/Qidi Generic TPU 95A.json | 51 ++ ...i Generic TPU @Qidi Q1 Pro 0.4 nozzle.json | 4 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json | 4 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json | 4 +- .../Qidi/filament/Qidi PC-ABS-FR.json | 22 +- .../profiles/Qidi/filament/Qidi PLA-CF.json | 42 ++ ...di TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json | 6 +- ...di TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json | 6 +- .../Qidi/filament/Qidi TPU 95A-HF.json | 2 +- .../Qidi/filament/fdm_filament_abs.json | 22 +- .../Qidi/filament/fdm_filament_common.json | 18 +- .../Qidi/filament/fdm_filament_pla.json | 22 +- .../Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json | 10 +- .../Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json | 4 +- .../machine/Qidi X-CF Pro 0.4 nozzle.json | 4 +- .../Qidi/machine/Qidi X-Max 0.4 nozzle.json | 2 +- .../Qidi/machine/Qidi X-Max 3 0.2 nozzle.json | 2 +- .../Qidi/machine/Qidi X-Max 3 0.4 nozzle.json | 10 +- .../Qidi/machine/Qidi X-Max 3 0.6 nozzle.json | 2 +- .../Qidi/machine/Qidi X-Max 3 0.8 nozzle.json | 4 +- .../Qidi/machine/Qidi X-Plus 0.4 nozzle.json | 2 +- .../machine/Qidi X-Plus 3 0.2 nozzle.json | 2 +- .../machine/Qidi X-Plus 3 0.4 nozzle.json | 10 +- .../machine/Qidi X-Plus 3 0.6 nozzle.json | 2 +- .../machine/Qidi X-Plus 3 0.8 nozzle.json | 4 +- .../machine/Qidi X-Smart 3 0.2 nozzle.json | 2 +- .../machine/Qidi X-Smart 3 0.4 nozzle.json | 4 +- .../machine/Qidi X-Smart 3 0.6 nozzle.json | 2 +- .../machine/Qidi X-Smart 3 0.8 nozzle.json | 2 +- .../Qidi/machine/fdm_machine_common.json | 16 +- .../Qidi/process/fdm_process_common.json | 2 +- .../process/fdm_process_qidi_x3_common.json | 12 +- .../Qidi/qidi_xmax3_buildplate_model.stl | Bin 18684 -> 28684 bytes .../Qidi/qidi_xplus3_buildplate_model.stl | Bin 18684 -> 27884 bytes .../Qidi/qidi_xsmart3_buildplate_model.stl | Bin 19484 -> 34884 bytes 160 files changed, 2607 insertions(+), 743 deletions(-) create mode 100644 resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS Odorless.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ABS-GF.json create mode 100644 resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI ASA.json create mode 100644 resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json create mode 100644 resources/profiles/Qidi/filament/Qidi PLA-CF.json diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index 0242cba66f..9a6e3fa2d1 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -549,184 +549,8 @@ "sub_path": "filament/Qidi Generic ABS.json" }, { - "name": "Qidi Generic ASA", - "sub_path": "filament/Qidi Generic ASA.json" - }, - { - "name": "Qidi Generic PA", - "sub_path": "filament/Qidi Generic PA.json" - }, - { - "name": "Qidi Generic PA-CF", - "sub_path": "filament/Qidi Generic PA-CF.json" - }, - { - "name": "Qidi Generic PC", - "sub_path": "filament/Qidi Generic PC.json" - }, - { - "name": "Qidi Generic PETG", - "sub_path": "filament/Qidi Generic PETG.json" - }, - { - "name": "Qidi Generic PETG-CF", - "sub_path": "filament/Qidi Generic PETG-CF.json" - }, - { - "name": "Qidi Generic PLA Silk", - "sub_path": "filament/Qidi Generic PLA Silk.json" - }, - { - "name": "Qidi Generic PLA", - "sub_path": "filament/Qidi Generic PLA.json" - }, - { - "name": "Qidi Generic PLA-CF", - "sub_path": "filament/Qidi Generic PLA-CF.json" - }, - { - "name": "Qidi Generic PVA", - "sub_path": "filament/Qidi Generic PVA.json" - }, - { - "name": "Qidi TPU 95A-HF", - "sub_path": "filament/Qidi TPU 95A-HF.json" - }, - { - "name": "QIDI ABS Rapido", - "sub_path": "filament/QIDI ABS Rapido.json" - }, - { - "name": "QIDI ABS Rapido 0.2 nozzle", - "sub_path": "filament/QIDI ABS Rapido 0.2 nozzle.json" - }, - { - "name": "QIDI ABS Rapido 0.8 nozzle", - "sub_path": "filament/QIDI ABS Rapido 0.8 nozzle.json" - }, - { - "name": "QIDI PLA Rapido", - "sub_path": "filament/QIDI PLA Rapido.json" - }, - { - "name": "QIDI PLA Rapido 0.2 nozzle", - "sub_path": "filament/QIDI PLA Rapido 0.2 nozzle.json" - }, - { - "name": "QIDI PLA Rapido 0.8 nozzle", - "sub_path": "filament/QIDI PLA Rapido 0.8 nozzle.json" - }, - { - "name": "QIDI PETG Tough", - "sub_path": "filament/QIDI PETG Tough.json" - }, - { - "name": "QIDI PETG Tough 0.2 nozzle", - "sub_path": "filament/QIDI PETG Tough 0.2 nozzle.json" - }, - { - "name": "QIDI PETG Tough 0.6 nozzle", - "sub_path": "filament/QIDI PETG Tough 0.6 nozzle.json" - }, - { - "name": "QIDI PETG Tough 0.8 nozzle", - "sub_path": "filament/QIDI PETG Tough 0.8 nozzle.json" - }, - { - "name": "QIDI PET-CF", - "sub_path": "filament/QIDI PET-CF.json" - }, - { - "name": "QIDI PA12-CF", - "sub_path": "filament/QIDI PA12-CF.json" - }, - { - "name": "QIDI PAHT-CF", - "sub_path": "filament/QIDI PAHT-CF.json" - }, - { - "name": "QIDI ABS-GF25", - "sub_path": "filament/QIDI ABS-GF25.json" - }, - { - "name": "QIDI PA-Ultra", - "sub_path": "filament/QIDI PA-Ultra.json" - }, - { - "name": "Tinmorry PETG-ECO", - "sub_path": "filament/Tinmorry PETG-ECO.json" - }, - { - "name": "Qidi Generic TPU", - "sub_path": "filament/Qidi Generic TPU.json" - }, - { - "name": "QIDI ABS-GF10", - "sub_path": "filament/QIDI ABS-GF10.json" - }, - { - "name": "Qidi PC-ABS-FR", - "sub_path": "filament/Qidi PC-ABS-FR.json" - }, - { - "name": "Qidi ASA-Aero", - "sub_path": "filament/Qidi ASA-Aero.json" - }, - { - "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json" - }, - { - "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json" - }, - { - "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json" - }, - { - "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json" - }, - { - "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json" - }, - { - "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json" - }, - { - "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json" - }, - { - "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json" - }, - { - "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json" - }, - { - "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json" - }, - { - "name": "Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json" - }, - { - "name": "Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json" - }, - { - "name": "Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json" - }, - { - "name": "Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json" + "name": "Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json" }, { "name": "Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle", @@ -741,36 +565,36 @@ "sub_path": "filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle", + "sub_path": "filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json" + "name": "Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle", + "sub_path": "filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json" + "name": "Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle", + "sub_path": "filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json" + "name": "Qidi Generic PETG", + "sub_path": "filament/Qidi Generic PETG.json" }, { - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json" + "name": "Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json" }, { "name": "Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle", @@ -785,20 +609,24 @@ "sub_path": "filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Qidi Generic PLA", + "sub_path": "filament/Qidi Generic PLA.json" }, { - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json" + "name": "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json" }, { "name": "Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle", @@ -813,32 +641,128 @@ "sub_path": "filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Qidi Generic TPU 95A", + "sub_path": "filament/Qidi Generic TPU 95A.json" }, { - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json" + "name": "QIDI ABS Odorless", + "sub_path": "filament/QIDI ABS Odorless.json" }, { - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json" + "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json" + "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json" + "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json" }, { - "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json" + "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "QIDI ABS Odorless @0.2 nozzle", + "sub_path": "filament/QIDI ABS Odorless @0.2 nozzle.json" + }, + { + "name": "QIDI ABS Odorless @0.8 nozzle", + "sub_path": "filament/QIDI ABS Odorless @0.8 nozzle.json" + }, + { + "name": "QIDI ABS Rapido", + "sub_path": "filament/QIDI ABS Rapido.json" + }, + { + "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json" + }, + { + "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "QIDI ABS Rapido 0.2 nozzle", + "sub_path": "filament/QIDI ABS Rapido 0.2 nozzle.json" + }, + { + "name": "QIDI ABS Rapido 0.8 nozzle", + "sub_path": "filament/QIDI ABS Rapido 0.8 nozzle.json" + }, + { + "name": "QIDI ABS-GF25", + "sub_path": "filament/QIDI ABS-GF25.json" + }, + { + "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "QIDI ASA", + "sub_path": "filament/QIDI ASA.json" + }, + { + "name": "QIDI ASA @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json" + }, + { + "name": "QIDI ASA @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI ASA @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "QIDI ASA @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "QIDI ASA @Qidi X-Max 3 0.2 nozzle", + "sub_path": "filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json" + }, + { + "name": "QIDI ASA @Qidi X-Plus 3 0.2 nozzle", + "sub_path": "filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json" + }, + { + "name": "QIDI ASA @Qidi X-Smart 3 0.2 nozzle", + "sub_path": "filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json" + }, + { + "name": "Qidi ASA-Aero", + "sub_path": "filament/Qidi ASA-Aero.json" + }, + { + "name": "Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI PA12-CF", + "sub_path": "filament/QIDI PA12-CF.json" }, { "name": "QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle", @@ -852,6 +776,10 @@ "name": "QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle", "sub_path": "filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json" }, + { + "name": "QIDI PAHT-CF", + "sub_path": "filament/QIDI PAHT-CF.json" + }, { "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle", "sub_path": "filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json" @@ -864,6 +792,10 @@ "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle", "sub_path": "filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json" }, + { + "name": "Qidi PC-ABS-FR", + "sub_path": "filament/Qidi PC-ABS-FR.json" + }, { "name": "Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle", "sub_path": "filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json" @@ -876,6 +808,10 @@ "name": "Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle", "sub_path": "filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json" }, + { + "name": "QIDI PET-CF", + "sub_path": "filament/QIDI PET-CF.json" + }, { "name": "QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle", "sub_path": "filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json" @@ -889,25 +825,49 @@ "sub_path": "filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json" + "name": "QIDI PETG Tough", + "sub_path": "filament/QIDI PETG Tough.json" }, { "name": "QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle", "sub_path": "filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json" }, + { + "name": "QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json" + }, { "name": "QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle", "sub_path": "filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json" + "name": "QIDI PETG Tough 0.2 nozzle", + "sub_path": "filament/QIDI PETG Tough 0.2 nozzle.json" + }, + { + "name": "QIDI PETG Tough 0.6 nozzle", + "sub_path": "filament/QIDI PETG Tough 0.6 nozzle.json" + }, + { + "name": "QIDI PETG Tough 0.8 nozzle", + "sub_path": "filament/QIDI PETG Tough 0.8 nozzle.json" + }, + { + "name": "QIDI PLA Rapido", + "sub_path": "filament/QIDI PLA Rapido.json" }, { "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle", "sub_path": "filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json" }, + { + "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json" + }, { "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle", "sub_path": "filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json" @@ -916,6 +876,198 @@ "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle", "sub_path": "filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json" }, + { + "name": "QIDI PLA Rapido 0.2 nozzle", + "sub_path": "filament/QIDI PLA Rapido 0.2 nozzle.json" + }, + { + "name": "QIDI PLA Rapido @0.6 nozzle", + "sub_path": "filament/QIDI PLA Rapido @0.6 nozzle.json" + }, + { + "name": "QIDI PLA Rapido 0.8 nozzle", + "sub_path": "filament/QIDI PLA Rapido 0.8 nozzle.json" + }, + { + "name": "QIDI PLA Rapido Matte", + "sub_path": "filament/QIDI PLA Rapido Matte.json" + }, + { + "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json" + }, + { + "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "QIDI PLA Rapido Matte @0.2 nozzle", + "sub_path": "filament/QIDI PLA Rapido Matte @0.2 nozzle.json" + }, + { + "name": "QIDI PLA Rapido Matte @0.6 nozzle", + "sub_path": "filament/QIDI PLA Rapido Matte @0.6 nozzle.json" + }, + { + "name": "QIDI PLA Rapido Matte @0.8 nozzle", + "sub_path": "filament/QIDI PLA Rapido Matte @0.8 nozzle.json" + }, + { + "name": "Qidi PLA-CF", + "sub_path": "filament/Qidi PLA-CF.json" + }, + { + "name": "QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "QIDI PLA-CF @0.6 nozzle", + "sub_path": "filament/QIDI PLA-CF @0.6 nozzle.json" + }, + { + "name": "QIDI PLA-CF @0.8 nozzle", + "sub_path": "filament/QIDI PLA-CF @0.8 nozzle.json" + }, + { + "name": "QIDI PA-Ultra", + "sub_path": "filament/QIDI PA-Ultra.json" + }, + { + "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "QIDI ABS-GF10", + "sub_path": "filament/QIDI ABS-GF10.json" + }, + { + "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "Tinmorry PETG-ECO", + "sub_path": "filament/Tinmorry PETG-ECO.json" + }, + { + "name": "Qidi Generic TPU", + "sub_path": "filament/Qidi Generic TPU.json" + }, + { + "name": "Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "Qidi Generic ASA", + "sub_path": "filament/Qidi Generic ASA.json" + }, + { + "name": "Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json" + }, + { + "name": "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle", + "sub_path": "filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json" + }, + { + "name": "Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle", + "sub_path": "filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json" + }, + { + "name": "Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle", + "sub_path": "filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json" + }, + { + "name": "Qidi Generic PA", + "sub_path": "filament/Qidi Generic PA.json" + }, + { + "name": "Qidi Generic PA-CF", + "sub_path": "filament/Qidi Generic PA-CF.json" + }, + { + "name": "Qidi Generic PC", + "sub_path": "filament/Qidi Generic PC.json" + }, + { + "name": "Qidi Generic PETG-CF", + "sub_path": "filament/Qidi Generic PETG-CF.json" + }, + { + "name": "Qidi Generic PLA Silk", + "sub_path": "filament/Qidi Generic PLA Silk.json" + }, + { + "name": "Qidi Generic PVA", + "sub_path": "filament/Qidi Generic PVA.json" + }, + { + "name": "QIDI ABS-GF", + "sub_path": "filament/QIDI ABS-GF.json" + }, + { + "name": "QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json" + }, + { + "name": "QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json" + }, + { + "name": "QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json" + }, + { + "name": "Qidi Generic PLA-CF", + "sub_path": "filament/Qidi Generic PLA-CF.json" + }, + { + "name": "Qidi TPU 95A-HF", + "sub_path": "filament/Qidi TPU 95A-HF.json" + }, { "name": "Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", "sub_path": "filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json" @@ -924,7 +1076,6 @@ "name": "Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle", "sub_path": "filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json" } - ], "machine_list": [ { diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json new file mode 100644 index 0000000000..8f0cd8942d --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json @@ -0,0 +1,35 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ABS Odorless @0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "QIDI ABS Odorless", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "max_fan_speed":[ + "80" + ], + "min_fan_speed":[ + "10" + ], + "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", + "Qidi X-Smart 3 0.2 nozzle", + "Qidi X-Plus 3 0.2 nozzle", + "Qidi X-Max 3 0.2 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json new file mode 100644 index 0000000000..0474f72171 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ABS Odorless @0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "QIDI ABS Odorless", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "nozzle_temperature": [ + "270" + ], + "slow_down_min_speed": [ + "10" + ], + "max_fan_speed":[ + "80" + ], + "min_fan_speed":[ + "10" + ], + "compatible_printers": [ + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json new file mode 100644 index 0000000000..8e56cc5a03 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json @@ -0,0 +1,46 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "instantiation": "true", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_max_speed": [ + "80" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "from": "system", + "hot_plate_temp_initial_layer": [ + "90" + ], + "inherits": "QIDI ABS Odorless", + "is_custom_defined": "0", + "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle", + "nozzle_temperature": [ + "260" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.021" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ +"Qidi Q1 Pro 0.2 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json new file mode 100644 index 0000000000..c0a349fa31 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json @@ -0,0 +1,46 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "instantiation": "true", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_max_speed": [ + "80" + ], + "filament_max_volumetric_speed": [ + "24.5" + ], + "from": "system", + "hot_plate_temp_initial_layer": [ + "90" + ], + "inherits": "QIDI ABS Odorless", + "is_custom_defined": "0", + "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle", + "nozzle_temperature": [ + "260" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.035" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ +"Qidi Q1 Pro 0.4 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json new file mode 100644 index 0000000000..020153b310 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json @@ -0,0 +1,46 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "instantiation": "true", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_max_speed": [ + "80" + ], + "filament_max_volumetric_speed": [ + "24.5" + ], + "from": "system", + "hot_plate_temp_initial_layer": [ + "90" + ], + "inherits": "QIDI ABS Odorless", + "is_custom_defined": "0", + "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle", + "nozzle_temperature": [ + "250" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.014" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ +"Qidi Q1 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json new file mode 100644 index 0000000000..ccaacdfe14 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json @@ -0,0 +1,46 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "instantiation": "true", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_max_speed": [ + "80" + ], + "filament_max_volumetric_speed": [ + "24.5" + ], + "from": "system", + "hot_plate_temp_initial_layer": [ + "90" + ], + "inherits": "QIDI ABS Odorless", + "is_custom_defined": "0", + "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle", + "nozzle_temperature": [ + "250" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.011" + ], + "slow_down_min_speed": [ + "10" + ], + "compatible_printers": [ +"Qidi Q1 Pro 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless.json new file mode 100644 index 0000000000..ccc24c26c7 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ABS Odorless", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.92" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" + ], + "max_fan_speed":[ + "80" + ], + "min_fan_speed":[ + "10" + ], + "overhang_fan_speed": [ + "100" + ], + "filament_density":[ + "1.02" + ], + "chamber_temperature": [ + "55" + ], + "compatible_printers": [ + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", + "Qidi X-Max 0.6 nozzle", + "Qidi X-CF Pro 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json index 52d285cfa1..87970900da 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json @@ -5,9 +5,9 @@ "name": "QIDI ABS Rapido 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "QIDI ABS Rapido", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json index 3460538218..8a348e7acb 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json @@ -5,9 +5,9 @@ "name": "QIDI ABS Rapido 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "QIDI ABS Rapido", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -19,13 +19,10 @@ "22" ], "nozzle_temperature": [ - "260" + "270" ], "slow_down_min_speed": [ "10" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Plus 0.8 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json index 7656eb8f6c..683be9035f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "setting_id": "GFSA04", "instantiation": "true", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -21,7 +21,7 @@ "filament_max_volumetric_speed": [ "2" ], - "from": "User", + "from": "system", "hot_plate_temp_initial_layer": [ "90" ], @@ -41,6 +41,6 @@ "20" ], "compatible_printers": [ - "Qidi Q1 Pro 0.2 nozzle" +"Qidi Q1 Pro 0.2 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json index 7a02f947c3..94d9f981cc 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "setting_id": "GFSA04", "instantiation": "true", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -21,7 +21,7 @@ "filament_max_volumetric_speed": [ "24.5" ], - "from": "User", + "from": "system", "hot_plate_temp_initial_layer": [ "90" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json index 1b3cd4ac62..ac603a1776 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "setting_id": "GFSA04", "instantiation": "true", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -21,7 +21,7 @@ "filament_max_volumetric_speed": [ "24.5" ], - "from": "User", + "from": "system", "hot_plate_temp_initial_layer": [ "90" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json index 29e4c1db5c..b661799a9f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "setting_id": "GFSA04", "instantiation": "true", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -21,7 +21,7 @@ "filament_max_volumetric_speed": [ "24.5" ], - "from": "User", + "from": "system", "hot_plate_temp_initial_layer": [ "90" ], @@ -38,7 +38,7 @@ "0.011" ], "slow_down_min_speed": [ - "20" + "10" ], "compatible_printers": [ "Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido.json index 347f1dba84..e9b5f75734 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido.json @@ -7,10 +7,10 @@ "instantiation": "true", "inherits": "fdm_filament_abs", "filament_flow_ratio": [ - "0.926" + "0.95" ], "filament_max_volumetric_speed": [ - "20" + "22" ], "enable_pressure_advance": [ "1" @@ -18,8 +18,20 @@ "pressure_advance": [ "0.021" ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" + "max_fan_speed":[ + "80" + ], + "min_fan_speed":[ + "20" + ], + "overhang_fan_speed": [ + "100" + ], + "filament_density":[ + "1.05" + ], + "chamber_temperature": [ + "55" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", @@ -34,5 +46,6 @@ "Qidi X-Smart 3 0.6 nozzle", "Qidi X-Plus 3 0.6 nozzle", "Qidi X-Max 3 0.6 nozzle" + ] } diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json new file mode 100644 index 0000000000..fe72ee456c --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -0,0 +1,51 @@ +{ "type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_max_speed": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle" + ], + "from": "system", + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "inherits": "QIDI ABS-GF", + "is_custom_defined": "0", + "name": "QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle", + "nozzle_temperature": [ + "260" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.035" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.4 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json new file mode 100644 index 0000000000..80621e46a7 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -0,0 +1,51 @@ +{ "type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_max_speed": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle" + ], + "from": "system", + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "inherits": "QIDI ABS-GF", + "is_custom_defined": "0", + "name": "QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle", + "nozzle_temperature": [ + "260" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.01" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json new file mode 100644 index 0000000000..b81523c619 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -0,0 +1,51 @@ +{ "type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_max_speed": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle" + ], + "from": "system", + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "inherits": "QIDI ABS-GF", + "is_custom_defined": "0", + "name": "QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle", + "nozzle_temperature": [ + "260" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.01" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF.json b/resources/profiles/Qidi/filament/QIDI ABS-GF.json new file mode 100644 index 0000000000..1e946ef06a --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF.json @@ -0,0 +1,68 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ABS-GF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "17" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.01" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "nozzle_temperature": [ + "270" + ], + "fan_max_speed": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "chamber_temperature": [ + "55" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "hot_plate_temp" : [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "filament_density":[ + "1.15" + ], + "compatible_printers": [ + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Max 0.6 nozzle", + "Qidi X-CF Pro 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" + + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json index a0ab3b3427..e77c21a52a 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json @@ -20,7 +20,7 @@ "filament_settings_id": [ "QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json index cc825857d1..86b9418093 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json @@ -20,7 +20,7 @@ "filament_settings_id": [ "QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json index 532b8229eb..4070af9946 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json @@ -20,7 +20,7 @@ "filament_settings_id": [ "QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10.json index baf5860ade..a102a1213b 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10.json @@ -5,21 +5,42 @@ "name": "QIDI ABS-GF10", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF25", + "inherits": "fdm_filament_abs", "filament_flow_ratio": [ - "0.94" + "0.95" ], "filament_max_volumetric_speed": [ - "14" + "17" ], - "nozzle_temperature": [ - "280" - ], - "nozzle_temperature_range_high": [ - "280" + "enable_pressure_advance": [ + "1" ], "pressure_advance": [ - "0.02" + "0.01" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "nozzle_temperature": [ + "270" + ], + "fan_max_speed": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "chamber_temperature": [ + "55" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "hot_plate_temp" : [ + "100" + ], + "overhang_fan_speed": [ + "100" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json index 2469011167..fd278ed2d7 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json @@ -3,10 +3,10 @@ "setting_id": "GFSA04", "instantiation": "true", "activate_chamber_temp_control": [ - "0" + "1" ], "chamber_temperature": [ - "55" + "0" ], "fan_max_speed": [ "20" @@ -20,7 +20,7 @@ "filament_settings_id": [ "QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json index 0d56960e81..a3782cc2a1 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json @@ -3,10 +3,10 @@ "setting_id": "GFSA04", "instantiation": "true", "activate_chamber_temp_control": [ - "0" + "1" ], "chamber_temperature": [ - "55" + "0" ], "fan_max_speed": [ "20" @@ -20,7 +20,7 @@ "filament_settings_id": [ "QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json index aa7dd8a793..da2469deb5 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json @@ -3,10 +3,10 @@ "setting_id": "GFSA04", "instantiation": "true", "activate_chamber_temp_control": [ - "0" + "1" ], "chamber_temperature": [ - "55" + "0" ], "fan_max_speed": [ "20" @@ -20,7 +20,7 @@ "filament_settings_id": [ "QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25.json index 3c5b8af588..ff520549c1 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25.json @@ -7,10 +7,10 @@ "instantiation": "true", "inherits": "fdm_filament_abs", "filament_flow_ratio": [ - "0.9" + "0.95" ], "filament_max_volumetric_speed": [ - "15" + "17" ], "enable_pressure_advance": [ "1" @@ -24,14 +24,23 @@ "nozzle_temperature": [ "270" ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" - ], "fan_max_speed": [ - "30" + "20" ], "fan_min_speed": [ - "10" + "20" + ], + "chamber_temperature": [ + "55" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "hot_plate_temp" : [ + "100" + ], + "overhang_fan_speed": [ + "100" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json new file mode 100644 index 0000000000..1cf845ad22 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ASA @Qidi Q1 Pro 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "QIDI ASA", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.2 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json new file mode 100644 index 0000000000..01fb0eaca2 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -0,0 +1,42 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_cooling_layer_time": [ + "40" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_settings_id": [ + "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle" + ], + "from": "system", + "inherits": "QIDI ASA", + "is_custom_defined": "0", + "name": "QIDI ASA @Qidi Q1 Pro 0.4 nozzle", + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.035" + ], + "slow_down_layer_time": [ + "4" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.4 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json new file mode 100644 index 0000000000..fc21c6e1e3 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -0,0 +1,42 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_cooling_layer_time": [ + "40" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_settings_id": [ + "QIDI ASA @Qidi Q1 Pro 0.6 nozzle" + ], + "from": "system", + "inherits": "QIDI ASA", + "is_custom_defined": "0", + "name": "QIDI ASA @Qidi Q1 Pro 0.6 nozzle", + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.014" + ], + "slow_down_layer_time": [ + "4" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json new file mode 100644 index 0000000000..9d11a1834e --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -0,0 +1,42 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_chamber_temp_control": [ + "0" + ], + "chamber_temperature": [ + "55" + ], + "fan_cooling_layer_time": [ + "40" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_settings_id": [ + "QIDI ASA @Qidi Q1 Pro 0.8 nozzle" + ], + "from": "system", + "inherits": "QIDI ASA", + "is_custom_defined": "0", + "name": "QIDI ASA @Qidi Q1 Pro 0.8 nozzle", + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "overhang_fan_speed": [ + "100" + ], + "pressure_advance": [ + "0.011" + ], + "slow_down_layer_time": [ + "4" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json new file mode 100644 index 0000000000..543a8f2bb5 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ASA @Qidi X-Max 3 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "QIDI ASA", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "enable_volume_fan":[ + "40" + ], + "compatible_printers": [ + "Qidi X-Max 3 0.2 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json new file mode 100644 index 0000000000..88404df2bf --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ASA @Qidi X-Plus 3 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "QIDI ASA", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "enable_volume_fan":[ + "40" + ], + "compatible_printers": [ + "Qidi X-Plus 3 0.2 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json new file mode 100644 index 0000000000..596ee112ea --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ASA @Qidi X-Smart 3 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "QIDI ASA", + "filament_flow_ratio": [ + "0.92" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "enable_volume_fan":[ + "40" + ], + "compatible_printers": [ + "Qidi X-Smart 3 0.2 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI ASA.json b/resources/profiles/Qidi/filament/QIDI ASA.json new file mode 100644 index 0000000000..860d743bba --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI ASA.json @@ -0,0 +1,93 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "QIDI ASA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_asa", + "filament_max_volumetric_speed": [ + "16" + ], + "filament_flow_ratio": [ + "0.92" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature": [ + "270" + ], + "cool_plate_temp" : [ + "90" + ], + "eng_plate_temp" : [ + "90" + ], + "hot_plate_temp" : [ + "90" + ], + "textured_plate_temp" : [ + "90" + ], + "cool_plate_temp_initial_layer" : [ + "90" + ], + "eng_plate_temp_initial_layer" : [ + "90" + ], + "hot_plate_temp_initial_layer" : [ + "90" + ], + "textured_plate_temp_initial_layer" : [ + "90" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.021" + ], + "max_fan_speed":[ + "50" + ], + "min_fan_speed":[ + "10" + ], + "filament_retraction_length": [ + "0.01" + ], + "overhang_fan_speed": [ + "100" + ], + "filament_density":[ + "1.07" + ], + "chamber_temperature": [ + "55" + ], + "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", + "Qidi X-Max 0.6 nozzle", + "Qidi X-CF Pro 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" + + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json index adb8718390..7c7a3dc95e 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json @@ -14,12 +14,12 @@ "filament_settings_id": [ "QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ - "100" + "80" ], "hot_plate_temp_initial_layer": [ - "100" + "80" ], "inherits": "QIDI PA-Ultra", "is_custom_defined": "0", diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json new file mode 100644 index 0000000000..9c7d962ddb --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json @@ -0,0 +1,36 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "20" + ], + "filament_max_volumetric_speed": [ + "4" + ], + "filament_settings_id": [ + "QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle" + ], + "from": "system", + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "inherits": "QIDI PA-Ultra", + "is_custom_defined": "0", + "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle", + "overhang_fan_speed": [ + "50" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json index 94fd3a3c4e..fe2af9df15 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json @@ -14,12 +14,12 @@ "filament_settings_id": [ "QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ - "100" + "80" ], "hot_plate_temp_initial_layer": [ - "100" + "80" ], "inherits": "QIDI PA-Ultra", "is_custom_defined": "0", diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra.json index e4d1b7679f..91b0873137 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra.json @@ -24,6 +24,27 @@ "pressure_advance": [ "0.03" ], + "max_fan_speed":[ + "40" +], +"min_fan_speed":[ + "20" +], +"hot_plate_temp_initial_layer" : [ + "80" +], +"hot_plate_temp" : [ +"80" +], +"slow_down_layer_time": [ +"15" +], +"filament_density":[ +"1.21" +], +"filament_flow_ratio": [ +"0.96" +], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", @@ -41,7 +62,6 @@ "Qidi X-CF Pro 0.8 nozzle", "Qidi X-Smart 3 0.8 nozzle", "Qidi X-Plus 3 0.8 nozzle", -"Qidi X-Max 3 0.8 nozzle", -"Qidi Q1 Pro 0.6 nozzle" +"Qidi X-Max 3 0.8 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json index 13cbe61f4c..9a28add435 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -11,7 +11,7 @@ "filament_settings_id": [ "QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PA12-CF", "is_custom_defined": "0", "name": "QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle", @@ -22,7 +22,7 @@ "280" ], "overhang_fan_speed": [ - "50" + "100" ], "pressure_advance": [ "0.035" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json index be1bbc67d3..0674bacba6 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -11,7 +11,7 @@ "filament_settings_id": [ "QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PA12-CF", "is_custom_defined": "0", "name": "QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json index 37469c94fe..71723f666b 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -11,7 +11,7 @@ "filament_settings_id": [ "QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PA12-CF", "is_custom_defined": "0", "name": "QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle", @@ -22,7 +22,7 @@ "280" ], "overhang_fan_speed": [ - "50" + "100" ], "pressure_advance": [ "0.035" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF.json b/resources/profiles/Qidi/filament/QIDI PA12-CF.json index 08f55efc1f..c53243db4b 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF.json @@ -16,25 +16,25 @@ "290" ], "filament_max_volumetric_speed": [ - "8" + "10" ], "fan_max_speed": [ - "30" + "40" ], "fan_min_speed": [ - "10" + "20" ], "overhang_fan_threshold": [ "0%" ], "overhang_fan_speed": [ - "40" + "100" ], "fan_cooling_layer_time": [ "5" ], "full_fan_speed_layer": [ - "3" + "0" ], "enable_pressure_advance": [ "1" @@ -42,6 +42,21 @@ "pressure_advance": [ "0.01" ], + "hot_plate_temp_initial_layer" : [ + "80" +], +"hot_plate_temp" : [ + "80" +], +"slow_down_layer_time": [ + "5" +], +"filament_density":[ + "1.09" +], +"filament_flow_ratio": [ + "0.96" +], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", @@ -60,5 +75,6 @@ "Qidi X-Smart 3 0.8 nozzle", "Qidi X-Plus 3 0.8 nozzle", "Qidi X-Max 3 0.8 nozzle" + ] } diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json index 5f76aa62ba..b1e941182d 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -12,12 +12,12 @@ "20" ], "filament_max_volumetric_speed": [ - "8" + "14" ], "filament_settings_id": [ "QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PAHT-CF", "is_custom_defined": "0", "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json index 5b5f87a145..857aa45526 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -17,7 +17,7 @@ "filament_settings_id": [ "QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PAHT-CF", "is_custom_defined": "0", "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json index 85819678e5..91d06fc311 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -17,7 +17,7 @@ "filament_settings_id": [ "QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PAHT-CF", "is_custom_defined": "0", "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF.json index a004038980..0ec7270135 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF.json @@ -16,13 +16,13 @@ "310" ], "filament_max_volumetric_speed": [ - "8" + "14" ], "fan_max_speed": [ - "30" + "40" ], "fan_min_speed": [ - "10" + "20" ], "overhang_fan_threshold": [ "0%" @@ -34,7 +34,7 @@ "5" ], "full_fan_speed_layer": [ - "2" + "0" ], "enable_pressure_advance": [ "1" @@ -42,6 +42,21 @@ "pressure_advance": [ "0.01" ], + "hot_plate_temp_initial_layer" : [ + "80" +], +"hot_plate_temp" : [ + "80" +], +"slow_down_layer_time": [ + "5" +], +"filament_density":[ + "1.20" +], +"filament_flow_ratio": [ + "0.96" +], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json index ee1fd39763..f991ef9603 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -14,7 +14,7 @@ "filament_settings_id": [ "QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PET-CF", "is_custom_defined": "0", "name": "QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle", @@ -25,10 +25,10 @@ "280" ], "overhang_fan_speed": [ - "50" + "100" ], "pressure_advance": [ - "0.032" + "0.01" ], "slow_down_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json index 1f22f9ff22..efaefef830 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -14,7 +14,7 @@ "filament_settings_id": [ "QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PET-CF", "is_custom_defined": "0", "name": "QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json index 7a11be473b..9eff17f586 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -14,7 +14,7 @@ "filament_settings_id": [ "QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "inherits": "QIDI PET-CF", "is_custom_defined": "0", "name": "QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle", @@ -25,7 +25,7 @@ "280" ], "overhang_fan_speed": [ - "50" + "100" ], "pressure_advance": [ "0.025" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF.json b/resources/profiles/Qidi/filament/QIDI PET-CF.json index c27f725f1d..b1173f811a 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF.json @@ -16,25 +16,25 @@ "320" ], "filament_max_volumetric_speed": [ - "8" + "12" ], "fan_max_speed": [ - "30" + "40" ], "fan_min_speed": [ - "10" + "20" ], "overhang_fan_threshold": [ "0%" ], "overhang_fan_speed": [ - "40" + "100" ], "fan_cooling_layer_time": [ "5" ], "full_fan_speed_layer": [ - "3" + "0" ], "enable_pressure_advance": [ "1" @@ -42,6 +42,21 @@ "pressure_advance": [ "0.01" ], + "hot_plate_temp_initial_layer" : [ + "80" +], +"hot_plate_temp" : [ + "80" +], +"slow_down_layer_time": [ + "5" +], +"filament_density":[ + "1.30" +], +"filament_flow_ratio": [ + "1" +], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json index de315e8243..78aa5e9048 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PETG Tough 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "QIDI PETG Tough", "reduce_fan_stop_start_freq": [ "1" ], @@ -16,7 +16,7 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" @@ -28,7 +28,7 @@ "10" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ "8" @@ -40,10 +40,10 @@ "1" ], "pressure_advance": [ - "0.05" + "0.04" ], "filament_max_volumetric_speed": [ - "1" + "16" ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", @@ -51,6 +51,7 @@ "Qidi X-CF Pro 0.2 nozzle", "Qidi X-Smart 3 0.2 nozzle", "Qidi X-Plus 3 0.2 nozzle", - "Qidi X-Max 3 0.2 nozzle" + "Qidi X-Max 3 0.2 nozzle", + "Qidi Q1 Pro 0.2 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json index 3b938eb9d7..7f4da85e59 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PETG Tough 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "QIDI PETG Tough", "reduce_fan_stop_start_freq": [ "1" ], @@ -16,13 +16,13 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ "8" @@ -34,7 +34,7 @@ "1" ], "pressure_advance": [ - "0.05" + "0.04" ], "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json index 8b2f70e6fe..a99c52e8be 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PETG Tough 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "QIDI PETG Tough", "reduce_fan_stop_start_freq": [ "1" ], @@ -16,7 +16,7 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" @@ -34,7 +34,7 @@ "1" ], "pressure_advance": [ - "0.05" + "0.04" ], "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json index 0fe156f437..eb65ae3ef3 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json @@ -14,7 +14,7 @@ "filament_settings_id": [ "QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp_initial_layer": [ "80" ], diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json index 6b4c5a396d..26def59c54 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json @@ -14,7 +14,7 @@ "filament_settings_id": [ "QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp_initial_layer": [ "80" ], diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json new file mode 100644 index 0000000000..6183243f5c --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json @@ -0,0 +1,30 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "fan_max_speed": [ + "40" + ], + "fan_min_speed": [ + "10" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_settings_id": [ + "QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle" + ], + "from": "system", + "hot_plate_temp_initial_layer": [ + "80" + ], + "inherits": "QIDI PETG Tough", + "is_custom_defined": "0", + "name": "QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle", + "overhang_fan_speed": [ + "100" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json index 662fa68527..5ca1cbdec1 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json @@ -14,7 +14,7 @@ "filament_settings_id": [ "QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp_initial_layer": [ "80" ], diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough.json b/resources/profiles/Qidi/filament/QIDI PETG Tough.json index 972e94bd93..c0f3a7ad46 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough.json @@ -16,16 +16,16 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" ], "fan_max_speed": [ - "90" + "40" ], "fan_min_speed": [ - "40" + "10" ], "slow_down_min_speed": [ "20" @@ -37,13 +37,22 @@ "0.95" ], "filament_max_volumetric_speed": [ - "12" + "16" ], "enable_pressure_advance": [ "1" ], "pressure_advance": [ - "0.05" + "0.04" + ], + "hot_plate_temp_initial_layer" : [ + "80" + ], + "hot_plate_temp" : [ + "80" + ], + "filament_density":[ + "1.24" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", @@ -51,7 +60,6 @@ "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", - "Qidi X-Max 3 0.4 nozzle", - "Qidi Q1 Pro 0.6 nozzle" + "Qidi X-Max 3 0.4 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json index 216b98c41e..83805585f4 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json @@ -5,19 +5,16 @@ "name": "QIDI PLA Rapido 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pla", + "inherits": "QIDI PLA Rapido", "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ - "5" + "8" ], "enable_pressure_advance": [ "1" ], - "pressure_advance": [ - "0.031" - ], "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json index 55615fd03d..81059b30b7 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json @@ -5,21 +5,21 @@ "name": "QIDI PLA Rapido 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pla", + "inherits": "QIDI PLA Rapido", "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ - "5" + "8" ], "enable_pressure_advance": [ "1" ], "pressure_advance": [ - "0.031" + "0.008" ], "filament_max_volumetric_speed": [ - "22" + "20" ], "compatible_printers": [ "Qidi X-Plus 0.8 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json new file mode 100644 index 0000000000..f5889b1145 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSL99", + "name": "QIDI PLA Rapido @0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "QIDI PLA Rapido", + "filament_flow_ratio": [ + "0.98" + ], + "slow_down_layer_time": [ + "8" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.016" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi X-Plus 0.6 nozzle", + "Qidi X-Max 0.6 nozzle", + "Qidi X-CF Pro 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json index 0f80b8075e..f2b961f821 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -23,7 +23,7 @@ "filament_settings_id": [ "QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle" ], - "from": "User", + "from": "system", "full_fan_speed_layer": [ "3" ], @@ -37,7 +37,7 @@ "is_custom_defined": "0", "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle", "nozzle_temperature": [ - "220" + "210" ], "pressure_advance": [ "0.042" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json index 6830a7053d..9fde954540 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -23,7 +23,7 @@ "filament_settings_id": [ "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "full_fan_speed_layer": [ "3" ], @@ -37,7 +37,7 @@ "is_custom_defined": "0", "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle", "nozzle_temperature": [ - "220" + "210" ], "pressure_advance": [ "0.042" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json index 22eb83879d..f5fc9e3264 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -23,7 +23,7 @@ "filament_settings_id": [ "QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle" ], - "from": "User", + "from": "system", "full_fan_speed_layer": [ "3" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json index 1f5a17c1b7..42df71e5e7 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -23,7 +23,7 @@ "filament_settings_id": [ "QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "full_fan_speed_layer": [ "3" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json new file mode 100644 index 0000000000..b4da1cbf17 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSL99", + "name": "QIDI PLA Rapido Matte @0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "QIDI PLA Rapido Matte", + "filament_flow_ratio": [ + "0.98" + ], + "slow_down_layer_time": [ + "8" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.031" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", + "Qidi X-Smart 3 0.2 nozzle", + "Qidi X-Plus 3 0.2 nozzle", + "Qidi X-Max 3 0.2 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json new file mode 100644 index 0000000000..b770f889a0 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSL99", + "name": "QIDI PLA Rapido Matte @0.6 nozzle", + "from": "User", + "instantiation": "true", + "inherits": "QIDI PLA Rapido Matte", + "filament_flow_ratio": [ + "0.98" + ], + "slow_down_layer_time": [ + "8" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.016" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "compatible_printers": [ + "Qidi X-Plus 0.6 nozzle", + "Qidi X-Max 0.6 nozzle", + "Qidi X-CF Pro 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json new file mode 100644 index 0000000000..c206d0e350 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSL99", + "name": "QIDI PLA Rapido Matte @0.8 nozzle", + "from": "User", + "instantiation": "true", + "inherits": "QIDI PLA Rapido Matte", + "filament_flow_ratio": [ + "0.98" + ], + "slow_down_layer_time": [ + "8" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.008" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "compatible_printers": [ + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json new file mode 100644 index 0000000000..56d802676f --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json @@ -0,0 +1,51 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_air_filtration": [ + "1" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "during_print_exhaust_fan_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "60" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "filament_settings_id": [ + "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle" + ], + "from": "system", + "full_fan_speed_layer": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "inherits": "QIDI PLA Rapido Matte", + "is_custom_defined": "0", + "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle", + "nozzle_temperature": [ + "210" + ], + "pressure_advance": [ + "0.042" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.2 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json new file mode 100644 index 0000000000..80dc5879bf --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json @@ -0,0 +1,51 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_air_filtration": [ + "1" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "during_print_exhaust_fan_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "60" + ], + "filament_max_volumetric_speed": [ + "24.5" + ], + "filament_settings_id": [ + "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle" + ], + "from": "system", + "full_fan_speed_layer": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "inherits": "QIDI PLA Rapido Matte", + "is_custom_defined": "0", + "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle", + "nozzle_temperature": [ + "210" + ], + "pressure_advance": [ + "0.042" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.4 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json new file mode 100644 index 0000000000..472cde3a8c --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json @@ -0,0 +1,51 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_air_filtration": [ + "1" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "during_print_exhaust_fan_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "60" + ], + "filament_max_volumetric_speed": [ + "24.5" + ], + "filament_settings_id": [ + "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle" + ], + "from": "system", + "full_fan_speed_layer": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "inherits": "QIDI PLA Rapido Matte", + "is_custom_defined": "0", + "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle", + "nozzle_temperature": [ + "210" + ], + "pressure_advance": [ + "0.016" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json new file mode 100644 index 0000000000..b73e847cc8 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json @@ -0,0 +1,51 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "activate_air_filtration": [ + "1" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "during_print_exhaust_fan_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "60" + ], + "filament_max_volumetric_speed": [ + "24.5" + ], + "filament_settings_id": [ + "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle" + ], + "from": "system", + "full_fan_speed_layer": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "inherits": "QIDI PLA Rapido Matte", + "is_custom_defined": "0", + "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle", + "nozzle_temperature": [ + "210" + ], + "pressure_advance": [ + "0.008" + ], + "slow_down_min_speed": [ + "20" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json new file mode 100644 index 0000000000..578b18b1d8 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json @@ -0,0 +1,35 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSL99", + "name": "QIDI PLA Rapido Matte", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "slow_down_layer_time": [ + "8" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.031" + ], + "filament_density":[ + "1.42" + ], + "compatible_printers": [ + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido.json index 5b07e3e1f7..302d1c5bd4 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido.json @@ -27,12 +27,6 @@ "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", - "Qidi X-Max 3 0.4 nozzle", - "Qidi X-Plus 0.6 nozzle", - "Qidi X-Max 0.6 nozzle", - "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle" + "Qidi X-Max 3 0.4 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json new file mode 100644 index 0000000000..dc30ce7db0 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "filament_id": "GFL98", + "setting_id": "GFSL98", + "name": "QIDI PLA-CF @0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "Qidi PLA-CF", + "pressure_advance": [ + "0.01" + ], + "compatible_printers": [ + "Qidi X-Plus 0.6 nozzle", + "Qidi X-Max 0.6 nozzle", + "Qidi X-CF Pro 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json new file mode 100644 index 0000000000..6d1364ce44 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "filament_id": "GFL98", + "setting_id": "GFSL98", + "name": "QIDI PLA-CF @0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "Qidi PLA-CF", + "pressure_advance": [ + "0.008" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "compatible_printers": [ + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json new file mode 100644 index 0000000000..7b47a552f7 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -0,0 +1,30 @@ +{"type": "filament", +"filament_id": "GFL98", +"setting_id": "GFSL98", +"instantiation": "true", + "extrusion_multiplier": [ + "0.93" + ], + "first_layer_temperature": [ + "220" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_settings_id": [ + "QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle" + ], + "from": "system", + "inherits": "Qidi PLA-CF", + "is_custom_defined": "0", + "name": "QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", + "nozzle_temperature": [ + "220" + ], + "pressure_advance": [ + "0.034" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.4 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json new file mode 100644 index 0000000000..0fec335289 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -0,0 +1,30 @@ +{"type": "filament", +"filament_id": "GFL98", +"setting_id": "GFSL98", +"instantiation": "true", + "extrusion_multiplier": [ + "0.93" + ], + "first_layer_temperature": [ + "220" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_settings_id": [ + "QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle" + ], + "from": "system", + "inherits": "Qidi PLA-CF", + "is_custom_defined": "0", + "name": "QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle", + "nozzle_temperature": [ + "220" + ], + "pressure_advance": [ + "0.012" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json new file mode 100644 index 0000000000..d0387282d7 --- /dev/null +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -0,0 +1,30 @@ +{"type": "filament", +"filament_id": "GFL98", +"setting_id": "GFSL98", +"instantiation": "true", + "extrusion_multiplier": [ + "0.93" + ], + "first_layer_temperature": [ + "220" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_settings_id": [ + "QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle" + ], + "from": "system", + "inherits": "Qidi PLA-CF", + "is_custom_defined": "0", + "name": "QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle", + "nozzle_temperature": [ + "220" + ], + "pressure_advance": [ + "0.008" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json index df0aecfa32..2dae49d2a7 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "setting_id": "GFSA04", "instantiation": "true", "activate_chamber_temp_control": [ - "1" + "0" ], "chamber_temperature": [ "60" @@ -14,7 +14,7 @@ "filament_settings_id": [ "Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "inherits": "Qidi ASA-Aero", "is_custom_defined": "0", "name": "Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero.json index b5464463c5..ca2c07fcf3 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero.json @@ -49,10 +49,22 @@ "0.021" ], "filament_retraction_length": [ - "0" + "0.01" ], - "filament_start_gcode": [ - "; filament start gcode\nM141 S60\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" + "max_fan_speed":[ + "50" + ], + "min_fan_speed":[ + "10" + ], + "overhang_fan_speed": [ + "100" + ], + "filament_density":[ + "1.03" + ], + "chamber_temperature": [ + "60" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", @@ -60,19 +72,7 @@ "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", - "Qidi X-Max 3 0.4 nozzle", - "Qidi X-Max 0.6 nozzle", - "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", - "Qidi X-Plus 0.8 nozzle", - "Qidi X-Max 0.8 nozzle", - "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle", - "Qidi Q1 Pro 0.6 nozzle", - "Qidi Q1 Pro 0.8 nozzle" + "Qidi X-Max 3 0.4 nozzle" + ] } diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json index 0f180e4026..4c43d6167e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ABS", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi Q1 Pro 0.2 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json index 678d0130fb..329a417ba5 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -11,7 +11,7 @@ "filament_settings_id": [ "Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "90" ], diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json index 8ad2038b93..98639f2926 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ABS", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "24.5" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json index afad4a341a..4b532fe90b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ABS", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "24.5" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json index 32292c6fe7..21a9b03ba0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ABS", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Max 3 0.2 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json index cdd8044ae4..805cfb1ae1 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ABS", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Plus 3 0.2 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json index 39fa925715..0eeacbf73e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ABS", "filament_flow_ratio": [ - "0.926" + "0.95" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Smart 3 0.2 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS.json b/resources/profiles/Qidi/filament/Qidi Generic ABS.json index e3c944e825..cd4513a2bf 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS.json @@ -7,34 +7,50 @@ "instantiation": "true", "inherits": "fdm_filament_abs", "filament_flow_ratio": [ - "0.926" + "0.95" ], "filament_max_volumetric_speed": [ - "15" + "17" ], "enable_pressure_advance": [ "1" ], "pressure_advance": [ "0.021" + ], + "max_fan_speed":[ + "80" + ], + "min_fan_speed":[ + "10" + ], + "overhang_fan_speed": [ + "100" + ], + "filament_density":[ + "1.04" ], "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", "Qidi X-Max 0.6 nozzle", "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", "Qidi X-Plus 0.8 nozzle", "Qidi X-Max 0.8 nozzle", "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle" + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json index 072826e600..c07dae16b7 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -1,42 +1,24 @@ -{"type": "filament", -"filament_id": "GFB99", -"setting_id": "GFSA04", -"instantiation": "true", - "activate_chamber_temp_control": [ - "0" - ], - "chamber_temperature": [ - "55" - ], - "fan_cooling_layer_time": [ - "40" - ], - "filament_max_volumetric_speed": [ - "2" - ], - "filament_settings_id": [ - "Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle" - ], - "from": "User", - "inherits": "Qidi Generic ASA", - "is_custom_defined": "0", +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", "name": "Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle", - "nozzle_temperature": [ - "255" + "from": "system", + "instantiation": "true", + "inherits": "Qidi Generic ASA", + "filament_flow_ratio": [ + "0.92" ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "overhang_fan_speed": [ - "100" + "enable_pressure_advance": [ + "1" ], "pressure_advance": [ "0.021" ], - "slow_down_layer_time": [ - "4" + "filament_max_volumetric_speed": [ + "2" ], - "compatible_printers": [ - "Qidi Q1 Pro 0.2 nozzle" - ] + "compatible_printers": [ + "Qidi Q1 Pro 0.2 nozzle" + ] } diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json index 3462157577..a068ae0603 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -17,12 +17,12 @@ "filament_settings_id": [ "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "inherits": "Qidi Generic ASA", "is_custom_defined": "0", "name": "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle", "nozzle_temperature": [ - "255" + "270" ], "nozzle_temperature_initial_layer": [ "250" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json index d586d8187e..49485cc786 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -17,7 +17,7 @@ "filament_settings_id": [ "Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle" ], - "from": "User", + "from": "system", "inherits": "Qidi Generic ASA", "is_custom_defined": "0", "name": "Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json index ed38ebb6f8..53c36fd95b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -17,7 +17,7 @@ "filament_settings_id": [ "Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "inherits": "Qidi Generic ASA", "is_custom_defined": "0", "name": "Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json index 0f60692f69..f6cd88e9e2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ASA", "filament_flow_ratio": [ - "0.926" + "0.92" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Max 3 0.2 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json index d32e2c80c8..91ea783e3f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ASA", "filament_flow_ratio": [ - "0.926" + "0.92" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Plus 3 0.2 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json index 2e754bdb4b..1d2f9a7a44 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json @@ -5,9 +5,9 @@ "name": "Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_abs", + "inherits": "Qidi Generic ASA", "filament_flow_ratio": [ - "0.926" + "0.92" ], "enable_pressure_advance": [ "1" @@ -17,9 +17,6 @@ ], "filament_max_volumetric_speed": [ "2" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ "Qidi X-Smart 3 0.2 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA.json b/resources/profiles/Qidi/filament/Qidi Generic ASA.json index eab6cf1e00..3181967e2a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA.json @@ -7,13 +7,13 @@ "instantiation": "true", "inherits": "fdm_filament_asa", "filament_max_volumetric_speed": [ - "15" + "16" ], "filament_flow_ratio": [ - "0.926" + "0.92" ], "nozzle_temperature_initial_layer": [ - "270" + "250" ], "nozzle_temperature": [ "270" @@ -21,29 +21,36 @@ "enable_pressure_advance": [ "1" ], + "max_fan_speed":[ + "50" + ], + "min_fan_speed":[ + "10" + ], "pressure_advance": [ "0.021" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" ], "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", "Qidi X-Max 0.6 nozzle", "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", "Qidi X-Plus 0.8 nozzle", "Qidi X-Max 0.8 nozzle", "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle" + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json index b939dc7680..3d64c5d792 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json @@ -16,19 +16,19 @@ "290" ], "filament_max_volumetric_speed": [ - "8" + "10" ], "fan_max_speed": [ - "30" + "40" ], "fan_min_speed": [ - "10" + "20" ], "overhang_fan_threshold": [ "0%" ], "overhang_fan_speed": [ - "40" + "100" ], "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA.json b/resources/profiles/Qidi/filament/Qidi Generic PA.json index 19e29799dd..d747a1b299 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PA.json @@ -10,22 +10,19 @@ "3" ], "nozzle_temperature_initial_layer": [ - "280" + "310" ], "nozzle_temperature": [ - "280" + "310" ], "filament_max_volumetric_speed": [ - "16" + "14" ], "enable_pressure_advance": [ "1" ], "pressure_advance": [ - "0.03" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" + "0.01" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC.json b/resources/profiles/Qidi/filament/Qidi Generic PC.json index 8bab081a8c..5c5650e554 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC.json @@ -7,13 +7,10 @@ "instantiation": "true", "inherits": "fdm_filament_pc", "filament_max_volumetric_speed": [ - "5" + "8" ], "filament_flow_ratio": [ - "0.94" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" + "0.92" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json index b9c65494db..16bf02d8ec 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "Qidi Generic PETG", "reduce_fan_stop_start_freq": [ "1" ], @@ -16,7 +16,7 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" @@ -28,10 +28,10 @@ "10" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "8" + "12" ], "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json index 907a637ca3..b699fb1a4c 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -1,8 +1,19 @@ -{ - "type": "filament", - "filament_id": "GFB99", - "setting_id": "GFSA04", - "instantiation": "true", +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", +"reduce_fan_stop_start_freq": [ + "1" +], +"slow_down_for_layer_cooling": [ + "1" +], +"fan_cooling_layer_time": [ + "30" +], +"overhang_fan_threshold": [ + "25%" +], "fan_max_speed": [ "40" ], @@ -12,7 +23,7 @@ "filament_settings_id": [ "Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp_initial_layer": [ "80" ], @@ -22,13 +33,25 @@ "overhang_fan_speed": [ "100" ], - "pressure_advance": [ - "0.04" - ], "slow_down_min_speed": [ "20" + ], + "slow_down_layer_time": [ + "12" +], + "pressure_advance":[ + "0.086" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "enable_pressure_advance": [ + "1" ], "compatible_printers": [ "Qidi Q1 Pro 0.4 nozzle" - ] -} \ No newline at end of file + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json index 26f3809524..bdf952339b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "Qidi Generic PETG", "reduce_fan_stop_start_freq": [ "1" ], @@ -16,7 +16,7 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" @@ -28,10 +28,10 @@ "10" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "8" + "12" ], "filament_flow_ratio": [ "0.95" @@ -43,7 +43,7 @@ "0.04" ], "filament_max_volumetric_speed": [ - "9" + "12" ], "compatible_printers": [ "Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json index 628ba1a92f..bb48060f5e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "Qidi Generic PETG", "reduce_fan_stop_start_freq": [ "1" ], @@ -28,10 +28,10 @@ "10" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "8" + "12" ], "filament_flow_ratio": [ "0.95" @@ -43,7 +43,7 @@ "0.04" ], "filament_max_volumetric_speed": [ - "9" + "12" ], "compatible_printers": [ "Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json index 55acc65308..242c0f01f7 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "Qidi Generic PETG", "reduce_fan_stop_start_freq": [ "1" ], @@ -16,7 +16,7 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" @@ -31,7 +31,7 @@ "10" ], "slow_down_layer_time": [ - "8" + "12" ], "filament_flow_ratio": [ "0.95" @@ -40,7 +40,7 @@ "1" ], "pressure_advance": [ - "0.05" + "0.04" ], "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json index bd7a5d17bd..d96fb21557 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "Qidi Generic PETG", "reduce_fan_stop_start_freq": [ "1" ], @@ -16,7 +16,7 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" @@ -31,7 +31,7 @@ "10" ], "slow_down_layer_time": [ - "8" + "12" ], "filament_flow_ratio": [ "0.95" @@ -40,7 +40,7 @@ "1" ], "pressure_advance": [ - "0.05" + "0.04" ], "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json index 88e7d4a18f..98e60a99d1 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pet", + "inherits": "Qidi Generic PETG", "reduce_fan_stop_start_freq": [ "1" ], @@ -16,7 +16,7 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" @@ -31,7 +31,7 @@ "10" ], "slow_down_layer_time": [ - "8" + "12" ], "filament_flow_ratio": [ "0.95" @@ -40,7 +40,7 @@ "1" ], "pressure_advance": [ - "0.05" + "0.04" ], "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json index 45f2685624..f112205505 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json @@ -91,25 +91,33 @@ "0.05" ], "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", + "Qidi X-Smart 3 0.2 nozzle", + "Qidi X-Plus 3 0.2 nozzle", + "Qidi X-Max 3 0.2 nozzle", "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle", - "Qidi X-Smart 3 0.4 nozzle", - "Qidi X-Plus 3 0.4 nozzle", - "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", "Qidi X-Max 0.6 nozzle", "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", "Qidi X-Plus 0.8 nozzle", "Qidi X-Max 0.8 nozzle", "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle", + "Qidi Q1 Pro 0.2 nozzle", "Qidi Q1 Pro 0.4 nozzle", "Qidi Q1 Pro 0.6 nozzle", - "sQidi Q1 Pro 0.8 nozzle" + "Qidi Q1 Pro 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG.json b/resources/profiles/Qidi/filament/Qidi Generic PETG.json index 31f0e2acc5..f23903b871 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG.json @@ -16,52 +16,59 @@ "30" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" ], "fan_max_speed": [ - "90" - ], - "fan_min_speed": [ "40" ], - "slow_down_min_speed": [ + "fan_min_speed": [ "10" ], + "slow_down_min_speed": [ + "20" + ], "slow_down_layer_time": [ - "8" + "12" ], "filament_flow_ratio": [ "0.95" ], "filament_max_volumetric_speed": [ - "9" + "12" ], "enable_pressure_advance": [ "1" ], "pressure_advance": [ - "0.042" + "0.04" + ], + "filament_density":[ + "1.27" ], "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", "Qidi X-Max 0.6 nozzle", "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", - "Qidi X-Plus 0.8 nozzle", - "Qidi X-Max 0.8 nozzle", - "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle" + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json index a45234ae21..8a7d1c3ae9 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -5,12 +5,12 @@ "name": "Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pla", + "inherits": "Qidi Generic PLA", "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ - "5" + "8" ], "enable_pressure_advance": [ "1" @@ -19,7 +19,7 @@ "0.042" ], "filament_max_volumetric_speed": [ - "2" + "14" ], "compatible_printers": [ "Qidi Q1 Pro 0.2 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json index 87d3bece30..4a87b977dc 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -8,9 +8,9 @@ "filament_settings_id": [ "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "full_fan_speed_layer": [ - "3" + "0" ], "hot_plate_temp": [ "60" @@ -22,7 +22,7 @@ "is_custom_defined": "0", "name": "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", "nozzle_temperature": [ - "220" + "210" ], "slow_down_min_speed": [ "20" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json index 59b31e5f01..6668f94448 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -5,12 +5,12 @@ "name": "Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pla", + "inherits": "Qidi Generic PLA", "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ - "5" + "8" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json index 979091ebad..b25ce10154 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -5,12 +5,12 @@ "name": "Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pla", + "inherits": "Qidi Generic PLA", "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ - "5" + "8" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json index eac3229bde..78a3483c14 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json @@ -5,12 +5,12 @@ "name": "Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pla", + "inherits": "Qidi Generic PLA", "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ - "5" + "8" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json index 0c73db382a..75e046ea47 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json @@ -5,12 +5,12 @@ "name": "Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pla", + "inherits": "Qidi Generic PLA", "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ - "5" + "8" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json index 21c563ab66..b593ed0f3b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json @@ -5,12 +5,12 @@ "name": "Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_filament_pla", + "inherits": "Qidi Generic PLA", "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ - "5" + "8" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json index d9287994ef..e99189fd80 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json @@ -6,42 +6,60 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", + "enable_pressure_advance":"1", + "pressure_advance": [ + "0.032" + ], + "nozzle_temperature_initial_layer":[ + "220" + ], "filament_max_volumetric_speed": [ - "12" + "7.5" ], "filament_retraction_length": [ "0.5" ], + "filament_flow_ratio": [ "0.98" ], "slow_down_layer_time": [ "8" ], + "hot_plate_temp_initial_layer" : [ + "55" + ], + "hot_plate_temp" : [ + "55" + ], "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", + "Qidi X-Smart 3 0.2 nozzle", + "Qidi X-Plus 3 0.2 nozzle", + "Qidi X-Max 3 0.2 nozzle", "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", "Qidi X-Max 0.6 nozzle", "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", - "Qidi X-Plus 0.8 nozzle", - "Qidi X-Max 0.8 nozzle", - "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle", - "Qidi X-Smart 3 0.2 nozzle", - "Qidi X-Plus 3 0.2 nozzle", - "Qidi X-Max 3 0.2 nozzle", - "Qidi Q1 Pro 0.2 nozzle", - "Qidi Q1 Pro 0.4 nozzle", - "Qidi Q1 Pro 0.6 nozzle", - "Qidi Q1 Pro 0.8 nozzle" + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle", + "Qidi Q1 Pro 0.2 nozzle", + "Qidi Q1 Pro 0.4 nozzle", + "Qidi Q1 Pro 0.6 nozzle", + "Qidi Q1 Pro 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json index 4989e95f0c..c1cf194a38 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json @@ -10,16 +10,16 @@ "40" ], "filament_flow_ratio": [ - "0.95" + "0.96" ], "filament_type": [ "PLA-CF" ], "filament_max_volumetric_speed": [ - "12" + "9" ], "slow_down_layer_time": [ - "7" + "8" ], "additional_cooling_fan_speed": [ "0" @@ -33,35 +33,34 @@ "nozzle_temperature_range_high": [ "240" ], - "nozzle_temperature": [ - "230" - ], - "enable_pressure_advance": [ - "1" - ], - "pressure_advance": [ - "0.031" - ], "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", + "Qidi X-Smart 3 0.2 nozzle", + "Qidi X-Plus 3 0.2 nozzle", + "Qidi X-Max 3 0.2 nozzle", "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", "Qidi X-Max 0.6 nozzle", "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", - "Qidi X-Plus 0.8 nozzle", - "Qidi X-Max 0.8 nozzle", - "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle", - "Qidi Q1 Pro 0.4 nozzle", - "Qidi Q1 Pro 0.6 nozzle", - "Qidi Q1 Pro 0.8 nozzle" + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle", + "Qidi Q1 Pro 0.2 nozzle", + "Qidi Q1 Pro 0.4 nozzle", + "Qidi Q1 Pro 0.6 nozzle", + "Qidi Q1 Pro 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA.json b/resources/profiles/Qidi/filament/Qidi Generic PLA.json index 4068d39487..ebcf828405 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA.json @@ -1,16 +1,16 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Qidi Generic PLA", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", - "filament_flow_ratio": [ + "filament_flow_ratio": [ "0.98" ], "filament_max_volumetric_speed": [ - "12" + "14" ], "slow_down_layer_time": [ "8" @@ -19,25 +19,29 @@ "1" ], "pressure_advance": [ - "0.032" + "0.031" ], - "compatible_printers": [ + "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle", - "Qidi X-Smart 3 0.4 nozzle", - "Qidi X-Plus 3 0.4 nozzle", - "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", "Qidi X-Max 0.6 nozzle", "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", "Qidi X-Plus 0.8 nozzle", "Qidi X-Max 0.8 nozzle", "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle" - ] -} \ No newline at end of file + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PVA.json b/resources/profiles/Qidi/filament/Qidi Generic PVA.json index ca1b3c2bcc..93bb0e381a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PVA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PVA.json @@ -19,29 +19,33 @@ "10" ], "compatible_printers": [ + "Qidi X-Plus 0.2 nozzle", + "Qidi X-Max 0.2 nozzle", + "Qidi X-CF Pro 0.2 nozzle", + "Qidi X-Smart 3 0.2 nozzle", + "Qidi X-Plus 3 0.2 nozzle", + "Qidi X-Max 3 0.2 nozzle", "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", "Qidi X-CF Pro 0.4 nozzle", "Qidi X-Smart 3 0.4 nozzle", "Qidi X-Plus 3 0.4 nozzle", "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Plus 0.6 nozzle", "Qidi X-Max 0.6 nozzle", "Qidi X-CF Pro 0.6 nozzle", - "Qidi X-Smart 3 0.6 nozzle", - "Qidi X-Plus 3 0.6 nozzle", - "Qidi X-Max 3 0.6 nozzle", - "Qidi X-Plus 0.8 nozzle", - "Qidi X-Max 0.8 nozzle", - "Qidi X-CF Pro 0.8 nozzle", - "Qidi X-Smart 3 0.8 nozzle", - "Qidi X-Plus 3 0.8 nozzle", - "Qidi X-Max 3 0.8 nozzle", - "Qidi X-Smart 3 0.2 nozzle", - "Qidi X-Plus 3 0.2 nozzle", - "Qidi X-Max 3 0.2 nozzle", - "Qidi Q1 Pro 0.2 nozzle", - "Qidi Q1 Pro 0.4 nozzle", - "Qidi Q1 Pro 0.6 nozzle", - "Qidi Q1 Pro 0.8 nozzle" + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle", + "Qidi Q1 Pro 0.2 nozzle", + "Qidi Q1 Pro 0.4 nozzle", + "Qidi Q1 Pro 0.6 nozzle", + "Qidi Q1 Pro 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json new file mode 100644 index 0000000000..3f5a9bc852 --- /dev/null +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json @@ -0,0 +1,39 @@ +{"type": "filament", +"filament_id": "GFB99", +"setting_id": "GFSA04", +"instantiation": "true", + "fan_cooling_layer_time": [ + "60" + ], + "filament_max_volumetric_speed": [ + "4" + ], + "filament_settings_id": [ + "Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle" + ], + "from": "system", + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "inherits": "Qidi Generic TPU 95A", + "is_custom_defined": "0", + "name": "Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.1" + ], + "compatible_printers": [ + "Qidi Q1 Pro 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json new file mode 100644 index 0000000000..b27676fa35 --- /dev/null +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json @@ -0,0 +1,51 @@ +{ + "type": "filament", + "filament_id": "GFU99", + "setting_id": "GFSR99", + "name": "Qidi Generic TPU 95A", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_tpu", + "filament_max_volumetric_speed": [ + "4" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.1" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature": [ + "230" + ], + "filament_density": [ + "1.21" + ], + "filament_flow_ratio": [ + "1" + ], + "compatible_printers": [ + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle", + "Qidi X-Max 0.6 nozzle", + "Qidi X-CF Pro 0.6 nozzle", + "Qidi X-Smart 3 0.6 nozzle", + "Qidi X-Plus 3 0.6 nozzle", + "Qidi X-Max 3 0.6 nozzle", + "Qidi X-Plus 0.8 nozzle", + "Qidi X-Max 0.8 nozzle", + "Qidi X-CF Pro 0.8 nozzle", + "Qidi X-Smart 3 0.8 nozzle", + "Qidi X-Plus 3 0.8 nozzle", + "Qidi X-Max 3 0.8 nozzle", + "Qidi Q1 Pro 0.4 nozzle", + "Qidi Q1 Pro 0.6 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json index 6d0e15e2a0..a64de438a1 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json @@ -11,7 +11,7 @@ "filament_settings_id": [ "Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "inherits": "Qidi Generic TPU", "is_custom_defined": "0", "name": "Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", @@ -19,7 +19,7 @@ "230" ], "nozzle_temperature_initial_layer": [ - "220" + "230" ], "compatible_printers": [ diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json index 84a25b23ce..1bc87b6bc3 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json @@ -17,7 +17,7 @@ "filament_settings_id": [ "Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], @@ -31,7 +31,7 @@ "250" ], "pressure_advance": [ - "0.082" + "0.04" ], "slow_down_layer_time": [ "4" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json index 6416f28ace..2db0187cc3 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json @@ -17,7 +17,7 @@ "filament_settings_id": [ "Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json index 8d7927f985..db1e75811b 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json @@ -17,7 +17,7 @@ "filament_settings_id": [ "Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "100" ], @@ -31,7 +31,7 @@ "250" ], "pressure_advance": [ - "0.082" + "0.04" ], "slow_down_layer_time": [ "4" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json index 4098bb90e2..b5f8921369 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json @@ -21,8 +21,26 @@ "overhang_fan_speed": [ "60" ], - "filament_start_gcode": [ - "; filament start gcode\nM141 S55\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" + "max_fan_speed":[ + "40" + ], + "min_fan_speed":[ + "10" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "hot_plate_temp" : [ + "100" + ], + "slow_down_layer_time": [ + "4" + ], + "filament_density":[ + "1.19" + ], + "chamber_temperature": [ + "55" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Qidi PLA-CF.json b/resources/profiles/Qidi/filament/Qidi PLA-CF.json new file mode 100644 index 0000000000..dda26e182f --- /dev/null +++ b/resources/profiles/Qidi/filament/Qidi PLA-CF.json @@ -0,0 +1,42 @@ +{ + "type": "filament", + "filament_id": "GFL98", + "setting_id": "GFSL98", + "name": "Qidi PLA-CF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.96" + ], + "filament_type": [ + "PLA-CF" + ], + "filament_max_volumetric_speed": [ + "9" + ], + "temperature": [ + "230" + ], + "first_layer_temperature": [ + "230" + ], + "filament_density": [ + "1.25" + ], + "extrusion_multiplier": [ + "0.96" + ], + "advance_pressure": [ + "0.02" + ], + + "compatible_printers": [ + "Qidi X-Plus 0.4 nozzle", + "Qidi X-Max 0.4 nozzle", + "Qidi X-CF Pro 0.4 nozzle", + "Qidi X-Smart 3 0.4 nozzle", + "Qidi X-Plus 3 0.4 nozzle", + "Qidi X-Max 3 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json index f7468558ec..91a4c272c5 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json @@ -11,7 +11,7 @@ "filament_settings_id": [ "Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "60" ], @@ -22,10 +22,10 @@ "is_custom_defined": "0", "name": "Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", "nozzle_temperature": [ - "250" + "230" ], "nozzle_temperature_initial_layer": [ - "220" + "230" ], "compatible_printers": [ "Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json index a9d22a8ccb..b92f99f0ac 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json @@ -11,7 +11,7 @@ "filament_settings_id": [ "Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle" ], - "from": "User", + "from": "system", "hot_plate_temp": [ "60" ], @@ -22,10 +22,10 @@ "is_custom_defined": "0", "name": "Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle", "nozzle_temperature": [ - "250" + "230" ], "nozzle_temperature_initial_layer": [ - "220" + "230" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json index 99c6387226..c17dcfb87a 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json @@ -7,7 +7,7 @@ "instantiation": "true", "inherits": "fdm_filament_tpu", "filament_max_volumetric_speed": [ - "6" + "4" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/fdm_filament_abs.json b/resources/profiles/Qidi/filament/fdm_filament_abs.json index ed997e0881..0a2551e03b 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_abs.json +++ b/resources/profiles/Qidi/filament/fdm_filament_abs.json @@ -5,28 +5,28 @@ "instantiation": "false", "inherits": "fdm_filament_common", "cool_plate_temp" : [ - "95" + "90" ], "eng_plate_temp" : [ - "95" + "90" ], "hot_plate_temp" : [ - "95" + "90" ], "textured_plate_temp" : [ - "95" + "90" ], "cool_plate_temp_initial_layer" : [ - "95" + "90" ], "eng_plate_temp_initial_layer" : [ - "95" + "90" ], "hot_plate_temp_initial_layer" : [ - "95" + "90" ], "textured_plate_temp_initial_layer" : [ - "95" + "90" ], "slow_down_for_layer_cooling": [ "1" @@ -38,13 +38,13 @@ "30" ], "filament_max_volumetric_speed": [ - "15" + "20" ], "filament_type": [ "ABS" ], "filament_density": [ - "1.04" + "1.24" ], "filament_cost": [ "20" @@ -83,6 +83,6 @@ "10" ], "slow_down_layer_time": [ - "5" + "4" ] } diff --git a/resources/profiles/Qidi/filament/fdm_filament_common.json b/resources/profiles/Qidi/filament/fdm_filament_common.json index ec1a0103f5..d04f771b95 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_common.json +++ b/resources/profiles/Qidi/filament/fdm_filament_common.json @@ -129,16 +129,20 @@ "slow_down_layer_time": [ "8" ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >90)||(bed_temperature_initial_layer[current_extruder] >90)}M106 P3 S0\n{elsif(bed_temperature[current_extruder] >70)||(bed_temperature_initial_layer[current_extruder] >70)}M106 P3 S153\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{endif}" - ], - "filament_end_gcode": [ - "; filament end gcode \nM106 P3 S0" - ], "nozzle_temperature": [ "200" ], "temperature_vitrification": [ "100" - ] + ], + "during_print_exhaust_fan_speed":[ + "100" + ], + "activate_air_filtration":[ + "1" + ], + "activate_chamber_temp_control": [ + "0" + ], + "compatible_printers": [] } diff --git a/resources/profiles/Qidi/filament/fdm_filament_pla.json b/resources/profiles/Qidi/filament/fdm_filament_pla.json index 6e162b00f9..24bbf363bf 100644 --- a/resources/profiles/Qidi/filament/fdm_filament_pla.json +++ b/resources/profiles/Qidi/filament/fdm_filament_pla.json @@ -20,28 +20,28 @@ "20" ], "cool_plate_temp" : [ - "55" + "60" ], "eng_plate_temp" : [ - "55" + "60" ], "hot_plate_temp" : [ - "55" + "60" ], "textured_plate_temp" : [ - "55" + "60" ], "cool_plate_temp_initial_layer" : [ - "55" + "60" ], "eng_plate_temp_initial_layer" : [ - "55" + "60" ], "hot_plate_temp_initial_layer" : [ - "55" + "60" ], "textured_plate_temp_initial_layer" : [ - "55" + "60" ], "nozzle_temperature_initial_layer": [ "210" @@ -68,7 +68,7 @@ "2" ], "full_fan_speed_layer": [ - "4" + "0" ], "nozzle_temperature": [ "220" @@ -83,10 +83,10 @@ "230" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "4" + "8" ], "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json index 41e53258ef..3d315713fb 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi Q1 Pro", "printer_variant": "0.2", "default_filament_profile": [ - "QIDI PLA Rapido;QIDI PETG;QIDI ABS Rapido" + "Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi Q1 Pro 0.2 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json index 52709182de..22fc68b7ff 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json @@ -27,13 +27,13 @@ "245x245", "208x245" ], - "printable_height": "245", + "printable_height": "240", "nozzle_type": "hardened_steel", "max_layer_height": [ - "0.3" + "0.28" ], "min_layer_height": [ - "0.07" + "0.08" ], "printer_settings_id": "Qidi", "retraction_minimum_travel": [ @@ -43,7 +43,7 @@ "0.8" ], "retract_length_toolchange": [ - "10" + "2" ], "deretraction_speed": [ "0" @@ -65,6 +65,6 @@ "machine_start_gcode": "PRINT_START BED=[first_layer_bed_temperature] HOTEND=[first_layer_temperature] CHAMBER=[chamber_temperature]\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[first_layer_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 6}\nG1 Z1 F600", "thumbnails_format": "PNG", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json index 1bfefcd782..d54f5ec513 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi Q1 Pro", "printer_variant": "0.6", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle" ], "default_print_profile": "0.30mm Standard @Qidi Q1 Pro 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json index 397df43462..d6c7a27798 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi Q1 Pro", "printer_variant": "0.8", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle" ], "default_print_profile": "0.40mm Standard @Qidi Q1 Pro 0.8 nozzle", "max_layer_height": [ @@ -21,7 +21,7 @@ "0.16" ], "retract_length_toolchange": [ - "3" + "10" ], "retraction_length": [ "3" diff --git a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json index 62a6acc62c..d869a61f6b 100644 --- a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json @@ -89,7 +89,7 @@ "2" ], "retract_length_toolchange": [ - "10" + "2" ], "deretraction_speed": [ "0" @@ -100,7 +100,7 @@ "default_filament_profile": [ "Qidi Generic PLA" ], - "machine_start_gcode": "G28\nG92 E0\nG0 X5 Y5 Z0.3 F3600\n", + "machine_start_gcode": "G28\nM140 S[hot_plate_temp_initial_layer]\nM190 S[hot_plate_temp_initial_layer]\nM109 S[nozzle_temperature_initial_layer]\nG92 E-19\nG0 Y5 Z0.3 F3600\nG1 X5 E0 F2400\n", "machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n", "scan_first_layer": "0" } \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json index 2505730d9e..0a04225405 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json @@ -89,7 +89,7 @@ "2" ], "retract_length_toolchange": [ - "10" + "2" ], "deretraction_speed": [ "0" diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json index 8921e1cc41..4915207a68 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Max 3", "printer_variant": "0.2", "default_filament_profile": [ - "QIDI PLA Rapido 0.2 nozzle;QIDI PETG Tough 0.2 nozzle;QIDI ABS Rapido 0.2 nozzle" + "Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi XMax3 0.2 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json index e22bca8b0e..6d15b376e0 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json @@ -21,20 +21,20 @@ "nozzle_type": "hardened_steel", "auxiliary_fan": "1", "max_layer_height": [ - "0.32" + "0.28" ], "min_layer_height": [ - "0.07" + "0.08" ], "printer_settings_id": "Qidi", "retraction_minimum_travel": [ "1" ], "retraction_length": [ - "0.8" + "1" ], "retract_length_toolchange": [ - "10" + "2" ], "deretraction_speed": [ "0" @@ -43,6 +43,6 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ] } \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json index 5f167207b6..566afbb4f7 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Max 3", "printer_variant": "0.6", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ], "default_print_profile": "0.30mm Standard @Qidi XMax3 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json index f2b9122af1..335d5c9168 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Max 3", "printer_variant": "0.8", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ], "default_print_profile": "0.40mm Standard @Qidi XMax3 0.8 nozzle", "max_layer_height": [ @@ -21,7 +21,7 @@ "0.16" ], "retract_length_toolchange": [ - "3" + "10" ], "retraction_length": [ "3" diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json index c722d7ca34..ce361e8f2c 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json @@ -89,7 +89,7 @@ "2" ], "retract_length_toolchange": [ - "10" + "2" ], "deretraction_speed": [ "0" diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json index c29bdd6655..9f56f59c1e 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 3", "printer_variant": "0.2", "default_filament_profile": [ - "QIDI PLA Rapido 0.2 nozzle;QIDI PETG Tough 0.2 nozzle;QIDI ABS Rapido 0.2 nozzle" + "Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi XPlus3 0.2 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json index c63f6028a5..199f9a9430 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json @@ -20,20 +20,20 @@ "printable_height": "270", "nozzle_type": "hardened_steel", "max_layer_height": [ - "0.3" + "0.28" ], "min_layer_height": [ - "0.07" + "0.08" ], "printer_settings_id": "Qidi", "retraction_minimum_travel": [ "1" ], "retraction_length": [ - "0.8" + "1" ], "retract_length_toolchange": [ - "10" + "2" ], "deretraction_speed": [ "0" @@ -42,6 +42,6 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ] } \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json index d635074a5b..90dd0d1cde 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 3", "printer_variant": "0.6", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ], "default_print_profile": "0.30mm Standard @Qidi XPlus3 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json index 5b51b03bf9..6e97b82248 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 3", "printer_variant": "0.8", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ], "default_print_profile": "0.40mm Standard @Qidi XPlus3 0.8 nozzle", "max_layer_height": [ @@ -21,7 +21,7 @@ "0.16" ], "retract_length_toolchange": [ - "3" + "10" ], "retraction_length": [ "3" diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json index 059c5aeacd..2c29bd399f 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Smart 3", "printer_variant": "0.2", "default_filament_profile": [ - "QIDI PLA Rapido 0.2 nozzle;QIDI PETG Tough 0.2 nozzle;QIDI ABS Rapido 0.2 nozzle" + "Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi XSmart3 0.2 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json index c923615783..a11de84792 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json @@ -34,7 +34,7 @@ "0.8" ], "retract_length_toolchange": [ - "10" + "2" ], "deretraction_speed": [ "0" @@ -43,6 +43,6 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ] } \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.6 nozzle.json index 1902dc1898..f2b95c9740 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Smart 3", "printer_variant": "0.6", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ], "default_print_profile": "0.30mm Standard @Qidi XSmart3 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.8 nozzle.json index 7e7cfa7a11..6c56efc5df 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Smart 3", "printer_variant": "0.8", "default_filament_profile": [ - "QIDI PLA Rapido" + "Qidi Generic PLA" ], "default_print_profile": "0.40mm Standard @Qidi XSmart3 0.8 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/fdm_machine_common.json b/resources/profiles/Qidi/machine/fdm_machine_common.json index b81b6b2a41..94bcd6b7e5 100644 --- a/resources/profiles/Qidi/machine/fdm_machine_common.json +++ b/resources/profiles/Qidi/machine/fdm_machine_common.json @@ -8,7 +8,7 @@ "40" ], "extruder_colour": [ - "#FCE94F" + "" ], "extruder_offset": [ "0x0" @@ -64,7 +64,7 @@ "0" ], "max_layer_height": [ - "0.32" + "0.28" ], "min_layer_height": [ "0.08" @@ -79,19 +79,19 @@ "printer_settings_id": "", "printer_variant": "0.4", "retraction_minimum_travel": [ - "2" + "1" ], "retract_before_wipe": [ - "70%" + "0%" ], "retract_when_changing_layer": [ "1" ], "retraction_length": [ - "5" + "1" ], "retract_length_toolchange": [ - "1" + "2" ], "z_hop": [ "0" @@ -103,7 +103,7 @@ "0" ], "retraction_speed": [ - "60" + "30" ], "single_extruder_multi_material": "0", "change_filament_gcode": "", @@ -111,7 +111,7 @@ "1" ], "z_lift_type": "NormalLift", - "default_print_profile": "0.20mm Standard @Qidi XMax3", + "default_print_profile": "", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_start_gcode": "G28\nG0 Z50 F600\nM190 S[first_layer_bed_temperature]\nG28 Z\nG29 ; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[first_layer_temperature]\nM83\nG0 Z5 F1200\nG0 X{first_layer_print_min[0]} Y{max(0, first_layer_print_min[1] - 2)} F12000\nG0 Z0.2 F600\nG1 E3 F1800\nG0 Z0.3 F600\nG1 X{min(first_layer_print_min[0] + 30,print_bed_max[0])} E6 F600", "machine_end_gcode": "M104 S0\nM140 S0\nG92 E0\nG1 E-3 F1800\nG90\n{if max_layer_z < max_print_height / 2}\nG1 Z{max_print_height / 2 + 10} F600\n{else}\nG1 Z{min(max_print_height, max_layer_z + 10)}\n{endif}\nG0 X5 Y{print_bed_max[1]-11} F12000\nM141 S0" diff --git a/resources/profiles/Qidi/process/fdm_process_common.json b/resources/profiles/Qidi/process/fdm_process_common.json index 779c5b1ddf..8da0fd26b7 100644 --- a/resources/profiles/Qidi/process/fdm_process_common.json +++ b/resources/profiles/Qidi/process/fdm_process_common.json @@ -13,7 +13,7 @@ "default_acceleration": "10000", "bridge_no_support": "0", "elefant_foot_compensation": "0.1", - "outer_wall_line_width": "0.4", + "outer_wall_line_width": "0.42", "outer_wall_speed": "120", "line_width": "0.45", "infill_direction": "45", diff --git a/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json b/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json index 686376d56a..c5eb0d7061 100644 --- a/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json +++ b/resources/profiles/Qidi/process/fdm_process_qidi_x3_common.json @@ -85,7 +85,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion":"0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -94,16 +94,16 @@ "support_object_xy_distance": "0.35", "tree_support_branch_diameter": "2", "tree_support_branch_angle": "45", - "tree_support_wall_count": "1", - "detect_thin_wall": "1", + "tree_support_wall_count": "0", + "detect_thin_wall": "0", "top_surface_pattern": "monotonicline", "top_surface_line_width": "0.42", "top_surface_acceleration": "2000", "top_surface_speed": "200", - "top_shell_layers": "4", + "top_shell_layers": "3", "top_shell_thickness": "0.8", "travel_speed": "500", - "enable_prime_tower": "0", + "enable_prime_tower": "1", "independent_support_layer_height": "0", "wipe_tower_no_sparse_layers": "0", "prime_tower_width": "35", @@ -115,6 +115,6 @@ "internal_solid_infill_pattern": "monotonic", "initial_layer_travel_speed": "50%", "filter_out_gap_fill": "2", - "notes": "", + "notes": "If you want to use Orca's chamber temperature control feature, check that printer.cfg has added the following M191 macro.\nTo add it: go to Fluidd web interface--configuration, copy the following code to the top of the printer.cfg document, SAVE&RESATART \n\n[gcode_macro M191]\ngcode:\n {% set s = params.S|float %}\n {% if s == 0 %}\n # If target temperature is 0, do nothing\n M117 Chamber heating cancelled\n {% else %}\n SET_HEATER_TEMPERATURE HEATER=chamber_heater TARGET={s}\n # Orca: uncomment the following line if you want to use heat bed to assist chamber heating\n M140 S90\n TEMPERATURE_WAIT SENSOR=\"heater_generic chamber_heater\" MINIMUM={s-1} MAXIMUM={s+1}\n M117 Chamber at target temperature\n {% endif %}", "exclude_object": "1" } diff --git a/resources/profiles/Qidi/qidi_xmax3_buildplate_model.stl b/resources/profiles/Qidi/qidi_xmax3_buildplate_model.stl index f6ea715fd75aa888852d19c16cbb5f11a97f3d04..ee8fc101a4abbc4950c107325f1c871585cdd4d6 100644 GIT binary patch literal 28684 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 raQjyjaNrl98a?z#zA|7Sg}4x zkSG7=GjZg~&sXH20LrG1<_ES-1V?vm;LHPv=nQzV{I<1@vwqgZpTK`1l@ zmcv#HMd1x2-odj&dNGbOi0VW|v^`bXdC%4RCA&~aj#dj#y*kG`cCNICJrQ+{GFAI^ zj}Ugw57YyyR7u&Tw!G0Lh`injG=44-3OhddX?BC7y^c8wfjFE)5p5r5H}*&L5)_i7 z)!GVm_@tINwrJs4GnSQ++aeWh*pox+u~%}0uycNxstdgus47#m>2~fx?UJa!EjBtP zmnTPdNqcGMM>XMEaaiQrz9OQzeQ}2YIdc_Rus28E3SkBjwXRq22%)OB*(Eya0d)Po zPuwTwRmQtSt~i`TG2!yJsT{#~6aky($4o>V7GY0nRuf)^sB5sR!v8Z6Rrwu&dL@S- zZ1FshE18256IB5{IP50}qOZU~TR8$jhNy?uT=;y7#_pnj)P!APXHn;q?7^}fv0{B# zbM6MhP8+&sKKyuipJNe@EC?UHYkznzB|^}xaEs8s(mmL-l8B1KIqWR73*QE@ zcH}w}0}*IN}Kg-#2O(iQ|~qWibkUhjJLKI>e`ftzg3+Ry&&wf5(` z-+g}a((|j6-+$=`C%^UW^Ut3D=J^ZHoZNfi`4?XN?ptrY_1}{Z{`uu+rfGlwbC-Vl zx7XHF`Mh`K#nm*OKAfg`9qDPhbK=LV+fUo~H?ESPB`2oo#??nZIlT0<*MD9$NJLuN zS5~k6*)>Sek`vPS>pxEHKKuBOnjcYC(9`tF&gIoVe|4t%*Auklgf#y3+3)O@zp4?$ zG~NF2?CSA1zh256HF9EJlZf=Z?xTD0?&GCBzER7K^t`_I(G#mz{(ioGAH@Ft8)sx*|!tzLi0HJp%#wB&>|*d8Pz-AAD(A|})$A&tHNeEzKZs@00I zdh{TR+crYplJK-NRJMKQ-3#xWKDc@Ft2OS^bf#!n`jwsU9az6oFY)}PX1lbIP)Wc2 z%~P!fw-L;B=l)L78;DsNw4B>Nb@1=spR46kdwZ=&Ow(5m{&3mo?F4f@eC*`GFCGC= zYBbeaQJuNoyK?!!#`zd4T1ZUO6UFmPg9LNkIq|~-o3BO3}A!s2{^j3LvY3YgMTiS!fG)1ltUjFjR+rMu?T6*G3OOM%3eDHGQx_0cu zYNIFCSkclGU)=1w8^pC^k?Z~Ej<53ZK}%0Owq-<-c>lS`RiaS*uo2vQPD@WbR{Z#X z#56^&n1jcjNJ~%n?6XOPg@kJ8vr_K|XEo-sxILZBKD4L>AG&V2SkiV466#~GzME;V zEatlQ(eZ;=)qFT<4AMeEW98PznFa~wx_I}=gILv?M(v5Tkg!?eYkjO{)rtgj-Tv^@ zf$s+TSkXd4vt8~73FguqoJW@y&F$WTENQ7#^@A1?wytE+CBa-=9~X@pT@uX2RiY>Q zc{k=-?f^%^cd66FIk-fmjB~6XrAGQ_ZV!UFxC87pXd&_Nv7Ife0SV^f{;}7fg+$pu zY*{}@FxR>Lv;Ar?SI3LzwA{IWuEfW77A$Fdtw>yW=cz3-HOpeIGK2Q>?oumSMEI=6 zlD5~11ow|UK?@1jV>+Pad_WlN!x2hg1e7}sIlS`_B8G6m7Y@m_!hsTB$H zJoiK2T5q^{^VFfYv-RCPR?)+IV&~8_$6ms+N~D)u4_)6m+}7q{v1nR5v!pS)Q7aO+ zKHfR(+I&{?sRhkqF)_lUtCI3qg@uIqk+q=J*UDlpivozHRh^VJitbvv`1xkHY$PNw+8Qcl$tf|i_UXMOkD+3QRq(mGG%lUF(GTL@ZmLK@{n z_+C3ho=HTyKVj<$J`d)EG<5FT&R)A%@d<)a=!kMc>(6BKnna|ff#{aAVn5UCi8yl_ z30i{I$u>{C5M5Yw-X6JPt(67|T5>`?5$#dV?tOKh*O6AOe07!v30iVO8jpP8cYiEn zTxYLy5E=jd!D}k45v#8}#dR}vWT>Pj6EjfYcZV*As$Cy!<_Gq;V zOHN3m^{Wjc%AME!OihB8oREg*kwR4s5|N(QoV9y`mYk4=<`KOKP-~Eg^t|p@0}{04 zgfujd=na!JNJLugq1n_|P7<`_gfxDA{VzLOpQI5zL+RMJ#rNBZ+A~To^j_(7^JCZj zupCz3NGn#{Efqf&f|i_+Mv3mOw+D$xtIf5p`yP%2Ejb~L(yw;CUy+Ek`Yv~tBxuPA zX{dZrY5@|Fu5FI}E(v*OWs@c$4aG^`OM^tDHJ5M~PJ))4kcQe@ttbT&k?wm;Pq6pp zgf!G|pLzeyx1|w1!_&UwP>)o9+fJw^%0)tH_)&7`qjGHb5^0Z>@2{HYm9V<|p2}$w z(rD4$AcFQ5bPW>L24=|#X|!I_{D`N9puO+91_|qZ?uXMPq|thN)gTdRAA_zz!uqXQ zazYwy)ZSBTkchO;CDxifVPo4YIU$WU`&11Qk?wm;Pp~iLgf#jcfImC?m{1?OVGZm8NIB7Rf9yNeXaF2FDQqx7qVur=H)IUx;|FG?CDB3+|fo+e#`M41g1OHN2bUdwxHk065f zJ)CQhusxMoazYwq_F0}kNJLtGsP$|f>j_$NLK++&@kVi8N4j{pyiptpT5_WGUEcxB zBqBXcaZ(74ONuTnIU$WUmuwJ0Pg9&_N`nL~IU$WU!|ke8BqBXcajGf}613!mG}=sE zHAqCds4r*8(jY-gPDrDzI8}p0r0q?UorOz-M4V=;_r+;;d@l{`8RoFe>qyHFy}{C% zzBEYCk`qls<3oOQWd%J=@eZMBECek%(PE`>UNuNWTH5|Dq{V6>Xvqm_wArWm5oHBk z-t#SQWu!rZmYk4An?3M4E5-o5n(D9`st}M2nT42df5&NXrku zvDIR=5VYikG)fEVxwiQcWd&{Pp!c4h(7NQ7oRCH-U(e@NgG8i#J@@fJ!q!)_XY9>k_HJ{azYwf1LeK^AQ5TJSAI828YF1R32AV*L?Y7iLpMzG{Z&|UqG>F< zC6*Ow%~yU`O@6dFvGn*i&d`z*Emn26q&wRrA}v4s&RvUDCGpIS zgfvQ=mi-lpNcVf9o{0TUdBcleiNyEP(6f=f_mU?%2ebDBJmrkD@8>%t;uaz_ zB!iP1{!)u)K%+((MN55IZrmLlHApa*_V9M2aU^IVVLNhPYb{RY-{J=?B;wp})S!h# zneEE?m3}t?&#MM4B;roUsL>PtiwH%RYppyepIM5uu-sU8QL9SOLc&%b#A?x?g@o3U zu00ll77|(+?B45GD_ThK&P+d|NHCXH2Jh1gQ9Y-H1n>SVMDazvJ<4J(TN!*$Ew}Ac z$HB7OCc!&8Rb$Qw=87Hp*h^?3p?SWGE;PbILbG<)f(t5%-JGOC(dDm;L#bx#Ed+BxoTK>&HmYLLye5k)VY{tcfE*3kkKL{fcfRXdw~% zhmoL#MBJ=8ieRqT2aNkzX}V9IENiIXdw}&!y`cpi8!+!30g?R zNjiu+m(W5&CHai8w0WC-!a{;OwS{Q2PY}#y{$Wlmx%JVUs9zuXoan!4nb(S8H}BT$ zB50w;#;&g_h~Pa$d)sSw2RT-HKWHIgyJn-0BDA-5jTl`c5f+vkze7L^)>zR(!nABZ z-)r=QYUI0qrTsob3slvJx8Yi;t-IvG+T1ePEkgNsS9{ufvXq&!0tXyl`p77fjW2{J6 z6m;W)_e(~C_dR&Oge7gS6$##e841P1dP9F7F8c9Egrz6^hT!N2M^34GyGQ7Eys{Rw zTUutZeq?Euw7pg&?4A_be714OyIj0Grtv8M@=+TW-tpp{vaD8C7IRq?toFZyzu<8GOJn?`;N7tux$dJ;yHl?5J z62PxjVmWm^zkN??S;x!-@H z`6OB_!*)K#2=$}Q%*KebF28*Fd)wa#8(rP5Gu%IdwOo$46+ejCOg@AeGc0}pr1=mH z&&Q#y$E`$!5aL51tX<^Z(H=uWm<_$c2$LBhv0AiP32KUo#!8T*x&o`F@P(GM;^;yy z2N0~~b@dR4A$tog&&L=s-w*dm5#|SEJG$&g(UM$<7Ak*#h+2z%^5_Envo%|L{D>{F zQ@EG@0WCj|3^IbXiVQ7ANZWQql?Zq3gXV`KsK&%bW2{o~gSC_uA>2ZaRmoam#eSIQ zlQxPywgDMch@LC9y1Lyddtl3mT%YI@Xv-1fkw_4Y*$^|HHICK&Cl-cgV-iu&jDYQO zXg-7yDgtfsC{Y+fADVvnmGDE*Axmp$i4dK6%UWj7TQY?7JwMcQN66oZo5>>tY~YIg z;EK!2szP}Cll@#Y*$>F&2n1`nY&HndAp%wLvrulGAs6j zq6=0)NLyflD+OKG8~Gs!=c@=pml#%lpr4BtexeVWJ#MMCp(C|vF~fO?Vgsxg%?KNJ z#fOA3aVUBAy5hJYAB+%f-1`_Smt*vi^FWlN&Usxea}0|G%b@rH zFV*v4So??e%|^#Iip)095=Kx|W47krYR)I@!H*ijwd69iyd^{6zQk;Jo>dF;lKW)x z2qAtj!sT)PGk;V%4rii%Nc)Hz+V%60<>+!`A^H_YuxtpZcJi-3^_I26!tTR|ojW$I zZdrJEyRdMi%Y(~M_M_|n^#{K-yr(-zwMOVUh?jiwnBm@A4ps!C#oi1e&pOQH9m{K1 z!DQE!FI$;GbnpS(rnD9oKDf6=+`aa}DESEV45G7Gft9ueR`yn-nzW+v9CtX3Gr`&Ky+XG^+UI^mgJ-LY}SZ-$i|e`r03y>c&^oFT7$=m zeM;#U`}QqvNU6C?#;t45derId~#yB_b(3C^inZ=yIMVx`D23lxTI0crJZAM^soX z6}j}_(C?5B?+5U(Ml(V@$LAaMoZA&Yq%u4TjF3w2rM4FD6wl8(Xi2qDS6n4rJ-M#j z2Di)T8WEnrkKISLo@e%h{Y&ZF($BZZ$nfKjKJI$%=aTc*N9`IRRia}Fs-)5)do@B> zb%-q3`P_#pS>E?FsrJLQV*EUh?HR#Z+n3fU;>s)EyfT9b8>}U=;9ufF-`BUXe+to5)xM-S)r2M>!cI)6WiDJ{gUW(79;^TQC~ zlj!H86BO=CTE8#xnE^Qv8-x%)md*1dtXk*J=o;~GxdZrZiPfjxfBx1tJ?yA<>$46S zuKxC~_cFRh*y!U`qSnEk(KW&yfgc-pJbLx1cOIsB=4^5;q$H1D`@5y*{*OG#*?Y*T ztJ^>LNI{&mGD1g~x!`ys5BrhH22KpA;{ zY^+#|?ajB5$EQ3-u}>1+!TV#)YTvsaJ-qpShiFe_bdC6)^p6F}`OkOVwv}sFGB|kt zYlQcY3%~fT>sgEK)dC3V4qTw*`~i&5I@%pUKn!}qiaO*z3bWA z<$VP`i9p_^N-m5UK)6R83nFSk>#Fg(67EZ0iHx2_{B$DcHJWX(AKb3^)MmeQED468 zuYRzWN-WZ`FS~q^@2Pk`=Xt(H@N79k#NA*Z8nLm= zmBF#%K0kwqd~olo5i*uE|1R_S19?8zy25dsQ;^FYr>@T@;V#64=eD=pT9qCU<0*k-f%Dmhol1o}Wat zs)c*Gf}TYPGk5nEN32bMB8>-4T4>K0;`}!HA&< z`_=V4_aXk7f8<~Ok5Tji8F@C!2=qh!(JJSiT5s4 zkJds;kGM_ueWahhyj!%0=6*-dlR4709}Bx5HO_~k_lMvd%%BS^{bUDL6HhmrxG>aCVEjc2dGilDp(N(P~3iMn2 zgxW9!p2@U$p2SaB*j|mWE84Ch6kQ|Ck2J>*XBAI(Qab&s4OpcEKX6jRl_<}abTtcW z6I_)keM6ot{hqD-u$Ies8dW3Cy#JKu^AEo2w5xAFt$E!yj%jb+eQ^8t|8NP`qp979Ci*69^p|$gbO~VBT95fvHXO~wie<`gVxw(Jd@!R|NoqO<&ti=r7Hb38m zKlKwxLA36ZAYvUarPJWRQtO)VpTg~dpM{RC4p0HgJ&I%s742CsA zYPXl#y#cjrRjqZ!k@i@@UP{m1b4>FWr+#AFk3ad0hFNi4xs8nY;nyDDT==7p-|&?$ zF7_W_s}5>kxBeX~_5`}cb7~%AQo6c7qj}PkuGx0ix1JCy)zD&ejo7w)hW4m8 zd?ygxu8&0VlzVc7^AQJ62Yni;o?CcJ12X;4i$#vuU+^@=cF#UUl2S1zIFTB;RXF)jS#~tk7%y_{&O^oQ(B0wRgBqKIAU|N^SJHJwGaHk zjXdHo!y17+$kCyn3!?QA&ie=Q!MRE4b?;350Xr^IR({1Qv6VU=td3*NBBk>_b5#G4 zcbwCld(9u6CiNOx5`~sxMTnyxy}7^P`0dS8uDttn)?$WkJC9e-{O6;am%sD!JvZI{ z%${S#{lh&6+mxga_RwAB>`lPK_uSk{X3}@qf%swf-Mi3~h;|gL4 z2u5=ct`T-cxf?>!H9|aB8}OX_Hlu6AOFz7|KkW5efa;jL%c!LqA$}mb?nmpMix%c9 zWoWX_yD3Sm8jqFtBE(1h7^4kw*J?kXVg+$-ECyVJXVaZ5l@%d=Cf}}&Ay+V zb0g<~>saz1cjpnQ4jB|g>p6EDh$vS~N`qwZX>U*3*Bx=;vp%-s@+{&qsl>x4D$x-@ z*EY_VSlxQT`s+@XY8Nf7L})GSK3+%Em*4$~74|8mS6Qz;UJ$Hh^3wka!CKmbYa5%- zeqnRf`gQQUb5`)yWiYG};z#d(2ooLEz=S;)MD$?wL;D8&uq(=h(KSLwA0X14k-_~S z8_<@cL(V-`><478W5}v)zpx&aXEj`5bd7lbrEl#&x9246E9(4;Rl8`kej|#M(4_1K?R#CeyvkkNa zR(WL!0%DcYF7fWydM5+f7)Jgp1Tv^sJi3g=y+mdOj2xYLt~Rt?jx<%MYTK_|yTL>d zA&(Henn7BW8_$!oBF`mO!QEtI7?B2{Kp^K;bQwM4xgvoe?nSnioRvD>X{@AwFv8n) z+m0a5ClHpK+7F!xKnpP;?#QN&s5lRM82P{`Yy`sMGe#GLj&Q)5=Sx~w76q3p8#;#D3^RU-pejKysN!Fgs@)C<4} zN3JczBr4Hlt1&$vHZlnFAZIYMn#raqixK4BJoj2sZ+WzX48%;e2ZE|H&|w2e*Z^N= zqTIdO-M^8I>}?=8=ZtVWlQsf9gXr9Iv}+Ls_bgisr=!b=kVlC5J&ODYd+NFNT9I_d zVXb*K3d%F6esKQBth`5I^ckXEt`d{ObB&X-VlB2YMu3(aIUiv|vKg|~LfBAsMX;9T zUws-OD7su%BEtqoXRkN65eSUbmDc`PWt8}HTAmuhGBKXzs#)gXH5mjFZeOm zlGEZx@lSO-^F{KJuVgJ|I6^2aM|VT(HtIF{vUYFE7BBHU)|$nh%Gq9x;OJ%>uI2U| z?fV%50ne*;fpGM6bgOk>VMrMaw(uk74`gsgE88gk0g>k?{B_SoMh=MK2mzEFsNI}F z`Hxl~Sh);8Aj?laI!E}GG1|{VJ^av|Q$)35L?NmKG7x@%Rpu*apr!eDd7h0rR^&%S z!Q02*Y@=wgjbgh-aQ`^_Q|pIYU;BgTAMT%gE`P?`nmfLDI6es{*Ah{^r7DSjGmSvS zO`*LKomtn2R_jd0{i9;l8!O}^BFbn#KWRg~&3^DmRI0}r;cp#Xw~^7swt60{Sj%NF zaaKU5w0X;=&0)uWP@_AQ4`>NGa-)de5S_OREsvEUB8D}BwOqE`)QCw|&X8F_mY+Dv zxGSen`8t1MNDiYy+B(Lc3*jW`-q( z(9QQG5YR3mM2{Tm1FR}P%4k=7f(<`%K8jYU zM6~3#T^oOa$m6d3C;V`E65-ExTf1Y`J2I8!ZrShD(6$~OqHNC-6=BcFGP*+86G%LV zt3GWr8lU=#4SRB@V~MwG&&aC##Qh_{eG2XO)ar-)is$Xh-JVl=6xw3L^gHt$&nDg5 z(DJ+UY(xCOlRNk!IWPC^_Iz)`hCNBuSUD3~n~3|}!io@hz8kDuW^`s{&-Ay_GyN9P zwI}BOlsh7wl07|F1V0ORKj`_TetL*b48Lu)=FApt`onXs@e`;7XME49Fnbby-V0m3(%|q+T&jX#3tdjMzO4ehQjO&US)(Ba_YGehg$66|T z&b2EDjTNF0est!C))lNXn)9z~kXRYj(b}(|N+b$1Rhj*;wNyp0mdnucmI8rwPDfw` zRP*7{wW^HX94n(hU>`srT(-WV2%zOXH4-aXcb*Hn)MDLn;@2R0(T&bm2Ms6o^g`m|sWpx!iT=9de$jr|++D-+(LQClh|h;WqO9 zkK2&5BYPto$_QA#W3ACOBJQv3z9jCD#3%Qo_=lGLi1z`Qx472|gvj~3C$62JJo|l# zd5%5pgf58jJsh_i3}5IYa{z!8|-`KO62*2t1>0oA=JnYA+<53g^{5~$iCNJ_PsXP z_sTQp6sx=gLiWQovLCL;emM4)ckgh2OiA_*_Of@d$KFBSS;PI2#~7K_UU@_>dk1?& z*tKlGAokg5q`9S(WH)XvyKx)r#^v2q><9a&`;Z&ihumNvGDny9k#P)#%KDAH?BCVs zdb_q~H}cQ6b+=(7yA9!ozn`J165DwgyPlxuhmJncu6;|rLg)FzzT>VoWX~P;x9YxE z&yB?`MpWI!x+rg3Pz1L-h0Zpd6RO?5pRG*nJsi#|a#QqyU@eZcXEyv;Hda;6+1^}) zzcoTVpF-q4kg{97k=^RZV8={cMm9PBDam^#7Uew?J>D}R?GEz(0`=CuE5W;p)pqO= zMsz!8g718|3~zaFq`c=&zM&xRHR$nP1ODEGBY>_E7T?aIJIMQwlod1d3eC~AcWl9P zywgeR3f@X?0`2EBLcTY#DBqh11`jlx^G8oW1( zcP>w{%6re{y-|2qn6h#$oj=GAZb{!jvn+3*Y48Rb{w5NmYlOUAY*F4W*5K`8><53Z zhTZ2DxHNAH;hNSj)akB=g_|Vj2B|-h`l9f|fbza7W;~GFp}3;)nKH ztzEP`@x3BNyEgvHniqXrmTmC&jns3^AidK`+KRVJsmxJNN#4YU_xm7&{?4;%ECHG$ z9no#nMt<*Dwvpcm5=^ZD)kP6Rai}Dxxbk?g&YaTp86>wlPLt1}ocPKm_fB>Y-_A z6pBnXdZ^<^+8t@tIR{#P;&2<8JEJ*ns@{PSB)=EIeWK5tCd*w-o<$WQzXGA7C?hbF zc}qU4MXbz5{>0*1^K8JD&(0ZexQJd5bKc42)~V-+Iuf!dWTQLic+xKt3A)0ayG`@Nkr#8O2#E^ixH6h zJkaw0IO@-8d?({$aE0j14;@8uh3BaGh&)>6v37)rmYh=d+!1ot<|rPiv#bbZ1Zj43 zu1D?457F1BYMKM3`k_^K2Ig(ai|w&eaYrZ)p-ieY=`PVuFi-2bKfAN=ac!^a+d?D22B@WKoKJNe;1KmW)yUB3LW z(?9&jGn=V>UOn^p!89FvWt!$qq^If9-uDll|Dt{W^jQ+L)WkGBefGq=ublqzvp?+` zBqA;CGY8N7)isZ}a*azfVNa)AZD-hY$Ysi<^4;f>6t8 zsR?QP=c8ZSZ~ygn1Tjs|zjg1y9lyD?m77c2Ma&x#k)Ai%yAQp1N9&K)@$>-qyd*1T8fo4fn3rgNSL0T+y3~L~78I32(_=-I(PiG){al*md|QATT8zg zVLt5bXu0*7_i4$*Uh^)9o_$T6J07{-eDe0A_kVj!)M^$Yf|g8t`XCWK`(#nmor&_ZIG zKDQn1U4sO3-FNxkJO<~My?y3=S}t9^Zv@lM63q4LnTL<; zsc7vhT1d2rX)Ryv8M+1u=DM`^-6MOtTWiolf_sVXt5*KhHApZQ_Y&E=+(Bx0<`K>v zXC`PNpAU$%YQ_3aZ$+;HL8;SCq6T_4M0uJbP+Ydgz|pyj!DjvZdSX!}x@ zl-pssY`<%?%GM|L!I_|igw@dK-2`))7ivNtHH&%r!_+DhYFqXE!P$p1j_ujaBkOi( zpKcZs^0NFWuk9w7OTFjqTN7bXRLEZ{_xfr@!Xom6YQeah2@&3tMNe#3G0uFpoN5ax*}*HVVtvgI zICvKpowrA>7@N`{K}$_&oTES5*}d=X=1rtkD<9|5AVEt_NaIJ}`P-jb*!I{BLi0?F z?f70AAd)(XNTXKmT*=F|S>JLgJ#RP%FYV|AEj0n}ZV^GNjWL5S{V{44mYR^ph^s9k z%AGfy=QBY|O-RGuee87&5|N%aTp2P!OHD{a^N8LAs5eMNdfwy}hXgG(Aq~wVdc!0Q z5|LJa#CnwpT53WXKl%E<|EOKQG$JyTj-5q(znkch(W20!(&^ETeQyW%SCN*lw4d|U zxwU*DXsHQlH1F&;Bq*fvW|NMp=CU4ulVbHrqVu~ZY%Q2iBQ`ZM0E=>H?G;`?}FSrg)e zh_r~YeyAO@#jQuUV%Q?wRtEPK30i{oRn6#S9qbw;BJFFf_j&6Hrct!t2IeqSs#Aq}-!t+)ONB52>k zxdsW_Q<1m3yENGmTcWJ2!X^gpKiwL^i_vxqSI+K$I30i7G8e@jrSFK1ydYa-4P#Pp?sR?O} znYwF`h;&n5&Mc)tf|i<)##nK>28l>dQ=E}Xg9I%#Ar0&qW)hKBJ9MV66JcqPprs~; zhQ^25k;)2sn&Jd{XeR+7V?1Jx%dOKpG@y zsR?O}S+r}Ah;+L%wcL7<1_@efLK>P66)ExviAYaV+_I4d30i7G8e>)K8YChub-!OE z4HC4}1T?OwBodLfcG$Z+Xmmp5x}_%It1TjE_o3eQ!B?Fy|CpsFq%nGMqgIfJw8fR( z5RwK7^|M=QLK-6yy9S9!OWp4jNrMC}H6abGoT;p!ZJgT;A!(4%xN}QQNCRtapEH~Y zTJ7+6kkTMQOHB+7Jx6t4k%+X-yRN;=iJj0q=$4uozS8sH77?`C;cs|{uNH!qnvh28 zK|R-wc0^f0+dAmclL@U$Zm9`rwDR?Q-Ze->+ShX*A0%vjHA_uML-V>KMIIp$Y1^0h zXwHQ832vzgX=r^?q(~!f|IM37%i{Me)gL5isR?MDZUxOGB5m4s8v+`gh+7ZZO?pj8 zz*k#D(3)d(SFze((NYuA7(KYJc94j)<}1G~qIQs=r6!~?Vz+CMh;&n5ZoNo@1T8fo z4XuHSEwzJ0q%~jp?Hy^5prt0H!QB#xNUI&Xe^>9X!cr4MW7#dStVnCV^1D%L$Cwk< z@?@!r;j3l0#Iho-vi$be@YO=lQWMh9JfcWZNhBhz`O5E+jXqxpT53WXt$aPDb`27d z)*Pcdem*`(&{7l9;BJXTq%~jpjXkx41T8fo4epjmL|Q)d8-mgxK}$_QqtA&XB5m#P z*>%zAgvxbGO~6-MM9|(JzJ3f}b;A5(mYR^p=)sLVLL$-@SH9Y1LjCNPnvlkb-L63* z(o*+3sfgW9&{7l9;BJXTq-`|&?jsW#cW$W(X>hkhBGPJy-xpRpNYGLfLj(J(C@W~2 zcfGdDEZTjgdC)C2F?_Y`mPkZe?eM$qYR8z{M}LH+CZsV|oGl{CwRO;=Clgwi+)@+L z(0r)aQf)~@+ShX*A0%vjHA_uMLu;U7OBy61o%ckUi2Y7`laF6P#P`zBvysZTkH0_D zcX2LiX`QTsm@}dOTN8egYB}{Me?K&D6p3~}ZT$-#5^+a36B;Xa^Gs2)i(oE|V7qy? zCgL{kyir_vt>Px|nxKV*MZWJDSSu3DMKAPr%tqy!u!ga#L9H64Ui16L{56=o?!ST> z#G*lhxfGSjR|`Q435zjbom(3gf)*07lU>(}780?)M$0ADTJAgV+}gNBa&5wY`J|F~ z`q2v4XEu$nu-rHafkr22Az|kM@YSM03kf~lr~X(7T1YgHjGLM3TG2v+w`}r=BEej7 zCb!n0g#>R4WepO{)glz9oUPf-v-C-EfW?0vL+A!s2HH~2km!vYl0RMaiX&(Xdw}Iv93ihmqoko>8}Y| zNW@*NYZ1&9Cv0ni783R@%x+fY9wfnB_V#r}^w?#ttP#79tP%SU-c{4xINnujK|4O0 z8KNxa;vS{aus6Ax@b`mjU$LxsSID=PYa+iz^mm?KThrcME57ICd)3_pbMb9&CTQV% zXSQ!4X2qrD(tgn2XX|c^x5K_)h}I|BVtPhc4K2N!U@r5*is-eX#XS9CYLyA~1!A|A zZ}V=xf1@1MTKgMB1ANb*9A>erBqQ#cRN1O6mMuNA{vIZ?Ac&98Aw2qqrDw0RxR63iy@7fSm!v!yObm%wm6(v||3Bs!bNuJrYu`)a zN>BH=YmMI=AMX?6A!%ZEx-E9FFpEyZ=ZV3BwN`{)88-C^vHIa z<{2_RAHly(=6;tGA;G<*n$}k272@SD`4skk(vR%XD+IMGHP1b5-gX2%;6 z@s;2IgY$3P{WcOMZBQ%ic}CnuPlRQEw+4an!~!MM&4^_OiDca-7nkm z4`j(cF-da?dK_j$S|x03+$(yrqQ&weBSZgS4WfM3 z)*-KWOcR4()*`;P|afJUid7VH##Ab1X7Cvj;q=#aofWcps%MwDSmfGgA zx~=wF*x}X_)U>VO2t84+g5dte_1Z_X5n9k7%`NJw{>%Pf5XR2y99s0<`h?3GlT$|Y zT6^{3w708cl4(Qbma7%QbAlsE@LwxlVK3|6#tbXV`-hjSIrNqoUP0rNgO=IAzQ{WN zT{mVoqCMnQ=n8?d=mEE+Gmd&B{y)}W#KhwfIc151V4e8yu;_D~{oI zL}N;Mu+i0d#-U!(BOj@0qo^k-8v(nlCvLvJa<8;ygiKE|ZzB;$SXK~}V?Sx1&%*{R zv$m{U&w>#xBOOs{9|%HQqSil3fF|1%H}yn`*q_;LgnMPQc(_kcgLQtkOw&{NyLtf` z#Fs+GXUNp8TiLzv;Va8)pLs&G8hwEH=JDs2H@^QLjo7EfMyVdr(vg>SnO?bkGN(*$ zu@xb<)n5{8v=f97H8+j+Na(Of;;%pZ%JccwcakU>$H|;BwGI(^M2VF+%%AERy{Z|7 zjcw$u_tw?v)JhGu`tX>B$jda{<45R87kN)W({hE+$Q22tW54I>*mE_l`)-jRv~kZ; zYf$rJ9{T>v$n<|;S)bcdlF?a zqjwB+5Xi3CsM*zeR$5yOJ*peypx@O-_K&ePL%&AOS_`j|t|iec(!P}>;>bwH{{Qki zXKSgo7P(SFTTB?KHrT4eD~+6T*yz2AeqhlK^gsYCn;&`hGu!)~`vs3s?P*EsRraWp zd7lm&7_V0Qpwh_hejM~__wFaZxV-1d&%&##7dldBZL*)|R(21bUR@qMecTA8d*UlU zdCTr4UwsYRR!QPyPWkG^VIq$xp(E<(6@1^u90eQO@DL@*h^leaoYaw1>7GCw8;@gJ zFW0HQ`Pk-r8OfN1&QCg|H*B+|BAIMZ6z7UXd~k|nU(H|Ly;@p z6JJ0}Jiqmwh+&$tEuGG_Z!^;>vj&AINoY$P2^3vwo*>!iQ_H>g@~ct)nhoj&p<4G| z{$VHH1Wz~;)wWR8lSnNP+p4ufh>cFm2}Y|n5czrJ3P)V)bk>%b`$^M)c%_~+dXETd zSA9QUrs+)=8b_Z6s@JWMfVL7%#(w6CS&%sj#LJi49{LQ99MOi-LU6|UvFE?%6PR&8 zyn4C)p)ca->AX*e4Vj~ihxds{>F?(Odwhgs}1%ltokr}o=K0&zVe+C+8>psm9U}h zmA*$DeSGI1y5)F_82I=3i+OwNWv;J|E)dgJ+E}Bf>4P9nJaU#B(JHO>T6PPwtL2XM z5gu0JP#j@z-^Tx-uYbeViMlpqpNKUh!q7J@rSaSmd?&~e-QL5ZRj~i z()H|RojBX3bzQe}EgHnXpP5;UL9ehCwi0MeE^2osv3{{WJ*m9lf^EJ@MiGB^ZJGMsH+#5g|W52@%{h2eDjz! zc=bZ*p5Pe~&+wSuBu?g(M;l6HSxV@c-sn}<^VJL3*oKEFsh#Of6KrhUt7%=!YzQH_ z;(1i7=Zr(WI+;_S?drbgerfxo&pwJ=_2*IP)kvgQC$rK$aVQR@R|y+;v({`Z@w0oC znO(O*q9mbpJ`x^#0l;>(jdqn@SsQEPvDsiNF|V=)PiLib|5)dj-uva{tsh|9?MG1% zEvBwMq_v;UO811f#K@J$amcH2+|^Mn*X(OKYziyKSvj!x01IuR!$Q<+R!uis*Ti2YkV!cR_9u- zM!re_wf?b0|Ii+#J#Ctv3$K0?W3P{iON@!=AC2yb*FyURpk6VI)EE;R-4oE>ks@*F z@yEAse=&14;an}pU=Zy($}~L(!~-CZ-L9W2-4iWa=pXgWuFivcUaRwN>a#~_%TW3- zp<1+2|83`=ZEkPp=Y?kzy_TMz=XpZ!70(T#TzJyf@Z2BkhZ_;+t8^m@BS-m7YdkmD zvk}Dd%n*Vj!?q?V2)hl%HXWI?VT_Bb-8-dnYyBaYIm zL}CB<@ptT&AAIvCV57G7XuExz78{%mmY5Bc?g_5Iu@dJw;ZA29rF%kcuz!RnI)7+i zN&T^(E4@ls70GI%HSPK-sJ@gJ3(-*7V>CAi7ZPA zUCE9snVcvm1weSZ`4*2TfnBbLml(rZLe zXYjkL5Bz(q8|v1LcC-%mXn0oRU<-`RylUklZ;&l=d@`0bLbB^x-vQCe-KVP!dStmO zy7n1z)p^xwu)x>miPE{>Z9ucxSZah?&;8vKdK8<@oNXqY+L(I)AwL?d>>Y? zKU3GcO-t9*I>SZz{4CuHS?4I7yWlnYIq%<9Hb!bYkMe5{Dl>8+ijK}Hk3=myGJFl$ zt+PRnB{nm(b5XOg3$JqAJ)L2r(YZhCoR-S&_J{rn^+6l`86=1nllx>Jti_C6>7GF3 z&8zg}kXPKFTjA{7&ghiRI7slyJg(B8^HV+1`CRAuY2q0d?@#dF#BC2f;rThb0PV76 zL2UE-F|R4|dZNzyO84G+9L2NS%GEg521#&zJDN0qw9{%HfrI%R7qy{k6~iL%oxw&lD-G1i~%MQ~lI(H6|tC z6}9adsrr;wc*1)H;i0bjc`r4+Qmt{_9+9(r_X?jJ&*KQ`u%|Yto^b?Wxe_AwGt;QS zW3NHLxsFbIR)b<2YQAwy9CHW&6^X& zy&CePbY!}>5xI)|1QFTg{=?ZF>2(`VBUc;~S=RL?>s&HToM}Gh*TZ#Q!aDH)!Fz-M z0)kgq@Fd8#+L$i%3X5JNou*fT_*)RXilggKrF%kig_#VV)N{4o!>E6@L_R^sKafSo zkEEG}LxgIj%yI{!ee(rchhm(Tq~-GmL&xv}l0R(hpzj6{0HBifF& z#qcRZ&()N~bdj>z@HnasdK25(^7?!J2GN@h#L?QW%XN0{iRulHtkF522c_d~#8K&L zZ=Ya)4o^C|^U6jzkA>PnC>{IL1|#SAZk}vq9qqDuNYy$jkkZjPw6t#Ah7#`8W#np& zu0+hUw6Rz2O})}lO=-2qlIs>N@lR1Mea}`|^A|Y`{ThAN^Z94amRCIWVW%UzwOs{M zHoX?_iif>J1kSxhi(cJ~fQ_wqvXyoW@7CjZZ2PL+U*hP=JkonaVdQ-;x&ku#xn?@z zuDMdJ8AOZYpjWDu9`7L;HfoDu?^{VS#rF){8fLHKj8&}nI^{T7d)UR>m6)&X^60AYQ5o0@_{ACtwhHGbJ z)5NDZ@HEFUpX9(y*0gly?B}cW%X-u{%FPzj&!VZ1IB260=z~qxd3PkDr*bAs5BvDI ze&b3UY{?^iKhOO(*9y^(25E1P*tiXtN#CJ`IGE{^Ic2x8N+hjB9ZPgfjH@`OGtbj& zKd*9LL8z_6a#mKf;Mo!K79~-30^00RcBEkk^5`pQNCW;X1Os+s8^J8)3Kxy zzx79d1rKjVsMdZBRvU*S7ecbodv)$(qItCyd;3JGbw7(1$6$^O7RNpTQxVq-`Z$g*blmMdgpHkh z#kT7sbxY`$$RVQ}fEM;(%hmiz_;mucKaAH?3c(PZDxCyGhcCzn+# zudwLqjJmNk8(OZ*YFl~~&^W>tZt^OjHuhGQLEtmus}Tov1xMm6g)+6w-VF)XIrFnd zbAN7(+`JMZX!RD^-I1!k%Tm({jM?qEbdp^aIzAVQ9qged!3nyVyOytPJr&P(Pe1HwL(x8 z+x}IY+b@04Baf1pU25|Gb(@!cE!yab&?Y%=lhCUlTK^e!?SqxDa)mxXz*rnnqRN@W z>QjNQ+^!(f$a_!c{yuUNt=62T4J`=;7mo#>aYQ{?Apmi+TzPg)YjJzD0h!)%zi%ao zJQ8&ibP}xwL4_9UHe?d>z73cn*~g)EleViS00@=PT$#)`5JP%p+63H2)!N><+rH-S z{=%a@MD$wG#w_v!Hu`Ipk1cVfFtbowyLy#cu(wpNG;fsu?A^b+`PV;r0k6qSs+Drh zZuWw8LbX&Ly~@aWr0-Fkjh%Z{5TW-X-1ckPwK$}A(f_)YP47EfU(}$s7{t+RWVwfI zFs8?Dd&B11vrk#B@Gq%@kd2m1uM?`JvSsA9H|*R-QLi*txqr-VdPRRT@;)Pxsj=;* z4b6f_-n>$+luzdLYRuJo+choCp+uh7zo%WwV~as{SG`KYY_zND88;(Ouc(!|>T{?y zn1o%S_d5+52j$%Qkzw7dO0*FUFh?@BS6jFFIn~k3{dtD;>@#oM{lHXsO$J*Wp_X2O zjQywBkBG&$SSMP!ux0k375fLG@Q7-OhjNt)UTxB=xZ+i9RNqym4IyA72p$P}Bx;+T zxD`e&o`gL28KG+3n1M#jnJcp)neMY28KqXp^f0o^{khRb@4MzLv+y9s-Ag|1^6pOD zAIdgnEnn_tf!H}w@*WG@&sn?Ql5Ol{o+c&oh!SJ(k~lW$6^ZO0>Y>?KjYH|4=xuO@ zjL|vbP_JmaZ@W(AuN8f)UKYG7Hl0P@mK$v}BJKhp7R{~@g@rDSD7)b6YaYI@MDW&j{zQCacg2R~O6<8;G!ftb zz|p#9@EM19PnM9IK0GS%{SPD1yLj)$sS7aD2V=g@-*?AB6#|f z-+7L2jF^_+WnZ!3_lm5})f16t8I_Q$1B7a+oHaOku6T#XJn{STCc_3kZ5@$*RpGGD@1b&Yib!2`IKI>C+i1z=+6OI zYnLNCp)opNSt7okP%V*Bt`h2%UZDkn7#_wSbJa%I>J^^@Fs}}1(JPR)UICF?dm`S- z?PtyyPE8Ht3#75Vnv_JOaqZ5T~S4UCpwW|cc_9Qtx(ebL? z*|7cTliT3a^?oEqwUNLx=bLy#jJ9@vvfF5F`8KxmiFoT#{v7+@6-Umr*Lj8cJlm_z zS2^Rb<>%JE9|arZ9F--dJ|c&Wm;u`Nqm1sa_2RkL9iDsT6Y=pqVbkjCJljHVBj=^j zM%wP?558@o%^xZ2{2`GS)?h!@>S|e6gF3>2h*9*=2sc}=jUL74eGql+cOq+#f}C4F zN1-*u8a|#7Lus7t{23N!Q%eYX*k-tcglehW_jA~3tJe$vUZQy-8A+lryQ-xvzbE{; z48~F9$gK8ce~p|^))*mLhY0MaH~e4yJ6}lEEQV}rs+MW!wXLrY#KboiG&;|z8c-we zwA7vw?dnIV8nM3OXS2a4Qrw=}NaE^VHb`ykRfYIXJO1+7F0)e`vzar9%9 zJ=q;`;4@}Xf6CjuLb-gJd(`6GzD^V+L{k#3!+;A_`5zppUxOp_C=c3T6=jR6rM8~p8tkG@*#fJ^`gwKQr z9rlu-Po&P_6-OK%;b+KN5_Qu?luO@3wwT=B5P7LyuskIw@7pjto4#B|&b8K<1-j&3 z;WP4M<$`GTTqX@|lpWhzx#nRY=tDZC&`)SW@AhOsZKN0yl5!zMH#1TZ$>jd`(G13E3Y6iGBjwr1)8$MN{%?5}=2`wpta2tzz<>SW!n><%*byLTZ zfDk!rs%q)H+Y@{y9Os?T=GMxhS78rw+YcK(p;}G8fmi;v4)?u9P9o;6Ar74ZdRhsd zp=KPbXBgRz%(t;Ss&#kv%Q880?og%1z<`q299Oy0!N$ zx$o*>Pc*Lzvb&^LAzOB_pI))`q(_w3v}{)EiKufDD90kizGyL8gKmRFsejS8sTH!- zhufe%ZePdqwf}3+*wU-85k%0jf1il9q=c5#6RoBW#8JJ{?2dKb>`6xUZG@KQN^O&< zTYo)K&n)_Di=mGM^ZbMF7la4x4TvV|nMLZ8@b^8MmR|Sk3A_z)!}rSa9)+H3t)v+x0D*sny;<5+3rsA4VS{+M88Z2=yu>w|ArREu`U%Y|M_M|-p$aJg|4r3{Qx_* zMXx$X`TRSA^^lpL^Ciy>0TleVsbm~c!sMQyGAZQC-m^T|P=a!9?M;P7_}dACb{iwn zYjySx5WQFSR>!b`&&Y^+#d!knVl=JsI@}&n7lXbZj&QbAI`$_)j#Rg@5F1KY8_^GACSzGj4@9ZulMU75$Gqb#_ zuUeF4eB_(*K_8)o@_7lqHH*(o(38;ex7CM@cF$s(cr}>scIFjf)zV(8z1fm$-$3K{ z)o3GpS9|K=9?_y5=oZs7@ktTRR1Fe4@k9$I+^&c#NngUqfGZS~<%*oXBfC)%$G!gnQ3=FSFx z{j}Lgc_iFQVXx&V6EjYgzhpLa_Hljt2%>6f-VPJ$2}hi;r+vP&(X|qK72~7!`JQ08 zp;c`>1v}Qp_&X*h?-TefDm#+x>PAFH%ihVnk?z|Vo^7hXsmHd9EwrqE@YiR;p35w0 zolqM}bAN7j#)2}dCpB``jd{gi)G;~r**{b(>t-bQtPh`@1j}Fg^Rn32Sc5I{eH+DX zERkJiA?gMtdE_ifZDhHJY;eDC#oI1C(RD&?m9&@p14%-)RF0CA$o!nl)x$=JZ6TOl zja*x0%R=g}5&ESSxWtTg=!>_S9c#)UM~w`0Z8k zO66#wRIS?l3>#MGUT$Ci?f0EGAh9vKEZ6G8<@U>@*v~lp7om;F$d%Ah+X?b0a;%N3VKCh30T!mL2t;OMl$|U{|bhs7t literal 19484 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