From 0f17a2c45c2d8f83715c4db26400152920e40965 Mon Sep 17 00:00:00 2001 From: GuoGeTiertime <97820723+GuoGeTiertime@users.noreply.github.com> Date: Sun, 21 Sep 2025 21:07:43 +0800 Subject: [PATCH] Add Afinia 3d printer and update tree_support_tip_diameter option for Tiertime printers (#10705) Add Afinia 3d printer and update tree_support_tip_diameter option for 0.6 and 0.8 nozzle Co-authored-by: SoftFever --- resources/profiles/Afinia.json | 194 +++++ .../profiles/Afinia/Afinia H+1(HS)_cover.png | Bin 0 -> 32405 bytes .../profiles/Afinia/filament/Afinia ABS+.json | 37 + .../Afinia/filament/Afinia ABS+@HS.json | 37 + .../profiles/Afinia/filament/Afinia ABS.json | 31 + .../Afinia/filament/Afinia ABS@HS.json | 31 + .../profiles/Afinia/filament/Afinia PLA.json | 34 + .../Afinia/filament/Afinia PLA@HS.json | 34 + .../profiles/Afinia/filament/Afinia TPU.json | 27 + .../Afinia/filament/Afinia TPU@HS.json | 27 + .../Afinia/filament/Afinia Value ABS.json | 37 + .../Afinia/filament/Afinia Value ABS@HS.json | 37 + .../Afinia/filament/Afinia Value PLA.json | 40 + .../Afinia/filament/Afinia Value PLA@HS.json | 40 + .../Afinia/filament/fdm_filament_abs.json | 82 ++ .../Afinia/filament/fdm_filament_common.json | 166 ++++ .../Afinia/filament/fdm_filament_pla.json | 82 ++ .../Afinia/filament/fdm_filament_tpu.json | 79 ++ .../machine/Afinia H+1(HS) 0.4 nozzle.json | 21 + .../machine/Afinia H+1(HS) 0.6 nozzle.json | 26 + .../Afinia/machine/Afinia H+1(HS).json | 12 + .../Afinia/machine/fdm_afinia_common.json | 60 ++ .../Afinia/machine/fdm_machine_common.json | 119 +++ .../process/0.12mm Fine @Afinia H+1(HS).json | 30 + .../0.16mm Optimal @Afinia H+1(HS).json | 30 + ....18mm Fine @Afinia H+1(HS) 0.6 nozzle.json | 15 + .../0.20mm Standard @Afinia H+1(HS).json | 22 + .../process/0.24mm Draft @Afinia H+1(HS).json | 25 + ...m Standard @Afinia H+1(HS) 0.6 nozzle.json | 15 + .../0.28mm Extra Draft @Afinia H+1(HS).json | 25 + ...m Standard @Afinia H+1(HS) 0.6 nozzle.json | 15 + ...m Strength @Afinia H+1(HS) 0.6 nozzle.json | 17 + ...36mm Draft @Afinia H+1(HS) 0.6 nozzle.json | 15 + ...xtra Draft @Afinia H+1(HS) 0.6 nozzle.json | 15 + .../fdm_process_afinia_0.18_nozzle_0.6.json | 26 + ...fdm_process_afinia_0.18_nozzle_0.6_HS.json | 26 + .../fdm_process_afinia_0.24_nozzle_0.6.json | 26 + ...fdm_process_afinia_0.24_nozzle_0.6_HS.json | 26 + .../fdm_process_afinia_0.30_nozzle_0.6.json | 26 + ...fdm_process_afinia_0.30_nozzle_0.6_HS.json | 26 + .../fdm_process_afinia_0.36_nozzle_0.6.json | 26 + ...fdm_process_afinia_0.36_nozzle_0.6_HS.json | 26 + .../fdm_process_afinia_0.42_nozzle_0.6.json | 26 + ...fdm_process_afinia_0.42_nozzle_0.6_HS.json | 26 + .../process/fdm_process_afinia_HS_common.json | 15 + .../process/fdm_process_afinia_common.json | 79 ++ .../Afinia/process/fdm_process_common.json | 72 ++ resources/profiles/Tiertime.json | 800 +++++++++--------- .../Tiertime/filament/Tiertime ABS.json | 10 +- .../Tiertime/filament/Tiertime ABS@300HS.json | 10 +- .../Tiertime/filament/Tiertime ASA.json | 2 +- .../Tiertime/filament/Tiertime ASA@300HS.json | 2 +- .../filament/Tiertime Generic ABS.json | 2 +- .../filament/Tiertime Generic ABS@300HS.json | 2 +- .../filament/Tiertime Generic ASA.json | 2 +- .../filament/Tiertime Generic ASA@300HS.json | 2 +- .../filament/Tiertime Generic BVOH.json | 2 +- .../filament/Tiertime Generic BVOH@300HS.json | 2 +- .../filament/Tiertime Generic EVA.json | 2 +- .../filament/Tiertime Generic EVA@300HS.json | 2 +- .../filament/Tiertime Generic HIPS.json | 2 +- .../filament/Tiertime Generic HIPS@300HS.json | 2 +- .../filament/Tiertime Generic PA-CF.json | 4 +- .../Tiertime Generic PA-CF@300HS.json | 4 +- .../filament/Tiertime Generic PA.json | 4 +- .../filament/Tiertime Generic PA@300HS.json | 4 +- .../filament/Tiertime Generic PC.json | 2 +- .../filament/Tiertime Generic PC@300HS.json | 2 +- .../filament/Tiertime Generic PCTG.json | 2 +- .../filament/Tiertime Generic PCTG@300HS.json | 2 +- .../filament/Tiertime Generic PE-CF.json | 2 +- .../Tiertime Generic PE-CF@300HS.json | 2 +- .../filament/Tiertime Generic PE.json | 2 +- .../filament/Tiertime Generic PE@300HS.json | 2 +- .../filament/Tiertime Generic PETG-CF.json | 2 +- .../Tiertime Generic PETG-CF@300HS.json | 2 +- .../filament/Tiertime Generic PETG.json | 2 +- .../filament/Tiertime Generic PETG@300HS.json | 2 +- .../filament/Tiertime Generic PHA.json | 2 +- .../filament/Tiertime Generic PHA@300HS.json | 2 +- .../Tiertime Generic PLA High Speed.json | 2 +- ...Tiertime Generic PLA High Speed@300HS.json | 2 +- .../filament/Tiertime Generic PLA Silk.json | 2 +- .../Tiertime Generic PLA Silk@300HS.json | 2 +- .../filament/Tiertime Generic PLA-CF.json | 2 +- .../Tiertime Generic PLA-CF@300HS.json | 2 +- .../filament/Tiertime Generic PLA.json | 2 +- .../filament/Tiertime Generic PLA@300HS.json | 2 +- .../filament/Tiertime Generic PP-CF.json | 2 +- .../Tiertime Generic PP-CF@300HS.json | 2 +- .../filament/Tiertime Generic PP-GF.json | 2 +- .../Tiertime Generic PP-GF@300HS.json | 2 +- .../filament/Tiertime Generic PP.json | 2 +- .../filament/Tiertime Generic PP@300HS.json | 2 +- .../filament/Tiertime Generic PPA-CF.json | 2 +- .../Tiertime Generic PPA-CF@300HS.json | 2 +- .../filament/Tiertime Generic PPA-GF.json | 2 +- .../Tiertime Generic PPA-GF@300HS.json | 2 +- .../filament/Tiertime Generic PPS-CF.json | 2 +- .../Tiertime Generic PPS-CF@300HS.json | 2 +- .../filament/Tiertime Generic PPS.json | 2 +- .../filament/Tiertime Generic PPS@300HS.json | 2 +- .../filament/Tiertime Generic PVA.json | 2 +- .../filament/Tiertime Generic PVA@300HS.json | 2 +- .../filament/Tiertime Generic SBS.json | 2 +- .../filament/Tiertime Generic SBS@300HS.json | 2 +- .../filament/Tiertime Generic TPU.json | 4 +- .../filament/Tiertime Generic TPU@300HS.json | 4 +- .../Tiertime/filament/Tiertime PA6-CF.json | 2 +- .../filament/Tiertime PA6-CF@300HS.json | 4 +- .../Tiertime/filament/Tiertime PC.json | 2 +- .../Tiertime/filament/Tiertime PC@300HS.json | 2 +- .../Tiertime/filament/Tiertime PET-CF.json | 2 +- .../filament/Tiertime PET-CF@300HS.json | 2 +- .../Tiertime/filament/Tiertime PETG.json | 2 +- .../filament/Tiertime PETG@300HS.json | 2 +- .../Tiertime/filament/Tiertime PLA-CF.json | 2 +- .../filament/Tiertime PLA-CF@300HS.json | 2 +- .../Tiertime/filament/Tiertime PLA.json | 10 +- .../Tiertime/filament/Tiertime PLA@300HS.json | 10 +- .../Tiertime/filament/Tiertime PVA.json | 2 +- .../Tiertime/filament/Tiertime PVA@300HS.json | 2 +- .../Tiertime/filament/Tiertime TPU 95A.json | 2 +- .../filament/Tiertime TPU 95A@300HS.json | 2 +- .../Tiertime/filament/fdm_filament_abs.json | 2 +- .../Tiertime/filament/fdm_filament_asa.json | 2 +- .../Tiertime/filament/fdm_filament_bvoh.json | 2 +- .../filament/fdm_filament_common.json | 2 +- .../Tiertime/filament/fdm_filament_eva.json | 2 +- .../Tiertime/filament/fdm_filament_hips.json | 2 +- .../Tiertime/filament/fdm_filament_pa.json | 2 +- .../Tiertime/filament/fdm_filament_pc.json | 2 +- .../Tiertime/filament/fdm_filament_pctg.json | 126 +-- .../Tiertime/filament/fdm_filament_pe.json | 2 +- .../Tiertime/filament/fdm_filament_pet.json | 2 +- .../Tiertime/filament/fdm_filament_pha.json | 2 +- .../Tiertime/filament/fdm_filament_pla.json | 2 +- .../Tiertime/filament/fdm_filament_pp.json | 2 +- .../Tiertime/filament/fdm_filament_ppa.json | 2 +- .../Tiertime/filament/fdm_filament_pps.json | 2 +- .../Tiertime/filament/fdm_filament_pva.json | 2 +- .../Tiertime/filament/fdm_filament_sbs.json | 4 +- .../Tiertime/filament/fdm_filament_tpu.json | 2 +- .../machine/Tiertime UP300 HS 0.4 nozzle.json | 7 +- .../Tiertime/machine/Tiertime UP300 HS.json | 2 +- .../Tiertime UP310 Pro 0.4 nozzle.json | 6 +- .../Tiertime/machine/Tiertime UP310 Pro.json | 2 +- .../Tiertime UP400 Pro 0.4 nozzle.json | 7 +- .../Tiertime UP400 Pro 0.6 nozzle.json | 6 +- .../Tiertime UP400 Pro 0.8 nozzle.json | 6 +- .../Tiertime/machine/Tiertime UP400 Pro.json | 2 +- .../machine/Tiertime UP600 HS 0.4 nozzle.json | 9 +- .../machine/Tiertime UP600 HS 0.6 nozzle.json | 6 +- .../machine/Tiertime UP600 HS 0.8 nozzle.json | 6 +- .../Tiertime/machine/fdm_machine_common.json | 2 +- .../Tiertime/machine/fdm_tiertime_common.json | 199 ++--- .../0.12mm Fine @Tiertime UP300 HS.json | 6 +- .../0.12mm Fine @Tiertime UP310 Pro.json | 6 +- .../0.12mm Fine @Tiertime UP400 Pro.json | 6 +- .../0.12mm Fine @Tiertime UP600 HS.json | 8 +- .../0.16mm Optimal @Tiertime UP300 HS.json | 6 +- .../0.16mm Optimal @Tiertime UP310 Pro.json | 6 +- .../0.16mm Optimal @Tiertime UP400 Pro.json | 8 +- .../0.16mm Optimal @Tiertime UP600 HS.json | 8 +- .../0.20mm Standard @Tiertime UP300 HS.json | 8 +- .../0.20mm Standard @Tiertime UP310 Pro.json | 8 +- .../0.20mm Standard @Tiertime UP400 Pro.json | 8 +- .../0.20mm Standard @Tiertime UP600 HS.json | 8 +- .../0.24mm Draft @Tiertime UP300 HS.json | 6 +- .../0.24mm Draft @Tiertime UP310 Pro.json | 6 +- .../0.24mm Draft @Tiertime UP400 Pro.json | 8 +- .../0.24mm Draft @Tiertime UP600 HS.json | 8 +- ...0.28mm Extra Draft @Tiertime UP300 HS.json | 6 +- ....28mm Extra Draft @Tiertime UP310 Pro.json | 6 +- ....28mm Extra Draft @Tiertime UP400 Pro.json | 8 +- ...0.28mm Extra Draft @Tiertime UP600 HS.json | 8 +- .../fdm_process_tiertime_0.18_nozzle_0.6.json | 3 +- ...m_process_tiertime_0.18_nozzle_0.6_HS.json | 3 +- .../fdm_process_tiertime_0.24_nozzle_0.6.json | 3 +- ...m_process_tiertime_0.24_nozzle_0.6_HS.json | 3 +- .../fdm_process_tiertime_0.24_nozzle_0.8.json | 3 +- ...m_process_tiertime_0.24_nozzle_0.8_HS.json | 3 +- .../fdm_process_tiertime_0.30_nozzle_0.6.json | 3 +- ...m_process_tiertime_0.30_nozzle_0.6_HS.json | 3 +- .../fdm_process_tiertime_0.32_nozzle_0.8.json | 3 +- ...m_process_tiertime_0.32_nozzle_0.8_HS.json | 3 +- .../fdm_process_tiertime_0.36_nozzle_0.6.json | 3 +- ...m_process_tiertime_0.36_nozzle_0.6_HS.json | 3 +- .../fdm_process_tiertime_0.40_nozzle_0.8.json | 3 +- ...m_process_tiertime_0.40_nozzle_0.8_HS.json | 3 +- .../fdm_process_tiertime_0.42_nozzle_0.6.json | 3 +- ...m_process_tiertime_0.42_nozzle_0.6_HS.json | 3 +- .../fdm_process_tiertime_0.48_nozzle_0.8.json | 3 +- ...m_process_tiertime_0.48_nozzle_0.8_HS.json | 3 +- .../fdm_process_tiertime_0.56_nozzle_0.8.json | 3 +- ...m_process_tiertime_0.56_nozzle_0.8_HS.json | 3 +- .../process/fdm_process_tiertime_common.json | 2 +- 197 files changed, 2688 insertions(+), 841 deletions(-) create mode 100644 resources/profiles/Afinia.json create mode 100644 resources/profiles/Afinia/Afinia H+1(HS)_cover.png create mode 100644 resources/profiles/Afinia/filament/Afinia ABS+.json create mode 100644 resources/profiles/Afinia/filament/Afinia ABS+@HS.json create mode 100644 resources/profiles/Afinia/filament/Afinia ABS.json create mode 100644 resources/profiles/Afinia/filament/Afinia ABS@HS.json create mode 100644 resources/profiles/Afinia/filament/Afinia PLA.json create mode 100644 resources/profiles/Afinia/filament/Afinia PLA@HS.json create mode 100644 resources/profiles/Afinia/filament/Afinia TPU.json create mode 100644 resources/profiles/Afinia/filament/Afinia TPU@HS.json create mode 100644 resources/profiles/Afinia/filament/Afinia Value ABS.json create mode 100644 resources/profiles/Afinia/filament/Afinia Value ABS@HS.json create mode 100644 resources/profiles/Afinia/filament/Afinia Value PLA.json create mode 100644 resources/profiles/Afinia/filament/Afinia Value PLA@HS.json create mode 100644 resources/profiles/Afinia/filament/fdm_filament_abs.json create mode 100644 resources/profiles/Afinia/filament/fdm_filament_common.json create mode 100644 resources/profiles/Afinia/filament/fdm_filament_pla.json create mode 100644 resources/profiles/Afinia/filament/fdm_filament_tpu.json create mode 100644 resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json create mode 100644 resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json create mode 100644 resources/profiles/Afinia/machine/Afinia H+1(HS).json create mode 100644 resources/profiles/Afinia/machine/fdm_afinia_common.json create mode 100644 resources/profiles/Afinia/machine/fdm_machine_common.json create mode 100644 resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json create mode 100644 resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json create mode 100644 resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json create mode 100644 resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json create mode 100644 resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json create mode 100644 resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json create mode 100644 resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json create mode 100644 resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json create mode 100644 resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json create mode 100644 resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json create mode 100644 resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json create mode 100644 resources/profiles/Afinia/process/fdm_process_afinia_common.json create mode 100644 resources/profiles/Afinia/process/fdm_process_common.json diff --git a/resources/profiles/Afinia.json b/resources/profiles/Afinia.json new file mode 100644 index 0000000000..b25329b0ed --- /dev/null +++ b/resources/profiles/Afinia.json @@ -0,0 +1,194 @@ +{ + "name": "Afinia", + "version": "02.03.01.01", + "force_update": "0", + "description": "Afinia configurations", + "machine_model_list": [ + { + "name": "Afinia H+1(HS)", + "sub_path": "machine/Afinia H+1(HS).json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "fdm_process_afinia_common", + "sub_path": "process/fdm_process_afinia_common.json" + }, + { + "name": "fdm_process_afinia_HS_common", + "sub_path": "process/fdm_process_afinia_HS_common.json" + }, + { + "name": "0.12mm Fine @Afinia H+1(HS)", + "sub_path": "process/0.12mm Fine @Afinia H+1(HS).json" + }, + { + "name": "0.16mm Optimal @Afinia H+1(HS)", + "sub_path": "process/0.16mm Optimal @Afinia H+1(HS).json" + }, + { + "name": "0.20mm Standard @Afinia H+1(HS)", + "sub_path": "process/0.20mm Standard @Afinia H+1(HS).json" + }, + { + "name": "0.24mm Draft @Afinia H+1(HS)", + "sub_path": "process/0.24mm Draft @Afinia H+1(HS).json" + }, + { + "name": "0.28mm Extra Draft @Afinia H+1(HS)", + "sub_path": "process/0.28mm Extra Draft @Afinia H+1(HS).json" + }, + { + "name": "fdm_process_afinia_0.18_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.24_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.24_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.30_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.30_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.36_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.36_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.42_nozzle_0.6", + "sub_path": "process/fdm_process_afinia_0.42_nozzle_0.6.json" + }, + { + "name": "fdm_process_afinia_0.18_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.18_nozzle_0.6_HS.json" + }, + { + "name": "fdm_process_afinia_0.24_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.24_nozzle_0.6_HS.json" + }, + { + "name": "fdm_process_afinia_0.30_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.30_nozzle_0.6_HS.json" + }, + { + "name": "fdm_process_afinia_0.36_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.36_nozzle_0.6_HS.json" + }, + { + "name": "fdm_process_afinia_0.42_nozzle_0.6_HS", + "sub_path": "process/fdm_process_afinia_0.42_nozzle_0.6_HS.json" + }, + { + "name": "0.18mm Fine @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.24mm Standard @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.30mm Standard @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.36mm Draft @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json" + }, + { + "name": "0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle", + "sub_path": "process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json" + } + ], + "filament_list": [ + { + "name": "fdm_filament_common", + "sub_path": "filament/fdm_filament_common.json" + }, + { + "name": "fdm_filament_pla", + "sub_path": "filament/fdm_filament_pla.json" + }, + { + "name": "fdm_filament_abs", + "sub_path": "filament/fdm_filament_abs.json" + }, + { + "name": "fdm_filament_tpu", + "sub_path": "filament/fdm_filament_tpu.json" + }, + { + "name": "Afinia PLA", + "sub_path": "filament/Afinia PLA.json" + }, + { + "name": "Afinia Value PLA", + "sub_path": "filament/Afinia Value PLA.json" + }, + { + "name": "Afinia ABS", + "sub_path": "filament/Afinia ABS.json" + }, + { + "name": "Afinia ABS+", + "sub_path": "filament/Afinia ABS+.json" + }, + { + "name": "Afinia Value ABS", + "sub_path": "filament/Afinia Value ABS.json" + }, + { + "name": "Afinia TPU", + "sub_path": "filament/Afinia TPU.json" + }, + { + "name": "Afinia PLA@HS", + "sub_path": "filament/Afinia PLA@HS.json" + }, + { + "name": "Afinia Value PLA@HS", + "sub_path": "filament/Afinia Value PLA@HS.json" + }, + { + "name": "Afinia ABS@HS", + "sub_path": "filament/Afinia ABS@HS.json" + }, + { + "name": "Afinia Value ABS@HS", + "sub_path": "filament/Afinia Value ABS@HS.json" + }, + { + "name": "Afinia ABS+@HS", + "sub_path": "filament/Afinia ABS+@HS.json" + }, + { + "name": "Afinia TPU@HS", + "sub_path": "filament/Afinia TPU@HS.json" + } + ], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "fdm_afinia_common", + "sub_path": "machine/fdm_afinia_common.json" + }, + { + "name": "Afinia H+1(HS) 0.4 nozzle", + "sub_path": "machine/Afinia H+1(HS) 0.4 nozzle.json" + }, + { + "name": "Afinia H+1(HS) 0.6 nozzle", + "sub_path": "machine/Afinia H+1(HS) 0.6 nozzle.json" + } + ] +} diff --git a/resources/profiles/Afinia/Afinia H+1(HS)_cover.png b/resources/profiles/Afinia/Afinia H+1(HS)_cover.png new file mode 100644 index 0000000000000000000000000000000000000000..c16a5f37eb5e8f1c99ab5c0cb2e47e04e6fae0b6 GIT binary patch literal 32405 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 zrv@5;45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n;{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n;{endif}\n\n;{if activate_air_filtration[current_extruder] && support_air_filtration}\n;M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n;{endif}" + ] +} diff --git a/resources/profiles/Afinia/filament/fdm_filament_tpu.json b/resources/profiles/Afinia/filament/fdm_filament_tpu.json new file mode 100644 index 0000000000..1914ac3029 --- /dev/null +++ b/resources/profiles/Afinia/filament/fdm_filament_tpu.json @@ -0,0 +1,79 @@ +{ + "type": "filament", + "name": "fdm_filament_tpu", + "inherits": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "cool_plate_temp": [ + "30" + ], + "cool_plate_temp_initial_layer": [ + "30" + ], + "eng_plate_temp": [ + "30" + ], + "eng_plate_temp_initial_layer": [ + "30" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_retraction_length": [ + "2.0" + ], + "filament_type": [ + "TPU" + ], + "hot_plate_temp": [ + "35" + ], + "hot_plate_temp_initial_layer": [ + "35" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "temperature_vitrification": [ + "30" + ], + "textured_plate_temp": [ + "35" + ], + "textured_plate_temp_initial_layer": [ + "35" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json new file mode 100644 index 0000000000..023c10c104 --- /dev/null +++ b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Afinia H+1(HS) 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_afinia_common", + "printer_model": "Afinia H+1(HS)", + "default_print_profile": "0.20mm Standard @Afinia H+1(HS)", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "printable_area": [ + "0x0", + "207x0", + "207x255", + "0x255" + ], + "printable_height": "230" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..f8d6a58926 --- /dev/null +++ b/resources/profiles/Afinia/machine/Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Afinia H+1(HS) 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "Afinia H+1(HS) 0.4 nozzle", + "printer_model": "Afinia H+1(HS)", + "default_print_profile": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle", + "nozzle_diameter": [ + "0.6" + ], + "printer_variant": "0.6", + "max_layer_height": [ + "0.42" + ], + "min_layer_height": [ + "0.18" + ], + "retraction_length": [ + "1.4" + ], + "retraction_minimum_travel": [ + "3" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/machine/Afinia H+1(HS).json b/resources/profiles/Afinia/machine/Afinia H+1(HS).json new file mode 100644 index 0000000000..9a882476eb --- /dev/null +++ b/resources/profiles/Afinia/machine/Afinia H+1(HS).json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Afinia H+1(HS)", + "model_id": "my_afinia_h_1_hs_01", + "nozzle_diameter": "0.4;0.6", + "machine_tech": "FFF", + "family": "Afinia", + "bed_model": "", + "bed_texture": "", + "hotend_model": "", + "default_materials": "Afinia ABS;Afinia PLA" +} diff --git a/resources/profiles/Afinia/machine/fdm_afinia_common.json b/resources/profiles/Afinia/machine/fdm_afinia_common.json new file mode 100644 index 0000000000..4ba6250b3a --- /dev/null +++ b/resources/profiles/Afinia/machine/fdm_afinia_common.json @@ -0,0 +1,60 @@ +{ + "type": "machine", + "name": "fdm_afinia_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_machine_common", + "gcode_flavor": "klipper", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "200"], + "machine_max_speed_e": ["25", "25"], + "machine_max_speed_x": ["500", "200"], + "machine_max_speed_y": ["500", "200"], + "machine_max_speed_z": ["12", "12"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["9", "9"], + "machine_max_jerk_y": ["9", "9"], + "machine_max_jerk_z": ["0.2", "0.4"], + "machine_min_extruding_rate": ["0", "0"], + "machine_min_travel_rate": ["0", "0"], + "max_layer_height": ["0.32"], + "min_layer_height": ["0.08"], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "printer_settings_id": "", + "printer_technology": "FFF", + "printer_variant": "0.4", + "retraction_minimum_travel": ["1"], + "retract_before_wipe": ["70%"], + "retract_when_changing_layer": ["1"], + "retraction_length": ["0.8"], + "retract_length_toolchange": ["2"], + "z_hop": ["0.4"], + "retract_restart_extra": ["0"], + "retract_restart_extra_toolchange": ["0"], + "retraction_speed": ["30"], + "deretraction_speed": ["30"], + "z_hop_types": "Normal Lift", + "silent_mode": "0", + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": ["1"], + "default_filament_profile": [""], + "default_print_profile": "0.20mm Standard @Afinia H+1(HS)", + "bed_exclude_area": ["0x0"], + "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", + "machine_end_gcode": "PRINT_END", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_pause_gcode": "PAUSE", + "scan_first_layer": "0", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Afinia/machine/fdm_machine_common.json b/resources/profiles/Afinia/machine/fdm_machine_common.json new file mode 100644 index 0000000000..5785f57b19 --- /dev/null +++ b/resources/profiles/Afinia/machine/fdm_machine_common.json @@ -0,0 +1,119 @@ +{ + "type": "machine", + "name": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "printer_technology": "FFF", + "deretraction_speed": [ + "40" + ], + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "gcode_flavor": "marlin", + "silent_mode": "0", + "machine_max_acceleration_e": [ + "5000" + ], + "machine_max_acceleration_extruding": [ + "10000" + ], + "machine_max_acceleration_retracting": [ + "1000" + ], + "machine_max_acceleration_x": [ + "10000" + ], + "machine_max_acceleration_y": [ + "10000" + ], + "machine_max_acceleration_z": [ + "500" + ], + "machine_max_speed_e": [ + "60" + ], + "machine_max_speed_x": [ + "500" + ], + "machine_max_speed_y": [ + "500" + ], + "machine_max_speed_z": [ + "10" + ], + "machine_max_jerk_e": [ + "5" + ], + "machine_max_jerk_x": [ + "8" + ], + "machine_max_jerk_y": [ + "8" + ], + "machine_max_jerk_z": [ + "0.4" + ], + "machine_min_extruding_rate": [ + "0" + ], + "machine_min_travel_rate": [ + "0" + ], + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.08" + ], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "nozzle_diameter": [ + "0.4" + ], + "printer_settings_id": "", + "printer_variant": "0.4", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "70%" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_length": [ + "5" + ], + "retract_length_toolchange": [ + "1" + ], + "z_hop": [ + "0" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retraction_speed": [ + "60" + ], + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": [ + "1" + ], + "default_print_profile": "", + "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up", + "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_pause_gcode": "M601" +} diff --git a/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json new file mode 100644 index 0000000000..23bdba8295 --- /dev/null +++ b/resources/profiles/Afinia/process/0.12mm Fine @Afinia H+1(HS).json @@ -0,0 +1,30 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Fine @Afinia H+1(HS)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_afinia_HS_common", + "layer_height": "0.12", + "bottom_shell_layers": "5", + "elefant_foot_compensation": "0.15", + "top_shell_layers": "5", + "top_shell_thickness": "0.6", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "150", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "150", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "support_threshold_angle": "20", + "support_top_z_distance": "0.12", + "support_bottom_z_distance": "0.12", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json new file mode 100644 index 0000000000..525f159f5a --- /dev/null +++ b/resources/profiles/Afinia/process/0.16mm Optimal @Afinia H+1(HS).json @@ -0,0 +1,30 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Afinia H+1(HS)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_afinia_HS_common", + "layer_height": "0.16", + "elefant_foot_compensation": "0.15", + "bottom_shell_layers": "4", + "top_shell_layers": "6", + "top_shell_thickness": "1.0", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "150", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "150", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "support_threshold_angle": "25", + "support_top_z_distance": "0.16", + "support_bottom_z_distance": "0.16", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..7de0121d05 --- /dev/null +++ b/resources/profiles/Afinia/process/0.18mm Fine @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.18mm Fine @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.18_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP021", + "instantiation": "true", + "description": "It has a smaller layer height and results in smoother surface and higher printing quality.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json new file mode 100644 index 0000000000..54d7f74bf4 --- /dev/null +++ b/resources/profiles/Afinia/process/0.20mm Standard @Afinia H+1(HS).json @@ -0,0 +1,22 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Afinia H+1(HS)", + "from": "system", + "inherits": "fdm_process_afinia_HS_common", + "instantiation": "true", + "elefant_foot_compensation": "0.15", + "top_shell_thickness": "1.0", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "150", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "150", + "top_shell_layers": "5", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} diff --git a/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json new file mode 100644 index 0000000000..3a34b22d3b --- /dev/null +++ b/resources/profiles/Afinia/process/0.24mm Draft @Afinia H+1(HS).json @@ -0,0 +1,25 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Afinia H+1(HS)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_afinia_HS_common", + "layer_height": "0.24", + "elefant_foot_compensation": "0.15", + "top_surface_line_width": "0.45", + "top_shell_thickness": "1.0", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "150", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "150", + "support_threshold_angle": "35", + "top_shell_layers": "4", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..6c6fc996ea --- /dev/null +++ b/resources/profiles/Afinia/process/0.24mm Standard @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.24mm Standard @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.24_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP022", + "instantiation": "true", + "description": "It has a balanced layer height for good quality and reasonable printing time.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json b/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json new file mode 100644 index 0000000000..fb6ac16d7b --- /dev/null +++ b/resources/profiles/Afinia/process/0.28mm Extra Draft @Afinia H+1(HS).json @@ -0,0 +1,25 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.28mm Extra Draft @Afinia H+1(HS)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_afinia_HS_common", + "layer_height": "0.28", + "elefant_foot_compensation": "0.15", + "top_surface_line_width": "0.45", + "top_shell_thickness": "1.0", + "bridge_flow": "1", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "200", + "inner_wall_speed": "200", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "gap_infill_speed": "200", + "support_threshold_angle": "40", + "top_shell_layers": "4", + "compatible_printers": [ + "Afinia H+1(HS) 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..4c0c79a151 --- /dev/null +++ b/resources/profiles/Afinia/process/0.30mm Standard @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.30mm Standard @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.30_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP023", + "instantiation": "true", + "description": "It has a big layer height, and results in apparent layer lines and ordinary printing quality and printing time.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..16702b9da4 --- /dev/null +++ b/resources/profiles/Afinia/process/0.30mm Strength @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.30mm Strength @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.30_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP024", + "instantiation": "true", + "description": "It has a big layer height with optimized settings for stronger parts.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "sparse_infill_density": "25%", + "wall_loops": "3", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..c1e1b6564f --- /dev/null +++ b/resources/profiles/Afinia/process/0.36mm Draft @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.36mm Draft @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.36_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP025", + "instantiation": "true", + "description": "It has a bigger layer height for faster printing but with more visible layer lines.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json b/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json new file mode 100644 index 0000000000..4d8c101bde --- /dev/null +++ b/resources/profiles/Afinia/process/0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.42mm Extra Draft @Afinia H+1(HS) 0.6 nozzle", + "inherits": "fdm_process_afinia_0.42_nozzle_0.6_HS", + "from": "system", + "setting_id": "GP026", + "instantiation": "true", + "description": "It has the biggest layer height for fastest printing but with very visible layer lines.", + "elefant_foot_compensation": "0.15", + "smooth_coefficient": "150", + "overhang_totally_speed": "50", + "compatible_printers": [ + "Afinia H+1(HS) 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json new file mode 100644 index 0000000000..e9fb7c853c --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.18_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.18", + "initial_layer_print_height": "0.18", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "120", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json new file mode 100644 index 0000000000..f4328e6f49 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.18_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.18_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.18", + "initial_layer_print_height": "0.18", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "120", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json new file mode 100644 index 0000000000..f953c4cfe0 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.24_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.24", + "initial_layer_print_height": "0.24", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "130", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json new file mode 100644 index 0000000000..c1f989f703 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.24_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.24_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.24", + "initial_layer_print_height": "0.24", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "130", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json new file mode 100644 index 0000000000..850260615c --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.30_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.3", + "initial_layer_print_height": "0.3", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "150", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json new file mode 100644 index 0000000000..4ef5a8b928 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.30_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.30_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.3", + "initial_layer_print_height": "0.3", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "150", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json new file mode 100644 index 0000000000..884e6114c0 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.36_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.36", + "initial_layer_print_height": "0.36", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "140", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json new file mode 100644 index 0000000000..b1ec86fd36 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.36_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.36_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.36", + "initial_layer_print_height": "0.36", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "140", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json new file mode 100644 index 0000000000..501f2ba435 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.42_nozzle_0.6", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.42", + "initial_layer_print_height": "0.42", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "130", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json new file mode 100644 index 0000000000..e5876d9843 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_0.42_nozzle_0.6_HS.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_afinia_0.42_nozzle_0.6_HS", + "inherits": "fdm_process_afinia_HS_common", + "from": "system", + "instantiation": "false", + "layer_height": "0.42", + "initial_layer_print_height": "0.42", + "bridge_flow": "1", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "initial_layer_speed": "35", + "initial_layer_infill_speed": "55", + "sparse_infill_speed": "100", + "top_surface_speed": "130", + "bridge_speed": "30", + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json b/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json new file mode 100644 index 0000000000..c8ea47e3b5 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_HS_common.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "fdm_process_afinia_HS_common", + "inherits": "fdm_process_afinia_common", + "from": "system", + "instantiation": "false", + "default_acceleration": "4000", + "travel_acceleration": "4000", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_speed": "200", + "compatible_printers": [] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_afinia_common.json b/resources/profiles/Afinia/process/fdm_process_afinia_common.json new file mode 100644 index 0000000000..09a0c06458 --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_afinia_common.json @@ -0,0 +1,79 @@ +{ + "type": "process", + "name": "fdm_process_afinia_common", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_speed": "50", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "1", + "default_acceleration": "6000", + "travel_acceleration": "6000", + "outer_wall_acceleration": "3000", + "inner_wall_acceleration": "5000", + "top_surface_acceleration": "2000", + "initial_layer_acceleration": "500", + "line_width": "0.42", + "internal_bridge_support_thickness": "0.8", + "initial_layer_line_width": "0.5", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "90", + "outer_wall_speed": "120", + "inner_wall_speed": "160", + "gap_infill_speed": "50", + "sparse_infill_speed": "250", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "layer_height": "0.2", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[0]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "seam_position": "aligned", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_speed": "180", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_base_pattern_spacing": "2.5", + "support_speed": "200", + "support_interface_speed": "80", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "0", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "200", + "top_shell_layers": "3", + "top_shell_thickness": "0.8", + "travel_speed": "500", + "enable_prime_tower": "1", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "35", + "wall_generator": "classic", + "exclude_object": "1", + "wall_infill_order": "outer wall/inner wall/infill", + "compatible_printers": [] +} \ No newline at end of file diff --git a/resources/profiles/Afinia/process/fdm_process_common.json b/resources/profiles/Afinia/process/fdm_process_common.json new file mode 100644 index 0000000000..2d65f5f50e --- /dev/null +++ b/resources/profiles/Afinia/process/fdm_process_common.json @@ -0,0 +1,72 @@ +{ + "type": "process", + "name": "fdm_process_common", + "from": "system", + "instantiation": "false", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "bridge_flow": "0.95", + "bridge_speed": "50", + "brim_width": "5", + "print_sequence": "by layer", + "default_acceleration": "10000", + "bridge_no_support": "0", + "elefant_foot_compensation": "0.1", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "120", + "inner_wall_speed": "160", + "line_width": "0.45", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_line_width": "0.42", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "90", + "gap_infill_speed": "50", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "200", + "interface_shells": "0", + "detect_overhang_wall": "0", + "reduce_infill_retraction": "0", + "filename_format": "{input_filename_base}.gcode", + "wall_loops": "2", + "inner_wall_line_width": "0.45", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "nearest", + "skirt_distance": "2", + "skirt_height": "2", + "minimum_sparse_infill_area": "0", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_speed": "180", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "support_filament": "0", + "support_line_width": "0.42", + "support_interface_filament": "0", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.15", + "support_interface_loop_pattern": "0", + "support_interface_top_layers": "2", + "support_interface_spacing": "0", + "support_interface_speed": "80", + "support_interface_pattern": "auto", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2", + "support_speed": "200", + "support_threshold_angle": "40", + "support_object_xy_distance": "0.5", + "detect_thin_wall": "0", + "top_surface_line_width": "0.42", + "top_surface_speed": "120", + "travel_speed": "400", + "enable_prime_tower": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [] +} \ No newline at end of file diff --git a/resources/profiles/Tiertime.json b/resources/profiles/Tiertime.json index cb07038908..c9bf2cccc8 100644 --- a/resources/profiles/Tiertime.json +++ b/resources/profiles/Tiertime.json @@ -1,20 +1,20 @@ { "name": "Tiertime", - "version": "02.03.01.00", + "version": "02.03.01.01", "force_update": "0", "description": "Tiertime configurations", "machine_model_list": [ { - "name": "Tiertime UP300 HS", - "sub_path": "machine/Tiertime UP300 HS.json" + "name": "Tiertime UP400 Pro", + "sub_path": "machine/Tiertime UP400 Pro.json" }, { "name": "Tiertime UP310 Pro", "sub_path": "machine/Tiertime UP310 Pro.json" }, { - "name": "Tiertime UP400 Pro", - "sub_path": "machine/Tiertime UP400 Pro.json" + "name": "Tiertime UP300 HS", + "sub_path": "machine/Tiertime UP300 HS.json" }, { "name": "Tiertime UP600 HS", @@ -31,44 +31,88 @@ "sub_path": "process/fdm_process_tiertime_common.json" }, { - "name": "0.12mm Fine @Tiertime UP310 Pro", - "sub_path": "process/0.12mm Fine @Tiertime UP310 Pro.json" + "name": "fdm_process_tiertime_HS_common", + "sub_path": "process/fdm_process_tiertime_HS_common.json" }, { "name": "0.12mm Fine @Tiertime UP400 Pro", "sub_path": "process/0.12mm Fine @Tiertime UP400 Pro.json" }, - { - "name": "0.16mm Optimal @Tiertime UP310 Pro", - "sub_path": "process/0.16mm Optimal @Tiertime UP310 Pro.json" - }, { "name": "0.16mm Optimal @Tiertime UP400 Pro", "sub_path": "process/0.16mm Optimal @Tiertime UP400 Pro.json" }, - { - "name": "0.20mm Standard @Tiertime UP310 Pro", - "sub_path": "process/0.20mm Standard @Tiertime UP310 Pro.json" - }, { "name": "0.20mm Standard @Tiertime UP400 Pro", "sub_path": "process/0.20mm Standard @Tiertime UP400 Pro.json" }, - { - "name": "0.24mm Draft @Tiertime UP310 Pro", - "sub_path": "process/0.24mm Draft @Tiertime UP310 Pro.json" - }, { "name": "0.24mm Draft @Tiertime UP400 Pro", "sub_path": "process/0.24mm Draft @Tiertime UP400 Pro.json" }, + { + "name": "0.28mm Extra Draft @Tiertime UP400 Pro", + "sub_path": "process/0.28mm Extra Draft @Tiertime UP400 Pro.json" + }, + { + "name": "0.12mm Fine @Tiertime UP310 Pro", + "sub_path": "process/0.12mm Fine @Tiertime UP310 Pro.json" + }, + { + "name": "0.16mm Optimal @Tiertime UP310 Pro", + "sub_path": "process/0.16mm Optimal @Tiertime UP310 Pro.json" + }, + { + "name": "0.20mm Standard @Tiertime UP310 Pro", + "sub_path": "process/0.20mm Standard @Tiertime UP310 Pro.json" + }, + { + "name": "0.24mm Draft @Tiertime UP310 Pro", + "sub_path": "process/0.24mm Draft @Tiertime UP310 Pro.json" + }, { "name": "0.28mm Extra Draft @Tiertime UP310 Pro", "sub_path": "process/0.28mm Extra Draft @Tiertime UP310 Pro.json" }, { - "name": "0.28mm Extra Draft @Tiertime UP400 Pro", - "sub_path": "process/0.28mm Extra Draft @Tiertime UP400 Pro.json" + "name": "0.12mm Fine @Tiertime UP300 HS", + "sub_path": "process/0.12mm Fine @Tiertime UP300 HS.json" + }, + { + "name": "0.16mm Optimal @Tiertime UP300 HS", + "sub_path": "process/0.16mm Optimal @Tiertime UP300 HS.json" + }, + { + "name": "0.20mm Standard @Tiertime UP300 HS", + "sub_path": "process/0.20mm Standard @Tiertime UP300 HS.json" + }, + { + "name": "0.24mm Draft @Tiertime UP300 HS", + "sub_path": "process/0.24mm Draft @Tiertime UP300 HS.json" + }, + { + "name": "0.28mm Extra Draft @Tiertime UP300 HS", + "sub_path": "process/0.28mm Extra Draft @Tiertime UP300 HS.json" + }, + { + "name": "0.12mm Fine @Tiertime UP600 HS", + "sub_path": "process/0.12mm Fine @Tiertime UP600 HS.json" + }, + { + "name": "0.16mm Optimal @Tiertime UP600 HS", + "sub_path": "process/0.16mm Optimal @Tiertime UP600 HS.json" + }, + { + "name": "0.20mm Standard @Tiertime UP600 HS", + "sub_path": "process/0.20mm Standard @Tiertime UP600 HS.json" + }, + { + "name": "0.24mm Draft @Tiertime UP600 HS", + "sub_path": "process/0.24mm Draft @Tiertime UP600 HS.json" + }, + { + "name": "0.28mm Extra Draft @Tiertime UP600 HS", + "sub_path": "process/0.28mm Extra Draft @Tiertime UP600 HS.json" }, { "name": "fdm_process_tiertime_0.18_nozzle_0.6", @@ -78,30 +122,30 @@ "name": "fdm_process_tiertime_0.24_nozzle_0.6", "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.6.json" }, - { - "name": "fdm_process_tiertime_0.24_nozzle_0.8", - "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8.json" - }, { "name": "fdm_process_tiertime_0.30_nozzle_0.6", "sub_path": "process/fdm_process_tiertime_0.30_nozzle_0.6.json" }, - { - "name": "fdm_process_tiertime_0.32_nozzle_0.8", - "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8.json" - }, { "name": "fdm_process_tiertime_0.36_nozzle_0.6", "sub_path": "process/fdm_process_tiertime_0.36_nozzle_0.6.json" }, - { - "name": "fdm_process_tiertime_0.40_nozzle_0.8", - "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8.json" - }, { "name": "fdm_process_tiertime_0.42_nozzle_0.6", "sub_path": "process/fdm_process_tiertime_0.42_nozzle_0.6.json" }, + { + "name": "fdm_process_tiertime_0.24_nozzle_0.8", + "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8.json" + }, + { + "name": "fdm_process_tiertime_0.32_nozzle_0.8", + "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8.json" + }, + { + "name": "fdm_process_tiertime_0.40_nozzle_0.8", + "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8.json" + }, { "name": "fdm_process_tiertime_0.48_nozzle_0.8", "sub_path": "process/fdm_process_tiertime_0.48_nozzle_0.8.json" @@ -110,94 +154,6 @@ "name": "fdm_process_tiertime_0.56_nozzle_0.8", "sub_path": "process/fdm_process_tiertime_0.56_nozzle_0.8.json" }, - { - "name": "fdm_process_tiertime_HS_common", - "sub_path": "process/fdm_process_tiertime_HS_common.json" - }, - { - "name": "0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle", - "sub_path": "process/0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle.json" - }, - { - "name": "0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle", - "sub_path": "process/0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle.json" - }, - { - "name": "0.12mm Fine @Tiertime UP300 HS", - "sub_path": "process/0.12mm Fine @Tiertime UP300 HS.json" - }, - { - "name": "0.12mm Fine @Tiertime UP600 HS", - "sub_path": "process/0.12mm Fine @Tiertime UP600 HS.json" - }, - { - "name": "0.16mm Optimal @Tiertime UP300 HS", - "sub_path": "process/0.16mm Optimal @Tiertime UP300 HS.json" - }, - { - "name": "0.16mm Optimal @Tiertime UP600 HS", - "sub_path": "process/0.16mm Optimal @Tiertime UP600 HS.json" - }, - { - "name": "0.20mm Standard @Tiertime UP300 HS", - "sub_path": "process/0.20mm Standard @Tiertime UP300 HS.json" - }, - { - "name": "0.20mm Standard @Tiertime UP600 HS", - "sub_path": "process/0.20mm Standard @Tiertime UP600 HS.json" - }, - { - "name": "0.24mm Draft @Tiertime UP300 HS", - "sub_path": "process/0.24mm Draft @Tiertime UP300 HS.json" - }, - { - "name": "0.24mm Draft @Tiertime UP600 HS", - "sub_path": "process/0.24mm Draft @Tiertime UP600 HS.json" - }, - { - "name": "0.28mm Extra Draft @Tiertime UP300 HS", - "sub_path": "process/0.28mm Extra Draft @Tiertime UP300 HS.json" - }, - { - "name": "0.28mm Extra Draft @Tiertime UP600 HS", - "sub_path": "process/0.28mm Extra Draft @Tiertime UP600 HS.json" - }, { "name": "fdm_process_tiertime_0.18_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json" @@ -206,30 +162,30 @@ "name": "fdm_process_tiertime_0.24_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json" }, - { - "name": "fdm_process_tiertime_0.24_nozzle_0.8_HS", - "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json" - }, { "name": "fdm_process_tiertime_0.30_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json" }, - { - "name": "fdm_process_tiertime_0.32_nozzle_0.8_HS", - "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json" - }, { "name": "fdm_process_tiertime_0.36_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json" }, - { - "name": "fdm_process_tiertime_0.40_nozzle_0.8_HS", - "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json" - }, { "name": "fdm_process_tiertime_0.42_nozzle_0.6_HS", "sub_path": "process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json" }, + { + "name": "fdm_process_tiertime_0.24_nozzle_0.8_HS", + "sub_path": "process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json" + }, + { + "name": "fdm_process_tiertime_0.32_nozzle_0.8_HS", + "sub_path": "process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json" + }, + { + "name": "fdm_process_tiertime_0.40_nozzle_0.8_HS", + "sub_path": "process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json" + }, { "name": "fdm_process_tiertime_0.48_nozzle_0.8_HS", "sub_path": "process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json" @@ -238,6 +194,30 @@ "name": "fdm_process_tiertime_0.56_nozzle_0.8_HS", "sub_path": "process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json" }, + { + "name": "0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.18mm Fine @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.24mm Standard @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.30mm Strength @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.36mm Draft @Tiertime UP400 Pro 0.6 nozzle.json" + }, + { + "name": "0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle", + "sub_path": "process/0.42mm Extra Draft @Tiertime UP400 Pro 0.6 nozzle.json" + }, { "name": "0.18mm Fine @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.18mm Fine @Tiertime UP600 HS 0.6 nozzle.json" @@ -246,10 +226,6 @@ "name": "0.24mm Standard @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.24mm Standard @Tiertime UP600 HS 0.6 nozzle.json" }, - { - "name": "0.24mm Fine @Tiertime UP600 HS 0.8 nozzle", - "sub_path": "process/0.24mm Fine @Tiertime UP600 HS 0.8 nozzle.json" - }, { "name": "0.30mm Standard @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.30mm Standard @Tiertime UP600 HS 0.6 nozzle.json" @@ -258,22 +234,46 @@ "name": "0.30mm Strength @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.30mm Strength @Tiertime UP600 HS 0.6 nozzle.json" }, - { - "name": "0.32mm Standard @Tiertime UP600 HS 0.8 nozzle", - "sub_path": "process/0.32mm Standard @Tiertime UP600 HS 0.8 nozzle.json" - }, { "name": "0.36mm Draft @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.36mm Draft @Tiertime UP600 HS 0.6 nozzle.json" }, - { - "name": "0.40mm Standard @Tiertime UP600 HS 0.8 nozzle", - "sub_path": "process/0.40mm Standard @Tiertime UP600 HS 0.8 nozzle.json" - }, { "name": "0.42mm Extra Draft @Tiertime UP600 HS 0.6 nozzle", "sub_path": "process/0.42mm Extra Draft @Tiertime UP600 HS 0.6 nozzle.json" }, + { + "name": "0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.24mm Fine @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.32mm Standard @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.48mm Draft @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle", + "sub_path": "process/0.56mm Extra Draft @Tiertime UP400 Pro 0.8 nozzle.json" + }, + { + "name": "0.24mm Fine @Tiertime UP600 HS 0.8 nozzle", + "sub_path": "process/0.24mm Fine @Tiertime UP600 HS 0.8 nozzle.json" + }, + { + "name": "0.32mm Standard @Tiertime UP600 HS 0.8 nozzle", + "sub_path": "process/0.32mm Standard @Tiertime UP600 HS 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @Tiertime UP600 HS 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Tiertime UP600 HS 0.8 nozzle.json" + }, { "name": "0.48mm Draft @Tiertime UP600 HS 0.8 nozzle", "sub_path": "process/0.48mm Draft @Tiertime UP600 HS 0.8 nozzle.json" @@ -288,29 +288,21 @@ "name": "fdm_filament_common", "sub_path": "filament/fdm_filament_common.json" }, + { + "name": "fdm_filament_pla", + "sub_path": "filament/fdm_filament_pla.json" + }, { "name": "fdm_filament_abs", "sub_path": "filament/fdm_filament_abs.json" }, { - "name": "fdm_filament_asa", - "sub_path": "filament/fdm_filament_asa.json" + "name": "fdm_filament_tpu", + "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "fdm_filament_bvoh", - "sub_path": "filament/fdm_filament_bvoh.json" - }, - { - "name": "fdm_filament_eva", - "sub_path": "filament/fdm_filament_eva.json" - }, - { - "name": "fdm_filament_hips", - "sub_path": "filament/fdm_filament_hips.json" - }, - { - "name": "fdm_filament_pa", - "sub_path": "filament/fdm_filament_pa.json" + "name": "fdm_filament_pet", + "sub_path": "filament/fdm_filament_pet.json" }, { "name": "fdm_filament_pc", @@ -321,164 +313,176 @@ "sub_path": "filament/fdm_filament_pctg.json" }, { - "name": "fdm_filament_pe", - "sub_path": "filament/fdm_filament_pe.json" - }, - { - "name": "fdm_filament_pet", - "sub_path": "filament/fdm_filament_pet.json" - }, - { - "name": "fdm_filament_pha", - "sub_path": "filament/fdm_filament_pha.json" - }, - { - "name": "fdm_filament_pla", - "sub_path": "filament/fdm_filament_pla.json" - }, - { - "name": "fdm_filament_pp", - "sub_path": "filament/fdm_filament_pp.json" - }, - { - "name": "fdm_filament_ppa", - "sub_path": "filament/fdm_filament_ppa.json" - }, - { - "name": "fdm_filament_pps", - "sub_path": "filament/fdm_filament_pps.json" + "name": "fdm_filament_asa", + "sub_path": "filament/fdm_filament_asa.json" }, { "name": "fdm_filament_pva", "sub_path": "filament/fdm_filament_pva.json" }, { - "name": "fdm_filament_sbs", - "sub_path": "filament/fdm_filament_sbs.json" + "name": "fdm_filament_pa", + "sub_path": "filament/fdm_filament_pa.json" }, { - "name": "fdm_filament_tpu", - "sub_path": "filament/fdm_filament_tpu.json" + "name": "fdm_filament_hips", + "sub_path": "filament/fdm_filament_hips.json" + }, + { + "name": "fdm_filament_pps", + "sub_path": "filament/fdm_filament_pps.json" + }, + { + "name": "fdm_filament_ppa", + "sub_path": "filament/fdm_filament_ppa.json" + }, + { + "name": "fdm_filament_pe", + "sub_path": "filament/fdm_filament_pe.json" + }, + { + "name": "fdm_filament_pp", + "sub_path": "filament/fdm_filament_pp.json" + }, + { + "name": "fdm_filament_eva", + "sub_path": "filament/fdm_filament_eva.json" + }, + { + "name": "fdm_filament_pha", + "sub_path": "filament/fdm_filament_pha.json" + }, + { + "name": "fdm_filament_bvoh", + "sub_path": "filament/fdm_filament_bvoh.json" + }, + { + "name": "fdm_filament_sbs", + "sub_path": "filament/fdm_filament_sbs.json" + }, + { + "name": "Tiertime PLA", + "sub_path": "filament/Tiertime PLA.json" }, { "name": "Tiertime ABS", "sub_path": "filament/Tiertime ABS.json" }, - { - "name": "Tiertime ABS@300HS", - "sub_path": "filament/Tiertime ABS@300HS.json" - }, - { - "name": "Tiertime Generic ABS", - "sub_path": "filament/Tiertime Generic ABS.json" - }, - { - "name": "Tiertime Generic ABS@300HS", - "sub_path": "filament/Tiertime Generic ABS@300HS.json" - }, { "name": "Tiertime ASA", "sub_path": "filament/Tiertime ASA.json" }, - { - "name": "Tiertime ASA@300HS", - "sub_path": "filament/Tiertime ASA@300HS.json" - }, - { - "name": "Tiertime Generic ASA", - "sub_path": "filament/Tiertime Generic ASA.json" - }, - { - "name": "Tiertime Generic ASA@300HS", - "sub_path": "filament/Tiertime Generic ASA@300HS.json" - }, - { - "name": "Tiertime Generic BVOH", - "sub_path": "filament/Tiertime Generic BVOH.json" - }, - { - "name": "Tiertime Generic BVOH@300HS", - "sub_path": "filament/Tiertime Generic BVOH@300HS.json" - }, - { - "name": "Tiertime Generic EVA", - "sub_path": "filament/Tiertime Generic EVA.json" - }, - { - "name": "Tiertime Generic EVA@300HS", - "sub_path": "filament/Tiertime Generic EVA@300HS.json" - }, - { - "name": "Tiertime Generic HIPS", - "sub_path": "filament/Tiertime Generic HIPS.json" - }, - { - "name": "Tiertime Generic HIPS@300HS", - "sub_path": "filament/Tiertime Generic HIPS@300HS.json" - }, - { - "name": "Tiertime Generic PA", - "sub_path": "filament/Tiertime Generic PA.json" - }, - { - "name": "Tiertime Generic PA-CF", - "sub_path": "filament/Tiertime Generic PA-CF.json" - }, - { - "name": "Tiertime Generic PA-CF@300HS", - "sub_path": "filament/Tiertime Generic PA-CF@300HS.json" - }, - { - "name": "Tiertime Generic PA@300HS", - "sub_path": "filament/Tiertime Generic PA@300HS.json" - }, { "name": "Tiertime PA6-CF", "sub_path": "filament/Tiertime PA6-CF.json" }, - { - "name": "Tiertime PA6-CF@300HS", - "sub_path": "filament/Tiertime PA6-CF@300HS.json" - }, - { - "name": "Tiertime Generic PC", - "sub_path": "filament/Tiertime Generic PC.json" - }, - { - "name": "Tiertime Generic PC@300HS", - "sub_path": "filament/Tiertime Generic PC@300HS.json" - }, { "name": "Tiertime PC", "sub_path": "filament/Tiertime PC.json" }, + { + "name": "Tiertime PET-CF", + "sub_path": "filament/Tiertime PET-CF.json" + }, + { + "name": "Tiertime PETG", + "sub_path": "filament/Tiertime PETG.json" + }, + { + "name": "Tiertime PLA-CF", + "sub_path": "filament/Tiertime PLA-CF.json" + }, + { + "name": "Tiertime PVA", + "sub_path": "filament/Tiertime PVA.json" + }, + { + "name": "Tiertime TPU 95A", + "sub_path": "filament/Tiertime TPU 95A.json" + }, + { + "name": "Tiertime PLA@300HS", + "sub_path": "filament/Tiertime PLA@300HS.json" + }, + { + "name": "Tiertime ABS@300HS", + "sub_path": "filament/Tiertime ABS@300HS.json" + }, + { + "name": "Tiertime ASA@300HS", + "sub_path": "filament/Tiertime ASA@300HS.json" + }, + { + "name": "Tiertime PA6-CF@300HS", + "sub_path": "filament/Tiertime PA6-CF@300HS.json" + }, { "name": "Tiertime PC@300HS", "sub_path": "filament/Tiertime PC@300HS.json" }, + { + "name": "Tiertime PET-CF@300HS", + "sub_path": "filament/Tiertime PET-CF@300HS.json" + }, + { + "name": "Tiertime PETG@300HS", + "sub_path": "filament/Tiertime PETG@300HS.json" + }, + { + "name": "Tiertime PLA-CF@300HS", + "sub_path": "filament/Tiertime PLA-CF@300HS.json" + }, + { + "name": "Tiertime PVA@300HS", + "sub_path": "filament/Tiertime PVA@300HS.json" + }, + { + "name": "Tiertime TPU 95A@300HS", + "sub_path": "filament/Tiertime TPU 95A@300HS.json" + }, + { + "name": "Tiertime Generic ABS", + "sub_path": "filament/Tiertime Generic ABS.json" + }, + { + "name": "Tiertime Generic ASA", + "sub_path": "filament/Tiertime Generic ASA.json" + }, + { + "name": "Tiertime Generic BVOH", + "sub_path": "filament/Tiertime Generic BVOH.json" + }, + { + "name": "Tiertime Generic EVA", + "sub_path": "filament/Tiertime Generic EVA.json" + }, + { + "name": "Tiertime Generic HIPS", + "sub_path": "filament/Tiertime Generic HIPS.json" + }, + { + "name": "Tiertime Generic PA-CF", + "sub_path": "filament/Tiertime Generic PA-CF.json" + }, + { + "name": "Tiertime Generic PA", + "sub_path": "filament/Tiertime Generic PA.json" + }, + { + "name": "Tiertime Generic PC", + "sub_path": "filament/Tiertime Generic PC.json" + }, { "name": "Tiertime Generic PCTG", "sub_path": "filament/Tiertime Generic PCTG.json" }, - { - "name": "Tiertime Generic PCTG@300HS", - "sub_path": "filament/Tiertime Generic PCTG@300HS.json" - }, - { - "name": "Tiertime Generic PE", - "sub_path": "filament/Tiertime Generic PE.json" - }, { "name": "Tiertime Generic PE-CF", "sub_path": "filament/Tiertime Generic PE-CF.json" }, { - "name": "Tiertime Generic PE-CF@300HS", - "sub_path": "filament/Tiertime Generic PE-CF@300HS.json" - }, - { - "name": "Tiertime Generic PE@300HS", - "sub_path": "filament/Tiertime Generic PE@300HS.json" + "name": "Tiertime Generic PE", + "sub_path": "filament/Tiertime Generic PE.json" }, { "name": "Tiertime Generic PETG", @@ -488,62 +492,131 @@ "name": "Tiertime Generic PETG-CF", "sub_path": "filament/Tiertime Generic PETG-CF.json" }, - { - "name": "Tiertime Generic PETG-CF@300HS", - "sub_path": "filament/Tiertime Generic PETG-CF@300HS.json" - }, - { - "name": "Tiertime Generic PETG@300HS", - "sub_path": "filament/Tiertime Generic PETG@300HS.json" - }, - { - "name": "Tiertime PET-CF", - "sub_path": "filament/Tiertime PET-CF.json" - }, - { - "name": "Tiertime PET-CF@300HS", - "sub_path": "filament/Tiertime PET-CF@300HS.json" - }, - { - "name": "Tiertime PETG", - "sub_path": "filament/Tiertime PETG.json" - }, - { - "name": "Tiertime PETG@300HS", - "sub_path": "filament/Tiertime PETG@300HS.json" - }, { "name": "Tiertime Generic PHA", "sub_path": "filament/Tiertime Generic PHA.json" }, - { - "name": "Tiertime Generic PHA@300HS", - "sub_path": "filament/Tiertime Generic PHA@300HS.json" - }, - { - "name": "Tiertime Generic PLA", - "sub_path": "filament/Tiertime Generic PLA.json" - }, { "name": "Tiertime Generic PLA High Speed", "sub_path": "filament/Tiertime Generic PLA High Speed.json" }, - { - "name": "Tiertime Generic PLA High Speed@300HS", - "sub_path": "filament/Tiertime Generic PLA High Speed@300HS.json" - }, { "name": "Tiertime Generic PLA Silk", "sub_path": "filament/Tiertime Generic PLA Silk.json" }, - { - "name": "Tiertime Generic PLA Silk@300HS", - "sub_path": "filament/Tiertime Generic PLA Silk@300HS.json" - }, { "name": "Tiertime Generic PLA-CF", "sub_path": "filament/Tiertime Generic PLA-CF.json" }, + { + "name": "Tiertime Generic PLA", + "sub_path": "filament/Tiertime Generic PLA.json" + }, + { + "name": "Tiertime Generic PP-CF", + "sub_path": "filament/Tiertime Generic PP-CF.json" + }, + { + "name": "Tiertime Generic PP-GF", + "sub_path": "filament/Tiertime Generic PP-GF.json" + }, + { + "name": "Tiertime Generic PP", + "sub_path": "filament/Tiertime Generic PP.json" + }, + { + "name": "Tiertime Generic PPA-CF", + "sub_path": "filament/Tiertime Generic PPA-CF.json" + }, + { + "name": "Tiertime Generic PPA-GF", + "sub_path": "filament/Tiertime Generic PPA-GF.json" + }, + { + "name": "Tiertime Generic PPS-CF", + "sub_path": "filament/Tiertime Generic PPS-CF.json" + }, + { + "name": "Tiertime Generic PPS", + "sub_path": "filament/Tiertime Generic PPS.json" + }, + { + "name": "Tiertime Generic PVA", + "sub_path": "filament/Tiertime Generic PVA.json" + }, + { + "name": "Tiertime Generic SBS", + "sub_path": "filament/Tiertime Generic SBS.json" + } + , + { + "name": "Tiertime Generic TPU", + "sub_path": "filament/Tiertime Generic TPU.json" + }, + { + "name": "Tiertime Generic ABS@300HS", + "sub_path": "filament/Tiertime Generic ABS@300HS.json" + }, + { + "name": "Tiertime Generic ASA@300HS", + "sub_path": "filament/Tiertime Generic ASA@300HS.json" + }, + { + "name": "Tiertime Generic BVOH@300HS", + "sub_path": "filament/Tiertime Generic BVOH@300HS.json" + }, + { + "name": "Tiertime Generic EVA@300HS", + "sub_path": "filament/Tiertime Generic EVA@300HS.json" + }, + { + "name": "Tiertime Generic HIPS@300HS", + "sub_path": "filament/Tiertime Generic HIPS@300HS.json" + }, + { + "name": "Tiertime Generic PA-CF@300HS", + "sub_path": "filament/Tiertime Generic PA-CF@300HS.json" + }, + { + "name": "Tiertime Generic PA@300HS", + "sub_path": "filament/Tiertime Generic PA@300HS.json" + }, + { + "name": "Tiertime Generic PC@300HS", + "sub_path": "filament/Tiertime Generic PC@300HS.json" + }, + { + "name": "Tiertime Generic PCTG@300HS", + "sub_path": "filament/Tiertime Generic PCTG@300HS.json" + }, + { + "name": "Tiertime Generic PE-CF@300HS", + "sub_path": "filament/Tiertime Generic PE-CF@300HS.json" + }, + { + "name": "Tiertime Generic PE@300HS", + "sub_path": "filament/Tiertime Generic PE@300HS.json" + }, + { + "name": "Tiertime Generic PETG@300HS", + "sub_path": "filament/Tiertime Generic PETG@300HS.json" + }, + { + "name": "Tiertime Generic PETG-CF@300HS", + "sub_path": "filament/Tiertime Generic PETG-CF@300HS.json" + }, + { + "name": "Tiertime Generic PHA@300HS", + "sub_path": "filament/Tiertime Generic PHA@300HS.json" + }, + { + "name": "Tiertime Generic PLA High Speed@300HS", + "sub_path": "filament/Tiertime Generic PLA High Speed@300HS.json" + }, + { + "name": "Tiertime Generic PLA Silk@300HS", + "sub_path": "filament/Tiertime Generic PLA Silk@300HS.json" + }, { "name": "Tiertime Generic PLA-CF@300HS", "sub_path": "filament/Tiertime Generic PLA-CF@300HS.json" @@ -552,38 +625,10 @@ "name": "Tiertime Generic PLA@300HS", "sub_path": "filament/Tiertime Generic PLA@300HS.json" }, - { - "name": "Tiertime PLA", - "sub_path": "filament/Tiertime PLA.json" - }, - { - "name": "Tiertime PLA-CF", - "sub_path": "filament/Tiertime PLA-CF.json" - }, - { - "name": "Tiertime PLA-CF@300HS", - "sub_path": "filament/Tiertime PLA-CF@300HS.json" - }, - { - "name": "Tiertime PLA@300HS", - "sub_path": "filament/Tiertime PLA@300HS.json" - }, - { - "name": "Tiertime Generic PP", - "sub_path": "filament/Tiertime Generic PP.json" - }, - { - "name": "Tiertime Generic PP-CF", - "sub_path": "filament/Tiertime Generic PP-CF.json" - }, { "name": "Tiertime Generic PP-CF@300HS", "sub_path": "filament/Tiertime Generic PP-CF@300HS.json" }, - { - "name": "Tiertime Generic PP-GF", - "sub_path": "filament/Tiertime Generic PP-GF.json" - }, { "name": "Tiertime Generic PP-GF@300HS", "sub_path": "filament/Tiertime Generic PP-GF@300HS.json" @@ -592,30 +637,14 @@ "name": "Tiertime Generic PP@300HS", "sub_path": "filament/Tiertime Generic PP@300HS.json" }, - { - "name": "Tiertime Generic PPA-CF", - "sub_path": "filament/Tiertime Generic PPA-CF.json" - }, { "name": "Tiertime Generic PPA-CF@300HS", "sub_path": "filament/Tiertime Generic PPA-CF@300HS.json" }, - { - "name": "Tiertime Generic PPA-GF", - "sub_path": "filament/Tiertime Generic PPA-GF.json" - }, { "name": "Tiertime Generic PPA-GF@300HS", "sub_path": "filament/Tiertime Generic PPA-GF@300HS.json" }, - { - "name": "Tiertime Generic PPS", - "sub_path": "filament/Tiertime Generic PPS.json" - }, - { - "name": "Tiertime Generic PPS-CF", - "sub_path": "filament/Tiertime Generic PPS-CF.json" - }, { "name": "Tiertime Generic PPS-CF@300HS", "sub_path": "filament/Tiertime Generic PPS-CF@300HS.json" @@ -624,45 +653,18 @@ "name": "Tiertime Generic PPS@300HS", "sub_path": "filament/Tiertime Generic PPS@300HS.json" }, - { - "name": "Tiertime Generic PVA", - "sub_path": "filament/Tiertime Generic PVA.json" - }, { "name": "Tiertime Generic PVA@300HS", "sub_path": "filament/Tiertime Generic PVA@300HS.json" }, - { - "name": "Tiertime PVA", - "sub_path": "filament/Tiertime PVA.json" - }, - { - "name": "Tiertime PVA@300HS", - "sub_path": "filament/Tiertime PVA@300HS.json" - }, - { - "name": "Tiertime Generic SBS", - "sub_path": "filament/Tiertime Generic SBS.json" - }, { "name": "Tiertime Generic SBS@300HS", "sub_path": "filament/Tiertime Generic SBS@300HS.json" - }, - { - "name": "Tiertime Generic TPU", - "sub_path": "filament/Tiertime Generic TPU.json" - }, + } + , { "name": "Tiertime Generic TPU@300HS", "sub_path": "filament/Tiertime Generic TPU@300HS.json" - }, - { - "name": "Tiertime TPU 95A", - "sub_path": "filament/Tiertime TPU 95A.json" - }, - { - "name": "Tiertime TPU 95A@300HS", - "sub_path": "filament/Tiertime TPU 95A@300HS.json" } ], "machine_list": [ @@ -675,16 +677,16 @@ "sub_path": "machine/fdm_tiertime_common.json" }, { - "name": "Tiertime UP300 HS 0.4 nozzle", - "sub_path": "machine/Tiertime UP300 HS 0.4 nozzle.json" + "name": "Tiertime UP400 Pro 0.4 nozzle", + "sub_path": "machine/Tiertime UP400 Pro 0.4 nozzle.json" }, { "name": "Tiertime UP310 Pro 0.4 nozzle", "sub_path": "machine/Tiertime UP310 Pro 0.4 nozzle.json" }, { - "name": "Tiertime UP400 Pro 0.4 nozzle", - "sub_path": "machine/Tiertime UP400 Pro 0.4 nozzle.json" + "name": "Tiertime UP300 HS 0.4 nozzle", + "sub_path": "machine/Tiertime UP300 HS 0.4 nozzle.json" }, { "name": "Tiertime UP600 HS 0.4 nozzle", @@ -707,4 +709,4 @@ "sub_path": "machine/Tiertime UP600 HS 0.8 nozzle.json" } ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS.json b/resources/profiles/Tiertime/filament/Tiertime ABS.json index 0d1f7453ee..70b94c9aa7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ABS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ABS.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Tiertime ABS", - "inherits": "fdm_filament_abs", - "from": "system", - "setting_id": "GFSB00", "filament_id": "GFB00", + "setting_id": "GFSB00", + "name": "Tiertime ABS", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_abs", "filament_flow_ratio": [ "0.95" ], @@ -30,4 +30,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json index a9a29e2591..fb743e6bff 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Tiertime ABS@300HS", - "inherits": "fdm_filament_abs", - "from": "system", - "setting_id": "GFSB00", "filament_id": "GFB00_01", + "setting_id": "GFSB00", + "name": "Tiertime ABS@300HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_abs", "filament_flow_ratio": [ "0.95" ], @@ -30,4 +30,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime ASA.json b/resources/profiles/Tiertime/filament/Tiertime ASA.json index e483aba7d2..ae29f1ed8e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ASA.json +++ b/resources/profiles/Tiertime/filament/Tiertime ASA.json @@ -41,4 +41,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json index 092151f031..f238c443c4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json @@ -41,4 +41,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json index c0b16c6d4a..f01903df40 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json @@ -35,4 +35,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json index 463e8e8d37..7b4eb78abe 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json @@ -35,4 +35,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json b/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json index e1f4a66477..41f3ab6f7d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json @@ -29,4 +29,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json index 9b9aeb188b..5a616e10ff 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json @@ -29,4 +29,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json index 3fd96b3326..b3193bce62 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json @@ -11,4 +11,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json index c04269f3b8..9937ba29b9 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json @@ -11,4 +11,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json b/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json index 375ac412af..86b3c4b7e4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json @@ -89,4 +89,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json index 87a30d57b1..a7b6895227 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json @@ -89,4 +89,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json index 79625ac208..30e66d1c20 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json @@ -14,4 +14,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json index 744206b3bc..a47793a81a 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json @@ -14,4 +14,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json index c5215c816a..2ca188ada0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic PA-CF", "inherits": "fdm_filament_pa", "from": "system", - "setting_id": "GFSN99", "filament_id": "GFN98", + "setting_id": "GFSN99", "instantiation": "true", "fan_cooling_layer_time": [ "5" @@ -36,4 +36,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json index 558399b876..cd43e74d13 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic PA-CF@300HS", "inherits": "fdm_filament_pa", "from": "system", - "setting_id": "GFSN99", "filament_id": "GFN98_02", + "setting_id": "GFSN99", "instantiation": "true", "fan_cooling_layer_time": [ "5" @@ -36,4 +36,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA.json index 20f1b1cd45..3b73d30ef6 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic PA", "inherits": "fdm_filament_pa", "from": "system", - "setting_id": "GFSN98", "filament_id": "GFN99", + "setting_id": "GFSN98", "instantiation": "true", "chamber_temperatures": [ "60" @@ -54,4 +54,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json index 83195885de..139f935a58 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic PA@300HS", "inherits": "fdm_filament_pa", "from": "system", - "setting_id": "GFSN98", "filament_id": "GFN99_01", + "setting_id": "GFSN98", "instantiation": "true", "chamber_temperatures": [ "60" @@ -54,4 +54,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json b/resources/profiles/Tiertime/filament/Tiertime Generic PC.json index c44ac1ce53..28a4b501a3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PC.json @@ -17,4 +17,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json index 6b99e8c28b..7249c99ff8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json @@ -17,4 +17,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json index be670f1234..a4ebf5fb4f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json @@ -77,4 +77,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json index f4668b0e90..f5c6a5492f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json @@ -77,4 +77,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json index a1f9c363b3..291aba7a9c 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json @@ -41,4 +41,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json index e328e6d2cf..cb3ab02dce 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json @@ -41,4 +41,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE.json index 5a2912f7a0..ecc9fd25e0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE.json @@ -38,4 +38,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json index 0edd1dcde0..7f685e648f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json @@ -38,4 +38,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json index 2e6c956c3e..e0e164f4f7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json @@ -83,4 +83,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json index 16af90a8ea..31173b9ded 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json @@ -83,4 +83,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json index 2ffe424260..2032234129 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json @@ -68,4 +68,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json index 4f278cb47b..6cd353ffa1 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json @@ -68,4 +68,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json index e224f44dd8..1d5a367141 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json @@ -11,4 +11,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json index 5498471a7f..e1a25d2df5 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json @@ -11,4 +11,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json index 54652180a6..fac65fd7c6 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json @@ -20,4 +20,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json index 6ca59aa567..ce33779722 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json @@ -20,4 +20,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json index d08d8bad3f..28a68d3fec 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json @@ -26,4 +26,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json index 52aafebe1b..1f162fc058 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json @@ -26,4 +26,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json index d2a296d932..99532b4f11 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json @@ -56,4 +56,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json index acb3477896..dd3e9f5985 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json @@ -56,4 +56,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json index d6b048de43..222385001e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json @@ -20,4 +20,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json index f5ec4c2930..ada01e9059 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json @@ -20,4 +20,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json index 74c54d5226..ed6cb19d75 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json @@ -23,4 +23,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json index c85e1d364e..aa5f757db4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json @@ -23,4 +23,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json index e096bded4f..954b8fcb72 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json @@ -23,4 +23,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json index 74e8c9148e..0867a0f2f1 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json @@ -23,4 +23,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP.json index 5cf5251643..21a2be9083 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP.json @@ -11,4 +11,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json index d8a7d01582..edb94271d3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json @@ -11,4 +11,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json index 6457434cb8..1230f920c2 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json @@ -23,4 +23,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json index c182a49c40..3e27e9b7ee 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json @@ -23,4 +23,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json index 1cff829916..43a767c865 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json @@ -17,4 +17,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json index 786241f02a..dc83f5bdae 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json @@ -17,4 +17,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json index a6a54ff66d..cc406f7537 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json @@ -32,4 +32,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json index 44912355fa..70db00a4b1 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json @@ -32,4 +32,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json index 38faa40d78..83240e1929 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json @@ -11,4 +11,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json index b1474b2420..f3ef115c75 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json @@ -11,4 +11,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json index 82c8766013..c551a1ccc8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json @@ -23,4 +23,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json index d2c6d51ed5..7d8828d15d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json @@ -23,4 +23,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json index ec346ed02b..f3d348eb08 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json @@ -20,4 +20,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json index dd9dfbe305..cc6aea2af0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json @@ -20,4 +20,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json b/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json index be7234c2aa..0fa7680147 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic TPU", "inherits": "fdm_filament_tpu", "from": "system", - "setting_id": "GFSR99", "filament_id": "GFU99", + "setting_id": "GFSR99", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" @@ -18,4 +18,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif} \n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json index 1caff87b0c..ab95bc93e0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json @@ -3,8 +3,8 @@ "name": "Tiertime Generic TPU@300HS", "inherits": "fdm_filament_tpu", "from": "system", - "setting_id": "GFSR99", "filament_id": "GFU99_01", + "setting_id": "GFSR99", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" @@ -18,4 +18,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif} \n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json b/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json index 9b292fda34..8e43b34eb5 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json @@ -50,4 +50,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json index cd05cca583..3212fd312f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json @@ -45,9 +45,9 @@ "170" ], "compatible_printers": [ - "Tiertime UP300 HS 0.4 nozzle", + "Tiertime UP300 HS 0.4 nozzle", "Tiertime UP600 HS 0.4 nozzle", "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PC.json b/resources/profiles/Tiertime/filament/Tiertime PC.json index edb08356c1..9fa8363812 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PC.json +++ b/resources/profiles/Tiertime/filament/Tiertime PC.json @@ -26,4 +26,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json index 6d3d7a8bad..cf6557da45 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json @@ -26,4 +26,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PET-CF.json b/resources/profiles/Tiertime/filament/Tiertime PET-CF.json index 47fcb26213..a6bfd29226 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PET-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PET-CF.json @@ -95,4 +95,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json index 774075b1c1..0109e4d32e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json @@ -95,4 +95,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PETG.json b/resources/profiles/Tiertime/filament/Tiertime PETG.json index 14a7bddfb6..01de631e60 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PETG.json +++ b/resources/profiles/Tiertime/filament/Tiertime PETG.json @@ -83,4 +83,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json index a16922700a..a4c1ffb7b7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json @@ -83,4 +83,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json b/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json index 8434f34187..09c2d5e179 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json @@ -59,4 +59,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json index 705abe102c..d56dd450b4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json @@ -59,4 +59,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA.json b/resources/profiles/Tiertime/filament/Tiertime PLA.json index 9089f32246..04621989ea 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Tiertime PLA", - "inherits": "fdm_filament_pla", - "from": "system", - "setting_id": "GFSA00", "filament_id": "GFA00", + "setting_id": "GFSA00", + "name": "Tiertime PLA", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_pla", "filament_cost": [ "24.99" ], @@ -33,4 +33,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json index 70d6cfbb42..20361a44d3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Tiertime PLA@300HS", - "inherits": "fdm_filament_pla", - "from": "system", - "setting_id": "GFSA00", "filament_id": "GFA00_01", + "setting_id": "GFSA00", + "name": "Tiertime PLA@300HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_filament_pla", "filament_cost": [ "24.99" ], @@ -33,4 +33,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PVA.json b/resources/profiles/Tiertime/filament/Tiertime PVA.json index 05d4f33fe2..33bc46167e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime PVA.json @@ -41,4 +41,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json index c62e163d35..46a6cddee7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json @@ -41,4 +41,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json b/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json index 7ec3883348..aa8ae677e8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json +++ b/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json @@ -26,4 +26,4 @@ "Tiertime UP400 Pro 0.8 nozzle", "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json b/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json index 884fede020..717c794ade 100644 --- a/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json @@ -26,4 +26,4 @@ "Tiertime UP600 HS 0.6 nozzle", "Tiertime UP600 HS 0.8 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_abs.json b/resources/profiles/Tiertime/filament/fdm_filament_abs.json index e870d17029..50dc3facf1 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_abs.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_abs.json @@ -79,4 +79,4 @@ "textured_plate_temp_initial_layer": [ "90" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_asa.json b/resources/profiles/Tiertime/filament/fdm_filament_asa.json index a0da767a75..62d3faef09 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_asa.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_asa.json @@ -79,4 +79,4 @@ "textured_plate_temp_initial_layer": [ "90" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json b/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json index 2b481e35d8..6431a87bd2 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_bvoh.json @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_common.json b/resources/profiles/Tiertime/filament/fdm_filament_common.json index 8ee05fd399..3fb3a8da5e 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_common.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_common.json @@ -163,4 +163,4 @@ "filament_end_gcode": [ "; filament end gcode \n;M106 P3 S0\n" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_eva.json b/resources/profiles/Tiertime/filament/fdm_filament_eva.json index 1b2efe2999..3ce2b1844e 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_eva.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_eva.json @@ -7,4 +7,4 @@ "filament_type": [ "EVA" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_hips.json b/resources/profiles/Tiertime/filament/fdm_filament_hips.json index 4d1b09d37a..50ee869f2c 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_hips.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_hips.json @@ -76,4 +76,4 @@ "additional_cooling_fan_speed": [ "0" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pa.json b/resources/profiles/Tiertime/filament/fdm_filament_pa.json index 1cd78ec77f..06ddafc639 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pa.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pa.json @@ -79,4 +79,4 @@ "textured_plate_temp_initial_layer": [ "100" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pc.json b/resources/profiles/Tiertime/filament/fdm_filament_pc.json index 03bc9e5663..6ffb3ad9ff 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pc.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pc.json @@ -79,4 +79,4 @@ "textured_plate_temp_initial_layer": [ "110" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pctg.json b/resources/profiles/Tiertime/filament/fdm_filament_pctg.json index f31c08b83b..70b72a506b 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pctg.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pctg.json @@ -1,64 +1,64 @@ { - "type": "filament", - "name": "fdm_filament_pctg", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "fan_cooling_layer_time": [ - "20" - ], - "fan_min_speed": [ - "20" - ], - "filament_cost": [ - "30" - ], - "filament_density": [ - "1.27" - ], - "filament_max_volumetric_speed": [ - "25" - ], - "filament_type": [ - "PCTG" - ], - "hot_plate_temp": [ - "80" - ], - "hot_plate_temp_initial_layer": [ - "80" - ], - "nozzle_temperature": [ - "255" - ], - "nozzle_temperature_initial_layer": [ - "255" - ], - "nozzle_temperature_range_high": [ - "260" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "temperature_vitrification": [ - "70" - ], - "textured_plate_temp": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" - ] -} \ No newline at end of file + "type": "filament", + "name": "fdm_filament_pctg", + "inherits": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "20" + ], + "fan_min_speed": [ + "20" + ], + "filament_cost": [ + "30" + ], + "filament_density": [ + "1.27" + ], + "filament_max_volumetric_speed": [ + "25" + ], + "filament_type": [ + "PCTG" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "nozzle_temperature_range_high": [ + "260" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "temperature_vitrification": [ + "70" + ], + "textured_plate_temp": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ] +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pe.json b/resources/profiles/Tiertime/filament/fdm_filament_pe.json index 8ce20df68a..5c18673ae8 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pe.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pe.json @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pet.json b/resources/profiles/Tiertime/filament/fdm_filament_pet.json index 4a5f6085ca..d563dd7cc4 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pet.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pet.json @@ -61,4 +61,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pha.json b/resources/profiles/Tiertime/filament/fdm_filament_pha.json index 82519f1b2e..a51be2dcf7 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pha.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pha.json @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pla.json b/resources/profiles/Tiertime/filament/fdm_filament_pla.json index ca4425056d..349acbdcc5 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pla.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pla.json @@ -79,4 +79,4 @@ "filament_start_gcode": [ "; filament start gcode\n;{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n;{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n;{endif}\n\n;{if activate_air_filtration[current_extruder] && support_air_filtration}\n;M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n;{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pp.json b/resources/profiles/Tiertime/filament/fdm_filament_pp.json index 83a4278250..cc4e584569 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pp.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pp.json @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_ppa.json b/resources/profiles/Tiertime/filament/fdm_filament_ppa.json index f2ea53d315..74159abeb5 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_ppa.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_ppa.json @@ -85,4 +85,4 @@ "textured_plate_temp_initial_layer": [ "100" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pps.json b/resources/profiles/Tiertime/filament/fdm_filament_pps.json index a3f104b6f3..881609b890 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pps.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pps.json @@ -76,4 +76,4 @@ "textured_plate_temp_initial_layer": [ "110" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_pva.json b/resources/profiles/Tiertime/filament/fdm_filament_pva.json index 7d0bdf1b4a..4ef2acf185 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_pva.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_pva.json @@ -88,4 +88,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_sbs.json b/resources/profiles/Tiertime/filament/fdm_filament_sbs.json index e7cd5788de..5f9bdb4d2f 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_sbs.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_sbs.json @@ -11,7 +11,7 @@ "23" ], "filament_type": [ - "SBS" + "SBS" ], "filament_density": [ "1.02" @@ -82,4 +82,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/filament/fdm_filament_tpu.json b/resources/profiles/Tiertime/filament/fdm_filament_tpu.json index 461f76f202..1914ac3029 100644 --- a/resources/profiles/Tiertime/filament/fdm_filament_tpu.json +++ b/resources/profiles/Tiertime/filament/fdm_filament_tpu.json @@ -76,4 +76,4 @@ "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json index be6f8e1644..f719989ecf 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP300 HS 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP300 HS 0.4 nozzle", - "inherits": "fdm_tiertime_common", - "from": "system", "setting_id": "GM001", + "name": "Tiertime UP300 HS 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_tiertime_common", "printer_model": "Tiertime UP300 HS", "nozzle_diameter": [ "0.4" @@ -16,5 +16,6 @@ "207x255", "0x255" ], + "printable_height": "230" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json b/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json index 3e5cae8859..0434ec601d 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP300 HS.json @@ -9,4 +9,4 @@ "bed_texture": "", "hotend_model": "", "default_materials": "Tiertime ABS;Tiertime PLA" -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json index ea8ec79657..9824250597 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP310 Pro 0.4 nozzle", - "inherits": "fdm_tiertime_common", - "from": "system", "setting_id": "GM001", + "name": "Tiertime UP310 Pro 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_tiertime_common", "printer_model": "Tiertime UP310 Pro", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json index 4dbe0b1806..1f528a5619 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP310 Pro.json @@ -9,4 +9,4 @@ "bed_texture": "", "hotend_model": "", "default_materials": "Tiertime ABS;Tiertime PLA" -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json index ffe0c54e80..d64c6d7215 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP400 Pro 0.4 nozzle", - "inherits": "fdm_tiertime_common", - "from": "system", "setting_id": "GM001", + "name": "Tiertime UP400 Pro 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_tiertime_common", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.4" @@ -16,5 +16,6 @@ "400x350", "0x350" ], + "printable_height": "380" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json index a64e7d9fc7..a9b5f873b5 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP400 Pro 0.6 nozzle", - "inherits": "Tiertime UP400 Pro 0.4 nozzle", - "from": "system", "setting_id": "GM007", + "name": "Tiertime UP400 Pro 0.6 nozzle", + "from": "system", "instantiation": "true", + "inherits": "Tiertime UP400 Pro 0.4 nozzle", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.6" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json index 2f860276a7..0210838f37 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP400 Pro 0.8 nozzle", - "inherits": "Tiertime UP400 Pro 0.4 nozzle", - "from": "system", "setting_id": "GM008", + "name": "Tiertime UP400 Pro 0.8 nozzle", + "from": "system", "instantiation": "true", + "inherits": "Tiertime UP400 Pro 0.4 nozzle", "printer_model": "Tiertime UP400 Pro", "nozzle_diameter": [ "0.8" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json index 1cfcbfef5f..74d5686112 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP400 Pro.json @@ -9,4 +9,4 @@ "bed_texture": "", "hotend_model": "", "default_materials": "Tiertime ABS;Tiertime PLA" -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json index 5f93151cf0..a1444ca656 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.4 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP600 HS 0.4 nozzle", - "inherits": "fdm_tiertime_common", - "from": "system", "setting_id": "GM006", + "name": "Tiertime UP600 HS 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_tiertime_common", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.4" @@ -16,5 +16,6 @@ "500x400", "0x400" ], + "printable_height": "600" -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json index f1fd8db2c1..d9099fc198 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP600 HS 0.6 nozzle", - "inherits": "Tiertime UP600 HS 0.4 nozzle", - "from": "system", "setting_id": "GM009", + "name": "Tiertime UP600 HS 0.6 nozzle", + "from": "system", "instantiation": "true", + "inherits": "Tiertime UP600 HS 0.4 nozzle", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.6" diff --git a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json index ea3d0a7751..3c855e3a3b 100644 --- a/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json +++ b/resources/profiles/Tiertime/machine/Tiertime UP600 HS 0.8 nozzle.json @@ -1,10 +1,10 @@ { "type": "machine", - "name": "Tiertime UP600 HS 0.8 nozzle", - "inherits": "Tiertime UP600 HS 0.4 nozzle", - "from": "system", "setting_id": "GM010", + "name": "Tiertime UP600 HS 0.8 nozzle", + "from": "system", "instantiation": "true", + "inherits": "Tiertime UP600 HS 0.4 nozzle", "printer_model": "Tiertime UP600 HS", "nozzle_diameter": [ "0.8" diff --git a/resources/profiles/Tiertime/machine/fdm_machine_common.json b/resources/profiles/Tiertime/machine/fdm_machine_common.json index 01be62eb16..5785f57b19 100644 --- a/resources/profiles/Tiertime/machine/fdm_machine_common.json +++ b/resources/profiles/Tiertime/machine/fdm_machine_common.json @@ -116,4 +116,4 @@ "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_pause_gcode": "M601" -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/machine/fdm_tiertime_common.json b/resources/profiles/Tiertime/machine/fdm_tiertime_common.json index 7a25ceb3c0..55f8ddc4d0 100644 --- a/resources/profiles/Tiertime/machine/fdm_tiertime_common.json +++ b/resources/profiles/Tiertime/machine/fdm_tiertime_common.json @@ -1,141 +1,60 @@ { - "type": "machine", - "name": "fdm_tiertime_common", - "inherits": "fdm_machine_common", - "from": "system", - "instantiation": "false", - "gcode_flavor": "klipper", - "machine_max_acceleration_e": [ - "5000", - "5000" - ], - "machine_max_acceleration_extruding": [ - "20000", - "20000" - ], - "machine_max_acceleration_retracting": [ - "5000", - "5000" - ], - "machine_max_acceleration_travel": [ - "20000", - "20000" - ], - "machine_max_acceleration_x": [ - "20000", - "20000" - ], - "machine_max_acceleration_y": [ - "20000", - "20000" - ], - "machine_max_acceleration_z": [ - "500", - "200" - ], - "machine_max_speed_e": [ - "25", - "25" - ], - "machine_max_speed_x": [ - "500", - "200" - ], - "machine_max_speed_y": [ - "500", - "200" - ], - "machine_max_speed_z": [ - "12", - "12" - ], - "machine_max_jerk_e": [ - "2.5", - "2.5" - ], - "machine_max_jerk_x": [ - "9", - "9" - ], - "machine_max_jerk_y": [ - "9", - "9" - ], - "machine_max_jerk_z": [ - "0.2", - "0.4" - ], - "machine_min_extruding_rate": [ - "0", - "0" - ], - "machine_min_travel_rate": [ - "0", - "0" - ], - "max_layer_height": [ - "0.32" - ], - "min_layer_height": [ - "0.08" - ], - "printable_height": "250", - "extruder_clearance_radius": "65", - "extruder_clearance_height_to_rod": "36", - "extruder_clearance_height_to_lid": "140", - "printer_settings_id": "", - "printer_technology": "FFF", - "printer_variant": "0.4", - "retraction_minimum_travel": [ - "1" - ], - "retract_before_wipe": [ - "70%" - ], - "retract_when_changing_layer": [ - "1" - ], - "retraction_length": [ - "0.8" - ], - "retract_length_toolchange": [ - "2" - ], - "z_hop": [ - "0.4" - ], - "retract_restart_extra": [ - "0" - ], - "retract_restart_extra_toolchange": [ - "0" - ], - "retraction_speed": [ - "30" - ], - "deretraction_speed": [ - "30" - ], - "z_hop_types": "Normal Lift", - "silent_mode": "0", - "single_extruder_multi_material": "1", - "change_filament_gcode": "", - "wipe": [ - "1" - ], - "default_filament_profile": [ - "" - ], - "default_print_profile": "0.20mm Standard @Tiertime UP400 Pro", - "bed_exclude_area": [ - "0x0" - ], - "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", - "machine_end_gcode": "PRINT_END", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", - "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", - "machine_pause_gcode": "PAUSE", - "scan_first_layer": "0", - "nozzle_type": "undefine", - "auxiliary_fan": "0" -} \ No newline at end of file + "type": "machine", + "name": "fdm_tiertime_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_machine_common", + "gcode_flavor": "klipper", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["20000", "20000"], + "machine_max_acceleration_x": ["20000", "20000"], + "machine_max_acceleration_y": ["20000", "20000"], + "machine_max_acceleration_z": ["500", "200"], + "machine_max_speed_e": ["25", "25"], + "machine_max_speed_x": ["500", "200"], + "machine_max_speed_y": ["500", "200"], + "machine_max_speed_z": ["12", "12"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["9", "9"], + "machine_max_jerk_y": ["9", "9"], + "machine_max_jerk_z": ["0.2", "0.4"], + "machine_min_extruding_rate": ["0", "0"], + "machine_min_travel_rate": ["0", "0"], + "max_layer_height": ["0.32"], + "min_layer_height": ["0.08"], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "printer_settings_id": "", + "printer_technology": "FFF", + "printer_variant": "0.4", + "retraction_minimum_travel": ["1"], + "retract_before_wipe": ["70%"], + "retract_when_changing_layer": ["1"], + "retraction_length": ["0.8"], + "retract_length_toolchange": ["2"], + "z_hop": ["0.4"], + "retract_restart_extra": ["0"], + "retract_restart_extra_toolchange": ["0"], + "retraction_speed": ["30"], + "deretraction_speed": ["30"], + "z_hop_types": "Normal Lift", + "silent_mode": "0", + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": ["1"], + "default_filament_profile": [""], + "default_print_profile": "0.20mm Standard @Tiertime UP400 Pro", + "bed_exclude_area": ["0x0"], + "machine_start_gcode": ";M190 S[bed_temperature_initial_layer_single]\n;M109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", + "machine_end_gcode": "PRINT_END", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_pause_gcode": "PAUSE", + "scan_first_layer": "0", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json index 326af9a794..0b28527515 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.12mm Fine @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.12mm Fine @Tiertime UP300 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json index a4e64fe16c..3010fb6621 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.12mm Fine @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.12mm Fine @Tiertime UP310 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json index ce4402d958..7f816d75e1 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.12mm Fine @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.12mm Fine @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.12", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", diff --git a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json index 550d745f45..648f276690 100644 --- a/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.12mm Fine @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.12mm Fine @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP026", + "name": "0.12mm Fine @Tiertime UP600 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.12", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "5", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json index 5ae46e69eb..d1cb291fe3 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.16mm Optimal @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.16mm Optimal @Tiertime UP300 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json index 71f3a2c18d..1ba9ce59de 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.16mm Optimal @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.16mm Optimal @Tiertime UP310 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json index 69be2579fc..2ed7fee647 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.16mm Optimal @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.16mm Optimal @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json index 7e882d8673..871a8026d0 100644 --- a/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.16mm Optimal @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.16mm Optimal @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP025", + "name": "0.16mm Optimal @Tiertime UP600 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.16", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "4", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json index 70321a808e..c0eda5e055 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP300 HS.json @@ -1,9 +1,9 @@ { "type": "process", - "name": "0.20mm Standard @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.20mm Standard @Tiertime UP300 HS", + "from": "system", + "inherits": "fdm_process_tiertime_HS_common", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", @@ -19,4 +19,4 @@ "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json index 9c9b5b045b..75b76f4af9 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP310 Pro.json @@ -1,9 +1,9 @@ { "type": "process", - "name": "0.20mm Standard @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.20mm Standard @Tiertime UP310 Pro", + "from": "system", + "inherits": "fdm_process_tiertime_common", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", @@ -19,4 +19,4 @@ "compatible_printers": [ "Tiertime UP310 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json index ef3e54e73c..03983e92b6 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.20mm Standard @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP001", + "name": "0.20mm Standard @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.2", "initial_layer_speed": "50", "initial_layer_infill_speed": "105", @@ -17,4 +17,4 @@ "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json index 4c6211ac25..6c91083e77 100644 --- a/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.20mm Standard @Tiertime UP600 HS.json @@ -1,9 +1,9 @@ { "type": "process", - "name": "0.20mm Standard @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP024", + "name": "0.20mm Standard @Tiertime UP600 HS", + "from": "system", + "inherits": "fdm_process_tiertime_HS_common", "instantiation": "true", "elefant_foot_compensation": "0.15", "top_shell_thickness": "1.0", @@ -19,4 +19,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json index 01a55cee4e..aff711e457 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.24mm Draft @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.24mm Draft @Tiertime UP300 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json index 5d62a10904..e18ab49b6f 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.24mm Draft @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.24mm Draft @Tiertime UP310 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json index 3b26042dc7..b871e7fca2 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.24mm Draft @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.24mm Draft @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", @@ -22,4 +22,4 @@ "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json index 74f9ccc3d3..42a539e1da 100644 --- a/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.24mm Draft @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.24mm Draft @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP027", + "name": "0.24mm Draft @Tiertime UP600 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.24", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "3", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json index 01bcedb5db..55bf4aecd5 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP300 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.28mm Extra Draft @Tiertime UP300 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP004", + "name": "0.28mm Extra Draft @Tiertime UP300 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json index 69170d2057..e583827013 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP310 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.28mm Extra Draft @Tiertime UP310 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.28mm Extra Draft @Tiertime UP310 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json index 459e27b9ba..0d1f98665b 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP400 Pro.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.28mm Extra Draft @Tiertime UP400 Pro", - "inherits": "fdm_process_tiertime_common", - "from": "system", "setting_id": "GP004", + "name": "0.28mm Extra Draft @Tiertime UP400 Pro", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_common", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", @@ -22,4 +22,4 @@ "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json index 46c6a5fb50..a0bd17c20b 100644 --- a/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json +++ b/resources/profiles/Tiertime/process/0.28mm Extra Draft @Tiertime UP600 HS.json @@ -1,10 +1,10 @@ { "type": "process", - "name": "0.28mm Extra Draft @Tiertime UP600 HS", - "inherits": "fdm_process_tiertime_HS_common", - "from": "system", "setting_id": "GP028", + "name": "0.28mm Extra Draft @Tiertime UP600 HS", + "from": "system", "instantiation": "true", + "inherits": "fdm_process_tiertime_HS_common", "layer_height": "0.28", "elefant_foot_compensation": "0.15", "bottom_shell_layers": "3", @@ -27,4 +27,4 @@ "compatible_printers": [ "Tiertime UP600 HS 0.4 nozzle" ] -} \ No newline at end of file +} \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json index 13961dd979..8e7f118a94 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "120", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json index 1eb3a4491f..6512606b9e 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.18_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "120", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json index 9ceb2da962..256b2e3124 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "130", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json index cc947e167d..a4049ab8f0 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "130", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json index e9ffae1651..ac2c993a6d 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "120", "bridge_speed": "30", - "overhang_3_4_speed": "20" + "overhang_3_4_speed": "20", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json index b704c6ad40..415ee1bf21 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.24_nozzle_0.8_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "120", "bridge_speed": "30", - "overhang_3_4_speed": "20" + "overhang_3_4_speed": "20", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json index 2def5b7b96..86aa4ec504 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "150", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json index 5f2bf52824..dd8522a52c 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.30_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "150", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json index 2417c30e35..b3c7020260 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8.json @@ -23,5 +23,6 @@ "top_surface_speed": "140", "bridge_speed": "30", "overhang_3_4_speed": "20", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json index 7badd7801c..296d8f7338 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.32_nozzle_0.8_HS.json @@ -23,5 +23,6 @@ "top_surface_speed": "140", "bridge_speed": "30", "overhang_3_4_speed": "20", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json index 85788f980c..641a49b777 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "140", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json index dde41c32d2..57bfafa56a 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.36_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "140", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json index 68349a763c..6755c7569c 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8.json @@ -23,5 +23,6 @@ "top_surface_speed": "150", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json index 289483483b..159c20878c 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.40_nozzle_0.8_HS.json @@ -23,5 +23,6 @@ "top_surface_speed": "150", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json index 969968a6bf..884975e49c 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "130", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json index c12e5c1cf8..419ff22f46 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.42_nozzle_0.6_HS.json @@ -21,5 +21,6 @@ "sparse_infill_speed": "100", "top_surface_speed": "130", "bridge_speed": "30", - "overhang_3_4_speed": "15" + "overhang_3_4_speed": "15", + "tree_support_tip_diameter": "1.2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json index 05a58aaa18..265c418baf 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8.json @@ -23,5 +23,6 @@ "top_surface_speed": "140", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json index 6ffa082868..f444321ccd 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.48_nozzle_0.8_HS.json @@ -23,5 +23,6 @@ "top_surface_speed": "140", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json index 33125e016a..398a51f122 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8.json @@ -23,5 +23,6 @@ "top_surface_speed": "130", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json index 3ce5cc331d..99d3ac7b7e 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_0.56_nozzle_0.8_HS.json @@ -23,5 +23,6 @@ "top_surface_speed": "130", "bridge_speed": "30", "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5" + "overhang_4_4_speed": "5", + "tree_support_tip_diameter": "2" } \ No newline at end of file diff --git a/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json b/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json index deaf9a5bd7..d15757f153 100644 --- a/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json +++ b/resources/profiles/Tiertime/process/fdm_process_tiertime_common.json @@ -20,7 +20,6 @@ "inner_wall_acceleration": "5000", "top_surface_acceleration": "2000", "initial_layer_acceleration": "500", - "wall_infill_order": "outer wall/inner wall/infill", "line_width": "0.42", "internal_bridge_support_thickness": "0.8", "initial_layer_line_width": "0.5", @@ -75,5 +74,6 @@ "prime_tower_width": "35", "wall_generator": "classic", "exclude_object": "1", + "wall_infill_order": "outer wall/inner wall/infill", "compatible_printers": [] } \ No newline at end of file