From a1996bcb10eb6230064424484c3bde1c327e4af1 Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Thu, 12 Oct 2023 11:24:48 -0400 Subject: [PATCH 001/166] Create voron quality templates for TPU, ASA, & PVA --- .../voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.40_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.40_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.40_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.60_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.60_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.60_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_ASA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_ASA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_PVA_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_PVA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_TPU_extrafast.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_0.80_TPU_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_ASA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_PVA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_TPU_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_ASA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_PVA_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 14 ++++++++++++++ .../voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_TPU_supersprint.inst.cfg | 14 ++++++++++++++ .../voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 14 ++++++++++++++ 120 files changed, 1680 insertions(+) create mode 100644 resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg create mode 100644 resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg new file mode 100644 index 0000000000..ebc976366b --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg new file mode 100644 index 0000000000..9804ecf711 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg new file mode 100644 index 0000000000..2beda6c48c --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg new file mode 100644 index 0000000000..31cecf17f5 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg new file mode 100644 index 0000000000..104bfea97c --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg new file mode 100644 index 0000000000..133d241475 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg new file mode 100644 index 0000000000..01fd220329 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg new file mode 100644 index 0000000000..0fe59289dd --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg new file mode 100644 index 0000000000..1aa2318ebf --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg new file mode 100644 index 0000000000..cdcc1f12e6 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg new file mode 100644 index 0000000000..ba19a931fa --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg new file mode 100644 index 0000000000..500b391974 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.25mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg new file mode 100644 index 0000000000..f7746ae45b --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg new file mode 100644 index 0000000000..7d1e6db8c4 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg new file mode 100644 index 0000000000..b170db68d7 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg new file mode 100644 index 0000000000..cb80eac320 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg new file mode 100644 index 0000000000..44e3e41ec6 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg new file mode 100644 index 0000000000..577d95bcae --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg new file mode 100644 index 0000000000..aa42898194 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg new file mode 100644 index 0000000000..9aabb6bdf5 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg new file mode 100644 index 0000000000..ef73cde4d0 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg new file mode 100644 index 0000000000..89afd5ad5a --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg new file mode 100644 index 0000000000..260cbcb0a0 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg new file mode 100644 index 0000000000..e80548bd26 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.30mm + +[values] +speed_print = 200 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg new file mode 100644 index 0000000000..e0ddf3bd84 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg new file mode 100644 index 0000000000..1cbd9bc682 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg new file mode 100644 index 0000000000..80b638f5d0 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg new file mode 100644 index 0000000000..b46f16fa10 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg new file mode 100644 index 0000000000..0b805a3a9c --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg new file mode 100644 index 0000000000..87d6cf9767 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg new file mode 100644 index 0000000000..3eb0d48c2a --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg new file mode 100644 index 0000000000..d4aa532a51 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 270 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg new file mode 100644 index 0000000000..f3c5ca5709 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.35mm + +[values] +speed_print = 180 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg new file mode 100644 index 0000000000..d68c76b16a --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg new file mode 100644 index 0000000000..0b83b76b8a --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg new file mode 100644 index 0000000000..5f48c4fff5 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_asa +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg new file mode 100644 index 0000000000..f9dcc943d7 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg new file mode 100644 index 0000000000..16c5652c63 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg new file mode 100644 index 0000000000..e1c234aa84 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg new file mode 100644 index 0000000000..23140f2504 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_pva +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg new file mode 100644 index 0000000000..68476222a5 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg new file mode 100644 index 0000000000..d5e79b4fd2 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg new file mode 100644 index 0000000000..17ec969aab --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg new file mode 100644 index 0000000000..321aae21df --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fine +version = 4 + +[metadata] +material = generic_tpu +quality_type = fine +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 240 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg new file mode 100644 index 0000000000..9f01426ed5 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.40mm + +[values] +speed_print = 160 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg new file mode 100644 index 0000000000..2004264a7d --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg new file mode 100644 index 0000000000..eaa57826bb --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg new file mode 100644 index 0000000000..b53900a9ca --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg new file mode 100644 index 0000000000..479e901e11 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg new file mode 100644 index 0000000000..0c8355ec63 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg new file mode 100644 index 0000000000..c4bb92bbfc --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg new file mode 100644 index 0000000000..8d543ca12d --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg new file mode 100644 index 0000000000..be0ab318ff --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg new file mode 100644 index 0000000000..63e12aacba --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg new file mode 100644 index 0000000000..4a892490da --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg new file mode 100644 index 0000000000..b83a897baf --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg new file mode 100644 index 0000000000..3a23a4d851 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.50mm + +[values] +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg new file mode 100644 index 0000000000..100582ef57 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg new file mode 100644 index 0000000000..805c10660d --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg new file mode 100644 index 0000000000..a99b46e74a --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg new file mode 100644 index 0000000000..70c26fe0a4 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg new file mode 100644 index 0000000000..3c530199a1 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg new file mode 100644 index 0000000000..a4ce01d225 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg new file mode 100644 index 0000000000..66b6c9f1e8 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg new file mode 100644 index 0000000000..969dafa035 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg new file mode 100644 index 0000000000..1add8697ec --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.60mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg new file mode 100644 index 0000000000..4cb0c22e5d --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg new file mode 100644 index 0000000000..36f7f3191e --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg new file mode 100644 index 0000000000..ce92a788dc --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = supersprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg new file mode 100644 index 0000000000..2cad6b7cc9 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg new file mode 100644 index 0000000000..7e20740ad1 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg new file mode 100644 index 0000000000..72040ce7b9 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = supersprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 24 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg new file mode 100644 index 0000000000..2c9b28648e --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg new file mode 100644 index 0000000000..e17eb9ac17 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg new file mode 100644 index 0000000000..10eb64e8a7 --- /dev/null +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = supersprint +setting_version = 22 +type = quality +variant = V6 0.80mm + +[values] +speed_print = 24 diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg new file mode 100644 index 0000000000..692fdababb --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg new file mode 100644 index 0000000000..3bf3e44a7b --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg new file mode 100644 index 0000000000..2187c6b83e --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_asa +quality_type = normal +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg new file mode 100644 index 0000000000..28082467f8 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg new file mode 100644 index 0000000000..2b6e31b2d1 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg new file mode 100644 index 0000000000..337788f5eb --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = normal +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg new file mode 100644 index 0000000000..5af8bffbd1 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg new file mode 100644 index 0000000000..3fb36fe8cc --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg new file mode 100644 index 0000000000..a44a11224b --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Normal +version = 4 + +[metadata] +material = generic_tpu +quality_type = normal +setting_version = 22 +type = quality +variant = Volcano 0.40mm + +[values] +speed_print = 300 diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg new file mode 100644 index 0000000000..10038d6733 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 165 diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg new file mode 100644 index 0000000000..21a1fcc6dd --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg new file mode 100644 index 0000000000..96a5251d22 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg new file mode 100644 index 0000000000..f8250e0170 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 165 diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg new file mode 100644 index 0000000000..e551012466 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg new file mode 100644 index 0000000000..48258a6333 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg new file mode 100644 index 0000000000..2875de3bc8 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 165 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg new file mode 100644 index 0000000000..52c5f4595d --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = fast +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 250 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg new file mode 100644 index 0000000000..301599b3fc --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.60mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg new file mode 100644 index 0000000000..ca35c2ff05 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_asa +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg new file mode 100644 index 0000000000..2431f3d22b --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg new file mode 100644 index 0000000000..9c75131832 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 70 diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg new file mode 100644 index 0000000000..f89060d180 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_pva +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg new file mode 100644 index 0000000000..b02d096b43 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg new file mode 100644 index 0000000000..f553eb5b44 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 70 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg new file mode 100644 index 0000000000..59d0e08426 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Extra Fast +version = 4 + +[metadata] +material = generic_tpu +quality_type = extrafast +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg new file mode 100644 index 0000000000..77493a918a --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 90 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg new file mode 100644 index 0000000000..def0ddd15e --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 0.80mm + +[values] +speed_print = 70 diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg new file mode 100644 index 0000000000..bfd9c26752 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg new file mode 100644 index 0000000000..5c36feef58 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg new file mode 100644 index 0000000000..8e58f73be3 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg new file mode 100644 index 0000000000..6b92ba820f --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg new file mode 100644 index 0000000000..33f7e6ea82 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg new file mode 100644 index 0000000000..45b7ad0708 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg new file mode 100644 index 0000000000..011e388c7e --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg new file mode 100644 index 0000000000..603629754f --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg new file mode 100644 index 0000000000..a9a393ab4c --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.00mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg new file mode 100644 index 0000000000..0bb1bd6dee --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg new file mode 100644 index 0000000000..726fcd22b3 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg new file mode 100644 index 0000000000..690fc8aac6 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_asa +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg new file mode 100644 index 0000000000..b0dcf50b9f --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg new file mode 100644 index 0000000000..4f0cbe518f --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg new file mode 100644 index 0000000000..df2430e76f --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_pva +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 40 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg new file mode 100644 index 0000000000..162c4e75be --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = sprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 60 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg new file mode 100644 index 0000000000..51fca8354c --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Super Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = supersprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 50 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg new file mode 100644 index 0000000000..afe89c11b2 --- /dev/null +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = voron2_base +name = Ultra Sprint +version = 4 + +[metadata] +material = generic_tpu +quality_type = ultrasprint +setting_version = 22 +type = quality +variant = Volcano 1.20mm + +[values] +speed_print = 40 From 2f7cc785d47940f40315fc13ff5b7c1f7ed01ad7 Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Sat, 30 Dec 2023 11:00:32 -0500 Subject: [PATCH 002/166] Update TPU profiles to half default print speed --- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 1aa2318ebf..41d00c386c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index cdcc1f12e6..139176c8b0 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 180 +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index ba19a931fa..fe5508166f 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 500b391974..bebf33324c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.25mm [values] -speed_print = 240 +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index ef73cde4d0..b10f1b0246 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index 89afd5ad5a..d9b9dd2239 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 160 +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 260cbcb0a0..5e4b35b65d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index e80548bd26..4d4d2fad6a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.30mm [values] -speed_print = 200 +speed_print = 100 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 3eb0d48c2a..9a47ce845c 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 +speed_print = 67.5 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index d4aa532a51..8de361f76a 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 270 +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index f3c5ca5709..039984b24c 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.35mm [values] -speed_print = 180 +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index d5e79b4fd2..185df5fe8b 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 17ec969aab..360fa87bdf 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 321aae21df..6bb6848807 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 240 +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 9f01426ed5..86c66009a3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.40mm [values] -speed_print = 160 +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 63e12aacba..1100df1e0d 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 4a892490da..1633f9841f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 90 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index b83a897baf..1a49abd348 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 120 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 3a23a4d851..5b4553e54c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 +speed_print = 22.5 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 66b6c9f1e8..b53023163a 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 50 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 969dafa035..d031c9c171 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 80 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 1add8697ec..2fa799ed41 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 2c9b28648e..ec41888442 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 40 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index e17eb9ac17..4c6bb7faf6 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 30 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 10eb64e8a7..44d2d139aa 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = V6 0.80mm [values] -speed_print = 24 +speed_print = 12 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 5af8bffbd1..a3fa3c8552 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 250 +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 3fb36fe8cc..13ed5db3c6 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index a44a11224b..2e290dc6ad 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 300 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 2875de3bc8..2761c51a66 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 165 +speed_print = 82.5 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 52c5f4595d..35fd653034 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 250 +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 301599b3fc..de30290f49 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 59d0e08426..e98ebb2929 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 125 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 77493a918a..e2d26ed930 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 90 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index def0ddd15e..764cb3e5a8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 70 +speed_print = 35 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 011e388c7e..93d5f61057 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 75 +speed_print = 37.5 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 603629754f..4e40b98011 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index a9a393ab4c..32b3ac7bae 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 50 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 162c4e75be..d3c1735d01 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 51fca8354c..d010a7424d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 50 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index afe89c11b2..8a227f7e2a 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -11,4 +11,4 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 40 +speed_print = 20 From 5fac8e49536a6386e26cd354bb1199385f4bd61a Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Sat, 30 Dec 2023 12:00:44 -0500 Subject: [PATCH 003/166] Automated refactoring --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 1 + 120 files changed, 120 insertions(+) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index ebc976366b..493a5c3df7 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index 9804ecf711..2ddc0226a7 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index 2beda6c48c..30eb2b0db3 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index 31cecf17f5..0a7bd540a9 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index 104bfea97c..ae513c2d97 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index 133d241475..383c5c7012 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index 01fd220329..afb57510b0 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index 0fe59289dd..5ec6a73ae6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 41d00c386c..8a3b92d806 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 139176c8b0..41d45a8bf0 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index fe5508166f..f6f444b105 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index bebf33324c..06e30b7747 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index f7746ae45b..1229399396 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index 7d1e6db8c4..d2912da65f 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index b170db68d7..98b9932437 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index cb80eac320..ba92ae0cd2 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 200 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 44e3e41ec6..973e129fdf 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index 577d95bcae..216df62213 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index aa42898194..931e8413cd 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index 9aabb6bdf5..f54b0052d7 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 200 + diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index b10f1b0246..cd9fc72e26 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index d9b9dd2239..aace6cda1d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 5e4b35b65d..5ae10c6ee2 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 4d4d2fad6a..fd4bfb609c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 100 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index e0ddf3bd84..ca321a4b76 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 1cbd9bc682..6e4a78dc03 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 270 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 80b638f5d0..096152bfd7 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index b46f16fa10..48f9844b6b 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index 0b805a3a9c..77e3b72ab5 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 270 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index 87d6cf9767..10f5d429d6 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 9a47ce845c..967697958a 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 67.5 + diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 8de361f76a..8987523190 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index 039984b24c..e94d00a67b 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index d68c76b16a..826bf0bdd0 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index 0b83b76b8a..7e0e9890c2 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index 5f48c4fff5..e86cd87002 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index f9dcc943d7..a0a22942f2 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index 16c5652c63..cd973ed51f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index e1c234aa84..a95e17a479 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index 23140f2504..18300cf771 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index 68476222a5..84c1d0699d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 185df5fe8b..d1fd9e5e6d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 360fa87bdf..162777e8fe 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 6bb6848807..860bf7055d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 86c66009a3..35b3065585 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index 2004264a7d..113311a809 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index eaa57826bb..5ba13532f9 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index b53900a9ca..1c9ef83c97 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index 479e901e11..efb2a540d2 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index 0c8355ec63..064d48ca69 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index c4bb92bbfc..405fde8695 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index 8d543ca12d..e3263ad178 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index be0ab318ff..f4a771194a 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 1100df1e0d..2701b082fd 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 1633f9841f..7277888f1c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 1a49abd348..47e35c1240 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 5b4553e54c..bff3567199 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 22.5 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index 100582ef57..c96c60fbf9 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index 805c10660d..c02b5d6dc3 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index a99b46e74a..3e8e05d141 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 70c26fe0a4..255ced0194 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index 3c530199a1..c3b1d62ac6 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index a4ce01d225..d77abeffd6 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index b53023163a..d3a0e72fa9 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 25 + diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index d031c9c171..8b98c3a135 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 2fa799ed41..c0adbbf212 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 20 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 4cb0c22e5d..6b0fbbdbb0 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index 36f7f3191e..c306db902a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index ce92a788dc..29578491b6 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 24 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index 2cad6b7cc9..cd4c274fe2 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index 7e20740ad1..f607c9b8fa 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 72040ce7b9..77513d7591 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 24 + diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index ec41888442..9254ae49c3 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 20 + diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 4c6bb7faf6..0fcdc37a3a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 15 + diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 44d2d139aa..87f5f87d5f 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 12 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index 692fdababb..cfd6add883 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 3bf3e44a7b..6c27dd130c 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index 2187c6b83e..0f290b7cb1 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 28082467f8..96a2f30f13 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index 2b6e31b2d1..77a4511043 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index 337788f5eb..9b49d2e193 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index a3fa3c8552..2e13c2dff2 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 13ed5db3c6..de9b69c8cc 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 2e290dc6ad..501ac919ad 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 150 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index 10038d6733..49707c696c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 165 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index 21a1fcc6dd..b3a19c030e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index 96a5251d22..ef0aea9157 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index f8250e0170..5e9909e678 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 165 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index e551012466..cd1182e8a6 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index 48258a6333..27b0b6b1ed 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 2761c51a66..17e5ad6adc 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 82.5 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 35fd653034..4196040066 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index de30290f49..974e147fd7 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 62.5 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index ca35c2ff05..22bc6e1f8e 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 2431f3d22b..4241e9b395 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index 9c75131832..f74b55a629 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 70 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index f89060d180..f0ecdb8ca3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index b02d096b43..96b47167f9 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index f553eb5b44..4e2e171a4f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 70 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index e98ebb2929..11d00339fa 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 62.5 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index e2d26ed930..0a5edb2d14 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 764cb3e5a8..8e3014b431 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 35 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index bfd9c26752..23671640c0 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 75 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index 5c36feef58..0d6ad1e5c3 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index 8e58f73be3..a9d0e9f7b5 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index 6b92ba820f..c848cb5158 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 75 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index 33f7e6ea82..bfae62d430 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 45b7ad0708..7f639f3c4d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 93d5f61057..c9553f59fa 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 37.5 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 4e40b98011..8344e000a3 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 32b3ac7bae..ea098d3f60 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 25 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index 0bb1bd6dee..2996d1decd 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 726fcd22b3..3317131bdd 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index 690fc8aac6..8e349deeba 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index b0dcf50b9f..13885a6d9b 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 4f0cbe518f..09159c31e1 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index df2430e76f..63b15c3142 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index d3c1735d01..e7096cd5d4 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index d010a7424d..b4c891e91c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 25 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 8a227f7e2a..59e16a7dc2 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 20 + From 123e2e7ed4ada3ec9033db9d743d0e6b1610c9ca Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Mon, 3 Jun 2024 14:21:59 -0400 Subject: [PATCH 004/166] Update TPU print speed to 1/4 default speed --- .../quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 4 ++-- 40 files changed, 80 insertions(+), 80 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 8a3b92d806..5da5439310 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.25mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 41d45a8bf0..c7357e7ad7 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.25mm [values] -speed_print = 90 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index f6f444b105..5409cfcd9e 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.25mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 06e30b7747..2cff4392a9 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.25mm [values] -speed_print = 120 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index cd9fc72e26..06b2da2b9d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.30mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index aace6cda1d..d635c83005 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.30mm [values] -speed_print = 80 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 5ae10c6ee2..db281b027f 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.30mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index fd4bfb609c..fb4bb2ff34 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.30mm [values] -speed_print = 100 +speed_print = 50 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 967697958a..581e36ea95 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.35mm [values] -speed_print = 67.5 +speed_print = 33.75 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 8987523190..363c05bdcc 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.35mm [values] -speed_print = 135 +speed_print = 67.5 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index e94d00a67b..f7fe05ebfc 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.35mm [values] -speed_print = 90 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index d1fd9e5e6d..5759fa713a 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.40mm [values] -speed_print = 40 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 162777e8fe..393d608e4a 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.40mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 860bf7055d..cce573ca54 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.40mm [values] -speed_print = 120 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 35b3065585..ddadeda661 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.40mm [values] -speed_print = 80 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 2701b082fd..a6c5cfe2f7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.50mm [values] -speed_print = 30 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 7277888f1c..9e608f42ce 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.50mm [values] -speed_print = 45 +speed_print = 22.5 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 47e35c1240..1762784c5a 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.50mm [values] -speed_print = 60 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index bff3567199..eb8a281402 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.50mm [values] -speed_print = 22.5 +speed_print = 11.25 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index d3a0e72fa9..bd6b41e227 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.60mm [values] -speed_print = 25 +speed_print = 12.5 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 8b98c3a135..6e39b47a1a 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.60mm [values] -speed_print = 40 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index c0adbbf212..dfdd12eee8 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.60mm [values] -speed_print = 20 +speed_print = 10 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 9254ae49c3..6c9e84f82c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.80mm [values] -speed_print = 20 +speed_print = 10 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 0fcdc37a3a..5311ea8892 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.80mm [values] -speed_print = 15 +speed_print = 7.5 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 87f5f87d5f..bb32162e75 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 2 type = quality variant = V6 0.80mm [values] -speed_print = 12 +speed_print = 6 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 2e13c2dff2..9354b2d56d 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.40mm [values] -speed_print = 125 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index de9b69c8cc..c77b167ed9 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.40mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 501ac919ad..ab872b2453 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.40mm [values] -speed_print = 150 +speed_print = 75 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 17e5ad6adc..80955fe2d1 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.60mm [values] -speed_print = 82.5 +speed_print = 41.25 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 4196040066..29bcd8bd4f 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 974e147fd7..6c9421ae85 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.60mm [values] -speed_print = 62.5 +speed_print = 31.25 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 11d00339fa..8405cc9c50 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.80mm [values] -speed_print = 62.5 +speed_print = 31.25 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 0a5edb2d14..1fd21898c0 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.80mm [values] -speed_print = 45 +speed_print = 22.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 8e3014b431..8d125246a0 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 0.80mm [values] -speed_print = 35 +speed_print = 17.5 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index c9553f59fa..1127409471 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.00mm [values] -speed_print = 37.5 +speed_print = 18.75 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 8344e000a3..e1e8d5fe32 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.00mm [values] -speed_print = 30 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index ea098d3f60..018120006e 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.00mm [values] -speed_print = 25 +speed_print = 12.5 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index e7096cd5d4..76d329b6d8 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.20mm [values] -speed_print = 30 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index b4c891e91c..60b7aa7b95 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.20mm [values] -speed_print = 25 +speed_print = 12.5 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 59e16a7dc2..147fb614d4 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 22 +setting_version = 2 type = quality variant = Volcano 1.20mm [values] -speed_print = 20 +speed_print = 10 From b1237930f282c5928d9a30ce4be22546f915b2c5 Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Thu, 20 Jun 2024 13:47:26 -0400 Subject: [PATCH 005/166] Revert "Update TPU print speed to 1/4 default speed" This reverts commit 123e2e7ed4ada3ec9033db9d743d0e6b1610c9ca. --- .../quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 4 ++-- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 4 ++-- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 4 ++-- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 4 ++-- 40 files changed, 80 insertions(+), 80 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 5da5439310..8a3b92d806 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.25mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index c7357e7ad7..41d45a8bf0 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.25mm [values] -speed_print = 45 +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 5409cfcd9e..f6f444b105 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.25mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 2cff4392a9..06e30b7747 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.25mm [values] -speed_print = 60 +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 06b2da2b9d..cd9fc72e26 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.30mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index d635c83005..aace6cda1d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.30mm [values] -speed_print = 40 +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index db281b027f..5ae10c6ee2 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.30mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index fb4bb2ff34..fd4bfb609c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.30mm [values] -speed_print = 50 +speed_print = 100 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 581e36ea95..967697958a 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.35mm [values] -speed_print = 33.75 +speed_print = 67.5 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 363c05bdcc..8987523190 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.35mm [values] -speed_print = 67.5 +speed_print = 135 diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index f7fe05ebfc..e94d00a67b 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.35mm [values] -speed_print = 45 +speed_print = 90 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 5759fa713a..d1fd9e5e6d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.40mm [values] -speed_print = 20 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 393d608e4a..162777e8fe 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.40mm [values] -speed_print = 30 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index cce573ca54..860bf7055d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.40mm [values] -speed_print = 60 +speed_print = 120 diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index ddadeda661..35b3065585 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.40mm [values] -speed_print = 40 +speed_print = 80 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index a6c5cfe2f7..2701b082fd 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.50mm [values] -speed_print = 15 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 9e608f42ce..7277888f1c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.50mm [values] -speed_print = 22.5 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 1762784c5a..47e35c1240 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.50mm [values] -speed_print = 30 +speed_print = 60 diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index eb8a281402..bff3567199 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.50mm [values] -speed_print = 11.25 +speed_print = 22.5 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index bd6b41e227..d3a0e72fa9 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.60mm [values] -speed_print = 12.5 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 6e39b47a1a..8b98c3a135 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.60mm [values] -speed_print = 20 +speed_print = 40 diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index dfdd12eee8..c0adbbf212 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.60mm [values] -speed_print = 10 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 6c9e84f82c..9254ae49c3 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.80mm [values] -speed_print = 10 +speed_print = 20 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 5311ea8892..0fcdc37a3a 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.80mm [values] -speed_print = 7.5 +speed_print = 15 diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index bb32162e75..87f5f87d5f 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 2 +setting_version = 22 type = quality variant = V6 0.80mm [values] -speed_print = 6 +speed_print = 12 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 9354b2d56d..2e13c2dff2 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.40mm [values] -speed_print = 62.5 +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index c77b167ed9..de9b69c8cc 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.40mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index ab872b2453..501ac919ad 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.40mm [values] -speed_print = 75 +speed_print = 150 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 80955fe2d1..17e5ad6adc 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.60mm [values] -speed_print = 41.25 +speed_print = 82.5 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 29bcd8bd4f..4196040066 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.60mm [values] -speed_print = 62.5 +speed_print = 125 diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 6c9421ae85..974e147fd7 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.60mm [values] -speed_print = 31.25 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 8405cc9c50..11d00339fa 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.80mm [values] -speed_print = 31.25 +speed_print = 62.5 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 1fd21898c0..0a5edb2d14 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.80mm [values] -speed_print = 22.5 +speed_print = 45 diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 8d125246a0..8e3014b431 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 0.80mm [values] -speed_print = 17.5 +speed_print = 35 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 1127409471..c9553f59fa 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.00mm [values] -speed_print = 18.75 +speed_print = 37.5 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index e1e8d5fe32..8344e000a3 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.00mm [values] -speed_print = 15 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 018120006e..ea098d3f60 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.00mm [values] -speed_print = 12.5 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 76d329b6d8..e7096cd5d4 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.20mm [values] -speed_print = 15 +speed_print = 30 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 60b7aa7b95..b4c891e91c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.20mm [values] -speed_print = 12.5 +speed_print = 25 diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 147fb614d4..59e16a7dc2 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,10 +6,10 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 2 +setting_version = 22 type = quality variant = Volcano 1.20mm [values] -speed_print = 10 +speed_print = 20 From e57de120e7a8f929b26a82e462536b1b6619f3bb Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Thu, 20 Jun 2024 13:52:37 -0400 Subject: [PATCH 006/166] Fix setting_version numbers after previous revert commit --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 3 +-- .../quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 3 +-- .../quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 3 +-- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 3 +-- resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 3 +-- .../voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 3 +-- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 120 files changed, 120 insertions(+), 200 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index 493a5c3df7..25cf918de3 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index 2ddc0226a7..b95644f29c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 180 - diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index 30eb2b0db3..f374cfa7ad 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index 0a7bd540a9..886853ea07 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 240 - diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index ae513c2d97..0f5f68f806 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index 383c5c7012..c777e5df43 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 180 - diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index afb57510b0..95b03145f1 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index 5ec6a73ae6..c8b6f447b0 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm [values] speed_print = 240 - diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 8a3b92d806..43b58d4e2b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 41d45a8bf0..04cf23e9f6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index f6f444b105..84487791c6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 06e30b7747..24f473751f 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index 1229399396..d09e45a6dc 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index d2912da65f..08fe21ac9b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 160 - diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index 98b9932437..86ea8ebf3d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index ba92ae0cd2..94d13b14b4 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 200 - diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 973e129fdf..84a8c392aa 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index 216df62213..39a0e2abec 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 160 - diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index 931e8413cd..0c495c3f39 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index f54b0052d7..3d11356390 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm [values] speed_print = 200 - diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index cd9fc72e26..51b08ec696 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index aace6cda1d..ce7f879c4b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 5ae10c6ee2..a8ec456ae0 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index fd4bfb609c..36ffb39a41 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index ca321a4b76..07637db3d9 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 135 - diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 6e4a78dc03..4147cc5a51 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 270 - diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 096152bfd7..446edac258 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 180 - diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index 48f9844b6b..b7ad0b7fb4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 135 - diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index 77e3b72ab5..cf3723bf56 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 270 - diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index 10f5d429d6..f5d2271fb9 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm [values] speed_print = 180 - diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 967697958a..c5213aff7f 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 8987523190..d5696ca6d0 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index e94d00a67b..e567a01193 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index 826bf0bdd0..a33f015495 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 80 - diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index 7e0e9890c2..d0919334c8 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 120 - diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index e86cd87002..d408e80a69 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 240 - diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index a0a22942f2..d72f3fa69a 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 160 - diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index cd973ed51f..f50542de3d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 80 - diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index a95e17a479..794f7c9f42 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 120 - diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index 18300cf771..dd760800f5 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 240 - diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index 84c1d0699d..c7c3fadd6a 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm [values] speed_print = 160 - diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index d1fd9e5e6d..ffb8300873 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 162777e8fe..922be924a6 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 860bf7055d..3b5378ba2a 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 35b3065585..b11a565db3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index 113311a809..e38c806be0 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index 5ba13532f9..bd382890ef 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 90 - diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index 1c9ef83c97..196d1237d5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 120 - diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index efb2a540d2..1c7105d9f7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 45 - diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index 064d48ca69..fbaed4cf07 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index 405fde8695..d5f0ca764e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 90 - diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index e3263ad178..0fdf3509e8 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 120 - diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index f4a771194a..b7a76abacc 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm [values] speed_print = 45 - diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 2701b082fd..6b8d0d573f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 7277888f1c..0bfec40462 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 47e35c1240..2761c4b4fa 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index bff3567199..6e0d8bced0 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index c96c60fbf9..d20f20c61c 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index c02b5d6dc3..466ff4e31b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 80 - diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index 3e8e05d141..97538706b3 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 255ced0194..065d3607ca 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index c3b1d62ac6..184f35515e 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 80 - diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index d77abeffd6..72039f2899 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index d3a0e72fa9..a13522261a 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 8b98c3a135..131d179918 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index c0adbbf212..9f26cd5543 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 6b0fbbdbb0..8cd040d090 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index c306db902a..7a773baa07 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 30 - diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index 29578491b6..b8b2fdc90c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 24 - diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index cd4c274fe2..7ed437fd2c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index f607c9b8fa..6eaa234c87 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 30 - diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 77513d7591..7a04a84118 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm [values] speed_print = 24 - diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 9254ae49c3..9ff7d91b58 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 0fcdc37a3a..6aa5f3138d 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 87f5f87d5f..571cb11b78 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index cfd6add883..5d36181fb0 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 250 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 6c27dd130c..6e6a2a2129 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index 0f290b7cb1..d60b961638 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 96a2f30f13..62b510b747 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 250 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index 77a4511043..ca6c64c9a5 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index 9b49d2e193..1186ab72bc 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm [values] speed_print = 300 - diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 2e13c2dff2..8246fdc0f1 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index de9b69c8cc..c2352fb90b 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 501ac919ad..a4e6a4de5c 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index 49707c696c..3506d904ff 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 165 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index b3a19c030e..6c9a5b3cc3 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 250 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index ef0aea9157..3ec8220523 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 125 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index 5e9909e678..5fe09c4ca8 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 165 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index cd1182e8a6..bf19eb7dc0 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 250 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index 27b0b6b1ed..5c51e326d9 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm [values] speed_print = 125 - diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 17e5ad6adc..26da41cc39 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 4196040066..b32518c57a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 974e147fd7..0c04090087 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index 22bc6e1f8e..d63a6859e3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 125 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 4241e9b395..7157480528 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 90 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index f74b55a629..69d7c611ec 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 70 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index f0ecdb8ca3..0ca125ac27 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 125 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index 96b47167f9..284e3a3df0 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 90 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index 4e2e171a4f..ba4f876889 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm [values] speed_print = 70 - diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 11d00339fa..4ff9f42302 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 0a5edb2d14..cee979a790 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 8e3014b431..e443d8dd05 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index 23671640c0..17f36968a1 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 75 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index 0d6ad1e5c3..ef67a15698 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index a9d0e9f7b5..2f5309fc0e 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index c848cb5158..1cf2f5bdb3 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 75 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index bfae62d430..24c8331ab9 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 7f639f3c4d..0e3f24c2ff 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index c9553f59fa..d4e583531b 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 8344e000a3..83cdbf0e28 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index ea098d3f60..ab7d9aedd0 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index 2996d1decd..ea744a797d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 3317131bdd..3803acc114 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index 8e349deeba..e38510ca0d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index 13885a6d9b..3ff28da765 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 60 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 09159c31e1..6b1350f480 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 50 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index 63b15c3142..e65f3bc294 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -6,10 +6,9 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm [values] speed_print = 40 - diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index e7096cd5d4..0dcb3f4859 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index b4c891e91c..b336b67629 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 59e16a7dc2..85c00089c9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 22 +setting_version = 23 type = quality variant = Volcano 1.20mm From dc5d1a6aed648114da0ca887a927874826ad6f1b Mon Sep 17 00:00:00 2001 From: NerdyGriffin Date: Thu, 20 Jun 2024 17:54:01 +0000 Subject: [PATCH 007/166] Applied printer-linter format --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 1 + resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 1 + resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 1 + .../quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 1 + 80 files changed, 80 insertions(+) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index 25cf918de3..d89894647c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index b95644f29c..e3d0252d49 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index f374cfa7ad..ab3e3e17ea 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index 886853ea07..b9e9565c3c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index 0f5f68f806..991ac5d101 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index c777e5df43..e148d1c4b6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index 95b03145f1..9b9a0ffee9 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index c8b6f447b0..d134c72fdb 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.25mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index d09e45a6dc..895ff9daf4 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index 08fe21ac9b..f10be46a98 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index 86ea8ebf3d..2b7356f1a5 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index 94d13b14b4..542b8d2986 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 200 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 84a8c392aa..2ce1651a4c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index 39a0e2abec..cac8e008e9 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index 0c495c3f39..616a9537c8 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index 3d11356390..75ed433d4c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.30mm [values] speed_print = 200 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index 07637db3d9..49bdf430a3 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 4147cc5a51..531dcb8b39 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 270 + diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 446edac258..656d982e01 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index b7ad0b7fb4..3b0eb953ba 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 135 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index cf3723bf56..51128170f4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 270 + diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index f5d2271fb9..00ba1c8267 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.35mm [values] speed_print = 180 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index a33f015495..de76119db3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index d0919334c8..4819149590 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index d408e80a69..777d39748c 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index d72f3fa69a..294d9c66b8 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index f50542de3d..53497d7923 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index 794f7c9f42..43a0ffa1ad 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index dd760800f5..8c737fbf04 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 240 + diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index c7c3fadd6a..2d4595f38e 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.40mm [values] speed_print = 160 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index e38c806be0..e948b334da 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index bd382890ef..5b11b8a69a 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index 196d1237d5..ebb14aab78 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index 1c7105d9f7..0fc5fbe8d5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index fbaed4cf07..efcf6f0246 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index d5f0ca764e..670e236a79 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index 0fdf3509e8..878507ce99 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 120 + diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index b7a76abacc..f4f6b4dfff 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.50mm [values] speed_print = 45 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index d20f20c61c..4bb9372a9b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index 466ff4e31b..fbb74fb9ca 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index 97538706b3..3e8e8195bc 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 065d3607ca..66b0fd971c 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index 184f35515e..26bdebd1b2 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 80 + diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index 72039f2899..4e5662790b 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.60mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 8cd040d090..51da4e343b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index 7a773baa07..77aebb66d9 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index b8b2fdc90c..9b99c0eef3 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 24 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index 7ed437fd2c..a6b11d0f45 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index 6eaa234c87..6b74da6994 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 30 + diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 7a04a84118..431ecc57e9 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = V6 0.80mm [values] speed_print = 24 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index 5d36181fb0..2d1e463704 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 6e6a2a2129..4a61f16bb9 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index d60b961638..3906f5a5a3 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 62b510b747..6316562eec 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index ca6c64c9a5..51f85f9d60 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index 1186ab72bc..def6946bf1 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.40mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index 3506d904ff..d41c155234 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 165 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index 6c9a5b3cc3..9c69b07258 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index 3ec8220523..5b35eec0b7 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index 5fe09c4ca8..470729ca7c 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 165 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index bf19eb7dc0..e2b949208e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 250 + diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index 5c51e326d9..e630937656 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.60mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index d63a6859e3..bc372dae4b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 7157480528..41af7ad552 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index 69d7c611ec..990bb0d518 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 70 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index 0ca125ac27..8a739087b3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 125 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index 284e3a3df0..7fae42c017 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 90 + diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index ba4f876889..81f7a4affd 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 0.80mm [values] speed_print = 70 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index 17f36968a1..3be4231e8b 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 75 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index ef67a15698..7ac9945261 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index 2f5309fc0e..79e3d1d86a 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index 1cf2f5bdb3..b48aadb0e4 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 75 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index 24c8331ab9..cabb3d9020 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 0e3f24c2ff..30d016cf2c 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.00mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index ea744a797d..374535d12f 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 3803acc114..9790b61217 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index e38510ca0d..a395749b1d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 40 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index 3ff28da765..d5ca080c10 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 60 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 6b1350f480..212b8b9ba5 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 50 + diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index e65f3bc294..441cbb9d4f 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -12,3 +12,4 @@ variant = Volcano 1.20mm [values] speed_print = 40 + From 121d4e5eb8e315898646602d8b2cf170a2157fe9 Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Mon, 8 Jul 2024 14:57:49 -0400 Subject: [PATCH 008/166] Adjust detailed TPU speeds to prevent large changes in flow rate --- .../quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 8 +++++++- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 8 +++++++- .../quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 8 +++++++- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 8 +++++++- 40 files changed, 280 insertions(+), 40 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 43b58d4e2b..2cf0a195c1 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.25mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 04cf23e9f6..0952c07a80 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.25mm [values] -speed_print = 90 +speed_print = 135.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 84487791c6..bbc9e4ffe2 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.25mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 24f473751f..0b47c78a5f 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.25mm [values] -speed_print = 120 +speed_print = 180.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 51b08ec696..7c2a05e66c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.30mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index ce7f879c4b..3f8a989542 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.30mm [values] -speed_print = 80 +speed_print = 120.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index a8ec456ae0..e8a762d186 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.30mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 36ffb39a41..e5ef4c483c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.30mm [values] -speed_print = 100 +speed_print = 150.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index c5213aff7f..5f5abd74eb 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.35mm [values] -speed_print = 67.5 +speed_print = 101.25 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index d5696ca6d0..a6adfda7c4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.35mm [values] -speed_print = 135 +speed_print = 202.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index e567a01193..96045c435c 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.35mm [values] -speed_print = 90 +speed_print = 135.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index ffb8300873..1c0555239e 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.40mm [values] -speed_print = 40 +speed_print = 60.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 922be924a6..c1e0322e1e 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.40mm [values] -speed_print = 60 +speed_print = 90.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 3b5378ba2a..0de952ef55 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.40mm [values] -speed_print = 120 +speed_print = 180.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index b11a565db3..59fb7d540f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.40mm [values] -speed_print = 80 +speed_print = 120.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 6b8d0d573f..919c263ca2 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.50mm [values] -speed_print = 30 +speed_print = 45.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 0bfec40462..64175bd807 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.50mm [values] -speed_print = 45 +speed_print = 67.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 2761c4b4fa..97c35ca6fc 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.50mm [values] -speed_print = 60 +speed_print = 90.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 6e0d8bced0..2be42474a6 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.50mm [values] -speed_print = 22.5 +speed_print = 33.75 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index a13522261a..95929bdc45 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.60mm [values] -speed_print = 25 +speed_print = 37.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 131d179918..8d7d0f3aaa 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.60mm [values] -speed_print = 40 +speed_print = 60.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 9f26cd5543..04e2569fbd 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.60mm [values] -speed_print = 20 +speed_print = 30.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 9ff7d91b58..adb8472a19 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.80mm [values] -speed_print = 20 +speed_print = 30.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 6aa5f3138d..8068c116d6 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.80mm [values] -speed_print = 15 +speed_print = 22.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 571cb11b78..8066424cb1 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = V6 0.80mm [values] -speed_print = 12 +speed_print = 18.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 8246fdc0f1..4c411fc00b 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 125 +speed_print = 187.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index c2352fb90b..0965ed2140 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index a4e6a4de5c..d73bca4433 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.40mm [values] -speed_print = 150 +speed_print = 225.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 26da41cc39..842f79871a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 82.5 +speed_print = 123.75 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index b32518c57a..8961c62d1f 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 125 +speed_print = 187.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 0c04090087..20e15860f3 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.60mm [values] -speed_print = 62.5 +speed_print = 93.75 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 4ff9f42302..5eb7d8f7d8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 62.5 +speed_print = 93.75 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index cee979a790..4f49a4405a 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 45 +speed_print = 67.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index e443d8dd05..bf49161adc 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 0.80mm [values] -speed_print = 35 +speed_print = 52.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index d4e583531b..c6633f1feb 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 37.5 +speed_print = 56.25 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 83cdbf0e28..a1fe3727a7 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 30 +speed_print = 45.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index ab7d9aedd0..8d17ff05e6 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.00mm [values] -speed_print = 25 +speed_print = 37.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 0dcb3f4859..d2278274aa 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 30 +speed_print = 45.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index b336b67629..2d597a2939 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 25 +speed_print = 37.50 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 85c00089c9..4644c85f0e 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -11,5 +11,11 @@ type = quality variant = Volcano 1.20mm [values] -speed_print = 20 +speed_print = 30.00 +speed_wall = =math.ceil(speed_print * 0.75) +speed_wall_0 = =math.ceil(speed_print * 0.75) +speed_wall_x = =math.ceil(speed_print * 0.75) +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_layer_0 = =math.ceil(speed_print * 0.75) From d878f1dea1715f5aaa9ec884ef5564cfbc6c190d Mon Sep 17 00:00:00 2001 From: NerdyGriffin Date: Mon, 8 Jul 2024 18:59:53 +0000 Subject: [PATCH 009/166] Applied printer-linter format --- .../quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 6 +++--- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 6 +++--- .../voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 6 +++--- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 6 +++--- .../voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 6 +++--- 40 files changed, 120 insertions(+), 120 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 2cf0a195c1..ded650a853 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.25mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 0952c07a80..1a830d3e0c 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.25mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 135.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index bbc9e4ffe2..2f9334ea17 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.25mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 0b47c78a5f..9cc821f580 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.25mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 180.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 7c2a05e66c..0afdab1ae7 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.30mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index 3f8a989542..851efaaab3 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.30mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 120.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index e8a762d186..8762ee5752 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.30mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index e5ef4c483c..262b000de1 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.30mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 150.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 5f5abd74eb..26ff3d8ed2 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.35mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 101.25 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index a6adfda7c4..99c077c29a 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.35mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 202.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index 96045c435c..f1a7a25d25 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.35mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 135.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 1c0555239e..54b8f76ee0 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 60.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index c1e0322e1e..6468beff3f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 90.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 0de952ef55..dc27882a6b 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 180.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 59fb7d540f..089f0fd42d 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 120.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 919c263ca2..2f93f0947f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.50mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 45.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 64175bd807..523f6b5ca8 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.50mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 67.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 97c35ca6fc..025dca4d2c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.50mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 90.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 2be42474a6..11af45c75b 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.50mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 33.75 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 95929bdc45..92d903a604 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 37.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 8d7d0f3aaa..25ea6624f8 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 60.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 04e2569fbd..c79df07dca 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 30.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index adb8472a19..a7699412d3 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 30.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 8068c116d6..4f371790e1 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 22.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 8066424cb1..e0af23cb34 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = V6 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 18.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 4c411fc00b..bfc92a423d 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 187.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 0965ed2140..3b3c2e6451 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index d73bca4433..1ef1852334 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.40mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 225.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 842f79871a..13367c7d13 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 123.75 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 8961c62d1f..ba274be0de 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 187.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 20e15860f3..c664f992ba 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.60mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 93.75 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 5eb7d8f7d8..5a103312bc 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 93.75 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 4f49a4405a..d64059fcc7 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 67.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index bf49161adc..4bb10a451b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 0.80mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 52.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index c6633f1feb..226f06eb18 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.00mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 56.25 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index a1fe3727a7..fa9d160647 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.00mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 45.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 8d17ff05e6..e7ce2784ac 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.00mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 37.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index d2278274aa..60a91f1b8e 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.20mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 45.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 2d597a2939..806ec3a92d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.20mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 37.50 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 4644c85f0e..71384ca0d7 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -11,11 +11,11 @@ type = quality variant = Volcano 1.20mm [values] +speed_layer_0 = =math.ceil(speed_print * 0.75) speed_print = 30.00 +speed_roofing = =math.ceil(speed_print * 0.75) +speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.75) speed_wall_0 = =math.ceil(speed_print * 0.75) speed_wall_x = =math.ceil(speed_print * 0.75) -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_layer_0 = =math.ceil(speed_print * 0.75) From 103d1e68a3398428e156826ebc822c621f6584aa Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Fri, 2 Aug 2024 12:19:59 -0400 Subject: [PATCH 010/166] Set TPU speed to 2/3 standard and adjust detailed speeds to not exceed voron defaults --- .../voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_v6_0.80_TPU_supersprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.40_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.40_TPU_normal.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.60_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.60_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.80_TPU_extrafast.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.80_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_0.80_TPU_supersprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.00_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.00_TPU_supersprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.20_TPU_sprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.20_TPU_supersprint.inst.cfg | 15 ++++++++------- .../voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 15 ++++++++------- 40 files changed, 320 insertions(+), 280 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index ded650a853..5011553485 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.25mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 1a830d3e0c..945416b8cd 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.25mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 135.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 120 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 2f9334ea17..daa79a78d2 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.25mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 9cc821f580..2d883460b5 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.25mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 180.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 160 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 0afdab1ae7..63eaa61a54 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.30mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index 851efaaab3..ce2316afa0 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.30mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 120.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 106.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 8762ee5752..b9b4170028 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.30mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 262b000de1..0f0971167d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.30mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 150.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 133.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 26ff3d8ed2..33fe0ab20d 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.35mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 101.25 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 90 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 99c077c29a..890be107ef 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.35mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 202.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 180 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index f1a7a25d25..4d967adaed 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.35mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 135.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 120 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 54b8f76ee0..3eb030ab42 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 60.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 53.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 6468beff3f..d646f74cda 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 90.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 80 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index dc27882a6b..7540e64304 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 180.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 160 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 089f0fd42d..73b66a93b2 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 120.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 106.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 2f93f0947f..9bb3983501 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.50mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 45.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 40 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 523f6b5ca8..c062c70d72 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.50mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 67.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 60 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 025dca4d2c..242be6013e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.50mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 90.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 80 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 11af45c75b..0a3ecc59ee 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.50mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 33.75 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 30 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 92d903a604..9a4c3559f4 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 37.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 33.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 25ea6624f8..2f301d16af 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 60.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 53.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index c79df07dca..55cf1efe17 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 30.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 26.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index a7699412d3..08038fda88 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 30.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 26.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index 4f371790e1..dd8748ad8e 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 22.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 20 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index e0af23cb34..5ab269f118 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = V6 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 18.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 16 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index bfc92a423d..2ca8e32d09 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 187.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 166.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 3b3c2e6451..319ef3c704 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 1ef1852334..df258b855a 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.40mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 225.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 200 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 13367c7d13..16f131a43e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 123.75 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 110 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index ba274be0de..1799665c2b 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 187.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 166.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index c664f992ba..0955990fc3 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.60mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 93.75 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 83.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 5a103312bc..1659953e4c 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 93.75 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 83.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index d64059fcc7..390e3d96b8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 67.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 60 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index 4bb10a451b..ae00da306b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 0.80mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 52.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 46.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 226f06eb18..d93c620944 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.00mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 56.25 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 50 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index fa9d160647..0c611ffc6d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.00mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 45.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 40 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index e7ce2784ac..70af9ed539 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.00mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 37.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 33.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 60a91f1b8e..8c6ad1d30f 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.20mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 45.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 40 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 806ec3a92d..32f4fb40e8 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.20mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 37.50 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 33.33 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 71384ca0d7..5cc4e796a8 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -11,11 +11,12 @@ type = quality variant = Volcano 1.20mm [values] -speed_layer_0 = =math.ceil(speed_print * 0.75) -speed_print = 30.00 -speed_roofing = =math.ceil(speed_print * 0.75) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.75) -speed_wall_0 = =math.ceil(speed_print * 0.75) -speed_wall_x = =math.ceil(speed_print * 0.75) +speed_infill = =speed_print +speed_layer_0 = =math.ceil(speed_print * 0.375) +speed_print = 26.67 +speed_roofing = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 0.50) +speed_wall = =math.ceil(speed_print * 0.50) +speed_wall_0 = =speed_wall +speed_wall_x = =speed_print From 3136dfc0ec1d6dcef35825573f5a888e1119bfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20J=C3=A4ger?= Date: Fri, 9 Aug 2024 18:13:01 +0200 Subject: [PATCH 011/166] Process M82 and M83 command for Marlin flavoured GCode too --- plugins/GCodeReader/FlavorParser.py | 10 ++++++++-- plugins/GCodeReader/RepRapFlavorParser.py | 8 -------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index 372ee83135..74dbeadec0 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -298,8 +298,14 @@ class FlavorParser: position.e.extend([0] * (self._extruder_number - len(position.e) + 1)) return position - def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> Position: - pass + def processMCode(self, M: int, line: str, position: Position, path: List[List[Union[float, int]]]) -> None: + # Set extrusion mode + if M == 82: + # Set absolute extrusion mode + self._is_absolute_extrusion = True + elif M == 83: + # Set relative extrusion mode + self._is_absolute_extrusion = False _type_keyword = ";TYPE:" _layer_keyword = ";LAYER:" diff --git a/plugins/GCodeReader/RepRapFlavorParser.py b/plugins/GCodeReader/RepRapFlavorParser.py index 10b7b78587..1a80412238 100644 --- a/plugins/GCodeReader/RepRapFlavorParser.py +++ b/plugins/GCodeReader/RepRapFlavorParser.py @@ -11,14 +11,6 @@ class RepRapFlavorParser(FlavorParser.FlavorParser): def __init__(self): super().__init__() - def processMCode(self, M, line, position, path): - if M == 82: - # Set absolute extrusion mode - self._is_absolute_extrusion = True - elif M == 83: - # Set relative extrusion mode - self._is_absolute_extrusion = False - def _gCode90(self, position, params, path): """Set the absolute positioning From 77e5ddf55d44dcb44e2591f194db1e389985f87b Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Thu, 15 Aug 2024 10:10:34 -0400 Subject: [PATCH 012/166] Revert TPU print speed to 1/4 default speed --- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 5011553485..95f126b12b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 945416b8cd..8591e1017a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 120 +speed_print = 45 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index daa79a78d2..3b19e1b5da 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 2d883460b5..4401e26ff5 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 160 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 63eaa61a54..fc078619d4 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index ce2316afa0..16adbecf9b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 106.67 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index b9b4170028..f87579b796 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 0f0971167d..8b41e53b09 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 133.33 +speed_print = 50 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 33fe0ab20d..c460287dc6 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 90 +speed_print = 33.75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 890be107ef..a37852e7eb 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 180 +speed_print = 67.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index 4d967adaed..8a0961a170 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 120 +speed_print = 45 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 3eb030ab42..c1182d00c7 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 53.33 +speed_print = 20 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index d646f74cda..49e4f45f90 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 80 +speed_print = 30 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 7540e64304..6899f677ed 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 160 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 73b66a93b2..81c9da6f17 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 106.67 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 9bb3983501..3b21154e82 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 15 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index c062c70d72..e81d9f4c34 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 +speed_print = 22.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 242be6013e..2797670b13 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 80 +speed_print = 30 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index 0a3ecc59ee..a9a804111c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 30 +speed_print = 11.25 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 9a4c3559f4..7a6508c7a7 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 33.33 +speed_print = 12.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index 2f301d16af..ae9cd42d9d 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 53.33 +speed_print = 20 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index 55cf1efe17..d0816f8db7 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 26.67 +speed_print = 10 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 08038fda88..63e1744c1c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 26.67 +speed_print = 10 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index dd8748ad8e..ae5571e6d5 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 20 +speed_print = 7.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 5ab269f118..bceb062d4d 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 16 +speed_print = 6 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 2ca8e32d09..9bca6ec732 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 166.67 +speed_print = 62.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index 319ef3c704..da94b9d809 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index df258b855a..7cd4fe079e 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 200 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 16f131a43e..57b96a4bd7 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 110 +speed_print = 41.25 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 1799665c2b..42448cd7a6 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 166.67 +speed_print = 62.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 0955990fc3..0c4d4ae2fb 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 83.33 +speed_print = 31.25 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 1659953e4c..592ddfa0ee 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 83.33 +speed_print = 31.25 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index 390e3d96b8..b98808413f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 +speed_print = 22.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index ae00da306b..f009518856 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 46.67 +speed_print = 17.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index d93c620944..305172aff4 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 50 +speed_print = 18.75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 0c611ffc6d..ba92b8ee8b 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 15 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 70af9ed539..96ce968140 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 33.33 +speed_print = 12.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index 8c6ad1d30f..e81913aec3 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 15 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index 32f4fb40e8..b3faafde03 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 33.33 +speed_print = 12.5 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 5cc4e796a8..bce5c0a55c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 26.67 +speed_print = 10 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) From a7e5477e1fe85cab9ba278382c427493e365699f Mon Sep 17 00:00:00 2001 From: Christian Kunis Date: Mon, 26 Aug 2024 08:00:04 -0400 Subject: [PATCH 013/166] Restore TPU print speed to the default voron speeds. --- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index 95f126b12b..e7b6b714fb 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index 8591e1017a..a93e0bd832 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 45 +speed_print = 180 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index 3b19e1b5da..ee2404bc08 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 4401e26ff5..6931141a6f 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.25mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 +speed_print = 240 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index fc078619d4..217caf5659 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index 16adbecf9b..bd067c1827 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 160 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index f87579b796..05000e8e19 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index 8b41e53b09..a934707451 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.30mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 50 +speed_print = 200 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index c460287dc6..57751118f9 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 33.75 +speed_print = 135 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index a37852e7eb..4016f5584e 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 67.5 +speed_print = 270 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index 8a0961a170..b7474b0cbd 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.35mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 45 +speed_print = 180 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index c1182d00c7..7b8ecd4957 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 20 +speed_print = 80 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index 49e4f45f90..cc323328b3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 30 +speed_print = 120 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index 6899f677ed..fcdc58c5d0 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 60 +speed_print = 240 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 81c9da6f17..63d675bb68 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 40 +speed_print = 160 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 3b21154e82..7fa652d855 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 15 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index e81d9f4c34..898a271b49 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 22.5 +speed_print = 90 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index 2797670b13..b7aaa1f7a2 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 30 +speed_print = 120 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index a9a804111c..f05f652783 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.50mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 11.25 +speed_print = 45 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 7a6508c7a7..5e053d8bc4 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 12.5 +speed_print = 50 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index ae9cd42d9d..d2b06a4d31 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 20 +speed_print = 80 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index d0816f8db7..b6a752f140 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 10 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 63e1744c1c..94fa58ec41 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 10 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index ae5571e6d5..ed6e3bbd96 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 7.5 +speed_print = 30 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index bceb062d4d..49e348299b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = V6 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 6 +speed_print = 24 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 9bca6ec732..13df7a17fe 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 62.5 +speed_print = 250 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index da94b9d809..f7f4de0b25 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 7cd4fe079e..0f7fdf0238 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.40mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 75 +speed_print = 300 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index 57b96a4bd7..a026d13755 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 41.25 +speed_print = 165 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 42448cd7a6..2551c5085d 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 62.5 +speed_print = 250 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 0c4d4ae2fb..03d7a5de60 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.60mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 31.25 +speed_print = 125 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index 592ddfa0ee..f8382a17f7 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 31.25 +speed_print = 125 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index b98808413f..a9c02df5d2 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 22.5 +speed_print = 90 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index f009518856..f3920f61e8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 0.80mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 17.5 +speed_print = 70 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 305172aff4..57ddcf68f4 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 18.75 +speed_print = 75 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index ba92b8ee8b..5de4dff512 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 15 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 96ce968140..0fdf7be51c 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.00mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 12.5 +speed_print = 50 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index e81913aec3..d431a471c7 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 15 +speed_print = 60 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index b3faafde03..e611c83dd9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 12.5 +speed_print = 50 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index bce5c0a55c..041a037ed0 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -13,7 +13,7 @@ variant = Volcano 1.20mm [values] speed_infill = =speed_print speed_layer_0 = =math.ceil(speed_print * 0.375) -speed_print = 10 +speed_print = 40 speed_roofing = =speed_topbottom speed_topbottom = =math.ceil(speed_print * 0.50) speed_wall = =math.ceil(speed_print * 0.50) From ff6c8ee49a4860ee157b824f061350414c76f6bf Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Sep 2024 17:00:06 +0200 Subject: [PATCH 014/166] Add script to easily gather packages hashes --- scripts/get_pypi_hashes.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 scripts/get_pypi_hashes.py diff --git a/scripts/get_pypi_hashes.py b/scripts/get_pypi_hashes.py new file mode 100755 index 0000000000..cd62de5961 --- /dev/null +++ b/scripts/get_pypi_hashes.py @@ -0,0 +1,22 @@ +import requests +import argparse +from pathlib import Path + +def get_package_wheel_hashes(package, version): + url = f"https://pypi.org/pypi/{package}/{version}/json" + data = requests.get(url).json() + + print(f" {package}:") + print(f" version: '{version}'") + print(f" hashes:") + + for url in data["urls"]: + print(f" - sha256:{url['digests']['sha256']}") + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description="Display the hashes of the wheel files to be inserted in pip_requirements") + parser.add_argument("package", type=Path, help="Name of the target package") + parser.add_argument("version", type=Path, help="Version of the target package") + args = parser.parse_args() + get_package_wheel_hashes(args.package, args.version) From 88c846cbd4733b5ce4bbcd8d453db498a1c4f845 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 23 Sep 2024 12:42:48 +0200 Subject: [PATCH 015/166] Add script to gater hashes of Pypi packages --- scripts/get_pypi_hashes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get_pypi_hashes.py b/scripts/get_pypi_hashes.py index cd62de5961..de2314099e 100755 --- a/scripts/get_pypi_hashes.py +++ b/scripts/get_pypi_hashes.py @@ -7,7 +7,7 @@ def get_package_wheel_hashes(package, version): data = requests.get(url).json() print(f" {package}:") - print(f" version: '{version}'") + print(f" version: \"{version}\"") print(f" hashes:") for url in data["urls"]: From fb5e4f855340fd89c19a09f450ace9a9ab7fde88 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Sep 2024 10:10:33 +0200 Subject: [PATCH 016/166] Update cura_resources recipe and workflow --- .github/workflows/conan-package-resources.yml | 20 ++++++------------- resources/conanfile.py | 7 ++----- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 92a7e005fa..3ea07d7084 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -20,21 +20,13 @@ on: - '[0-9].[0-9]*' - '[0-9].[0-9][0-9]*' -env: - CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} - CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} - jobs: - conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main +# FIXME: Use main once merged + conan-package: + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: project_name: cura_resources - - conan-package-export: - needs: [ conan-recipe-version ] - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} conan_recipe_root: "./resources/" - secrets: inherit \ No newline at end of file + platform_windows: false + platform_mac: false + secrets: inherit diff --git a/resources/conanfile.py b/resources/conanfile.py index fde648eeac..666b5719e8 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -5,7 +5,7 @@ from conan.tools.files import copy, update_conandata from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration -required_conan_version = ">=1.58.0 <2.0.0" +required_conan_version = ">=2.7.0" class CuraResource(ConanFile): @@ -17,7 +17,7 @@ class CuraResource(ConanFile): topics = ("conan", "cura") settings = "os", "compiler", "build_type", "arch" no_copy_source = True - + package_type = "header-library" @property def _shared_resources(self): @@ -54,9 +54,6 @@ class CuraResource(ConanFile): self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res")) self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) - self.env_info.CURA_RESOURCES.append(os.path.join(self.package_folder, "res")) - self.env_info.CURA_ENGINE_SEARCH_PATH.append(os.path.join(self.package_folder, "res", "definitions")) - self.env_info.CURA_ENGINE_SEARCH_PATH.append(os.path.join(self.package_folder, "res", "definitions")) def package_id(self): self.info.clear() From d441dc642b2030bfec2f457ebe47adf168b134db Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Sep 2024 10:12:17 +0200 Subject: [PATCH 017/166] Skip system dependencies to build cura resources --- .github/workflows/conan-package-resources.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 3ea07d7084..94705c7348 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -29,4 +29,5 @@ jobs: conan_recipe_root: "./resources/" platform_windows: false platform_mac: false + install_system_dependencies: false secrets: inherit From e3cb6d4f8c6c7e9a39decef1bf2a0afdab0f6c4f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Sep 2024 16:08:30 +0200 Subject: [PATCH 018/166] Basically working recipe --- conandata.yml | 420 ++++++++++++++++++++++++++++++++++++- conanfile.py | 125 ++++------- requirements-dev.txt | 6 - requirements-ultimaker.txt | 1 - requirements.txt | 408 ----------------------------------- 5 files changed, 449 insertions(+), 511 deletions(-) delete mode 100644 requirements-dev.txt delete mode 100644 requirements-ultimaker.txt delete mode 100644 requirements.txt diff --git a/conandata.yml b/conandata.yml index eda0a7c164..f40ad698a2 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,20 @@ version: "5.9.0-alpha.0" + requirements: - - "cura_resources/(latest)@ultimaker/testing" - - "uranium/(latest)@ultimaker/testing" - - "curaengine/(latest)@ultimaker/testing" - - "cura_binary_data/(latest)@ultimaker/testing" - - "fdm_materials/(latest)@ultimaker/testing" - - "dulcificum/0.2.1" - - "pysavitar/5.3.0" - - "pynest2d/5.3.0" - - "native_cad_plugin/2.0.0" + - "cura_resources/5.9.0-alpha.0@ultimaker/cura_11622" + - "uranium/5.9.0-alpha.0@ultimaker/cura_11622" + - "curaengine/5.9.0-alpha.0@ultimaker/cura_11622" + - "cura_binary_data/5.9.0-alpha.0@ultimaker/cura_11622" + - "fdm_materials/5.9.0-alpha.0@ultimaker/cura_11622" + - "dulcificum/0.2.0-alpha.0@ultimaker/cura_11622" + - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" + - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" requirements_internal: - "fdm_materials/5.8.1" - - "cura_private_data/(latest)@internal/testing" + - "cura_private_data/5.9.0-alpha.0@internal/cura_11622" +requirements_enterprise: + - "native_cad_plugin/2.0.0" + urls: default: cloud_api_root: "https://api.ultimaker.com" @@ -25,6 +28,7 @@ urls: marketplace_root: "https://marketplace-staging.ultimaker.com" digital_factory_url: "https://digitalfactory-staging.ultimaker.com" cura_latest_url: "https://software.ultimaker.com/latest.json" + pyinstaller: runinfo: entrypoint: "cura_app.py" @@ -124,6 +128,7 @@ pyinstaller: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" + pycharm_targets: - jinja_path: .run_templates/pycharm_cura_run.run.xml.jinja module_name: Cura @@ -242,3 +247,398 @@ pycharm_targets: module_name: Cura name: pytest in TestSettingVisibilityPresets.py script_name: tests/Settings/TestSettingVisibilityPresets.py + +pip_requirements: + any: + libCharon: + url: "git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon" + PyQt6-NetworkAuth: + version: "6.6.0" + hashes: + - sha256:7b90b81792fe53105287c8cbb5e4b22bc44a482268ffb7d3e33f852807f86182 + - sha256:f60ff9a62f5129dc2a9d4c495fb47f9a03e4dfb666b50fb7d61f46e89bf7b6a2 + - sha256:c7e2335159aa795e2fe6fb069ccce6308672ab80f26c50fab57caf957371cbb5 + - sha256:cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb + PyQt6-NetworkAuth-Qt6: + version: "6.6.0" + hashes: + - sha256:bcd56bfc892fec961c51eba3c0bf32ba8317a762d9e254d3830569611ed569d6 + - sha256:4cc48fd375730a0ba5fbed9d64abb2914f587377560a78a63aff893f9e276a45 + - sha256:481d9093e1fb1ac6843d8beabcd359cc34b74b9a2cbb3e2b68d96bd3f178d4e0 + - sha256:5006deabf55304d4a3e0b3c954f93e5835546b11e789d14653a2493d12d3a063 + certifi: + version: "2023.5.7" + hashes: + - sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716 + - sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7 + zeroconf: + version: "0.31.0" + hashes: + - sha256:5a468da018bc3f04bbce77ae247924d802df7aeb4c291bbbb5a9616d128800b0 + - sha256:53a180248471c6f81bd1fffcbce03ed93d7d8eaf10905c9121ac1ea996d19844 + importlib-metadata: + version: "4.10.0" + hashes: + - sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4 + - sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6 + keyring: + version: "23.0.1" + hashes: + - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 + - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 + trimesh: + version: "3.9.36" + hashes: + - sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 + - sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e + sentry-sdk: + version: "0.13.5" + hashes: + - sha256:05285942901d38c7ce2498aba50d8e87b361fc603281a5902dda98f3f8c5e145 + - sha256:c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82 + pyserial: + version: "3.4" + hashes: + - sha256:e0770fadba80c31013896c7e6ef703f72e7834965954a78e71a3049488d4d7d8 + - sha256:6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 + chardet: + version: "3.0.4" + hashes: + - sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 + - sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae + idna: + version: "2.8" + hashes: + - sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c + - sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 + attrs: + version: "21.3.0" + hashes: + - sha256:8f7335278dedd26b58c38e006338242cc0977f06d51579b2b8b87b9b33bff66c + - sha256:50f3c9b216dc9021042f71b392859a773b904ce1a029077f58f6598272432045 + requests: + version: "2.22.0" + hashes: + - sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 + - sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 + twisted: + version: "21.2.0" + hashes: + - sha256:aab38085ea6cda5b378b519a0ec99986874921ee8881318626b0a3414bb2631e + - sha256:77544a8945cf69b98d2946689bbe0c75de7d145cdf11f391dd487eae8fc95a12 + constantly: + version: "15.1.0" + hashes: + - sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d + - sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 + hyperlink: + version: "21.0.0" + hashes: + - sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4 + - sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b + incremental: + version: "22.10.0" + hashes: + - sha256:b864a1f30885ee72c5ac2835a761b8fe8aa9c28b9395cacf27286602688d3e51 + - sha256:912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 + zope.interface: + version: "5.4.0" + hashes: + - sha256:7df1e1c05304f26faa49fa752a8c690126cf98b40b91d54e6e9cc3b7d6ffe8b7 + - sha256:2c98384b254b37ce50eddd55db8d381a5c53b4c10ee66e1e7fe749824f894021 + - sha256:08f9636e99a9d5410181ba0729e0408d3d8748026ea938f3b970a0249daa8192 + - sha256:0ea1d73b7c9dcbc5080bb8aaffb776f1c68e807767069b9ccdd06f27a161914a + - sha256:273f158fabc5ea33cbc936da0ab3d4ba80ede5351babc4f577d768e057651531 + - sha256:f7ee479e96f7ee350db1cf24afa5685a5899e2b34992fb99e1f7c1b0b758d263 + - sha256:b0297b1e05fd128d26cc2460c810d42e205d16d76799526dfa8c8ccd50e74959 + - sha256:af310ec8335016b5e52cae60cda4a4f2a60a788cbb949a4fbea13d441aa5a09e + - sha256:9a9845c4c6bb56e508651f005c4aeb0404e518c6f000d5a1123ab077ab769f5c + - sha256:a1e6e96217a0f72e2b8629e271e1b280c6fa3fe6e59fa8f6701bec14e3354325 + - sha256:877473e675fdcc113c138813a5dd440da0769a2d81f4d86614e5d62b69497155 + - sha256:0b465ae0962d49c68aa9733ba92a001b2a0933c317780435f00be7ecb959c702 + - sha256:5dd9ca406499444f4c8299f803d4a14edf7890ecc595c8b1c7115c2342cadc5f + - sha256:469e2407e0fe9880ac690a3666f03eb4c3c444411a5a5fddfdabc5d184a79f05 + - sha256:52de7fc6c21b419078008f697fd4103dbc763288b1406b4562554bd47514c004 + - sha256:3dd4952748521205697bc2802e4afac5ed4b02909bb799ba1fe239f77fd4e117 + - sha256:dd93ea5c0c7f3e25335ab7d22a507b1dc43976e1345508f845efc573d3d779d8 + - sha256:3748fac0d0f6a304e674955ab1365d515993b3a0a865e16a11ec9d86fb307f63 + - sha256:66c0061c91b3b9cf542131148ef7ecbecb2690d48d1612ec386de9d36766058f + - sha256:d0c1bc2fa9a7285719e5678584f6b92572a5b639d0e471bb8d4b650a1a910920 + - sha256:2876246527c91e101184f63ccd1d716ec9c46519cc5f3d5375a3351c46467c46 + - sha256:334701327f37c47fa628fc8b8d28c7d7730ce7daaf4bda1efb741679c2b087fc + - sha256:71aace0c42d53abe6fc7f726c5d3b60d90f3c5c055a447950ad6ea9cec2e37d9 + - sha256:5bb3489b4558e49ad2c5118137cfeaf59434f9737fa9c5deefc72d22c23822e2 + - sha256:1c0e316c9add0db48a5b703833881351444398b04111188069a26a61cfb4df78 + - sha256:6f0c02cbb9691b7c91d5009108f975f8ffeab5dff8f26d62e21c493060eff2a1 + - sha256:7d97a4306898b05404a0dcdc32d9709b7d8832c0c542b861d9a826301719794e + - sha256:867a5ad16892bf20e6c4ea2aab1971f45645ff3102ad29bd84c86027fa99997b + - sha256:5f931a1c21dfa7a9c573ec1f50a31135ccce84e32507c54e1ea404894c5eb96f + - sha256:194d0bcb1374ac3e1e023961610dc8f2c78a0f5f634d0c737691e215569e640d + - sha256:8270252effc60b9642b423189a2fe90eb6b59e87cbee54549db3f5562ff8d1b8 + - sha256:15e7d1f7a6ee16572e21e3576d2012b2778cbacf75eb4b7400be37455f5ca8bf + - sha256:8892f89999ffd992208754851e5a052f6b5db70a1e3f7d54b17c5211e37a98c7 + - sha256:2e5a26f16503be6c826abca904e45f1a44ff275fdb7e9d1b75c10671c26f8b94 + - sha256:0f91b5b948686659a8e28b728ff5e74b1be6bf40cb04704453617e5f1e945ef3 + - sha256:4de4bc9b6d35c5af65b454d3e9bc98c50eb3960d5a3762c9438df57427134b8e + - sha256:bf68f4b2b6683e52bec69273562df15af352e5ed25d1b6641e7efddc5951d1a7 + - sha256:63b82bb63de7c821428d513607e84c6d97d58afd1fe2eb645030bdc185440120 + - sha256:db1fa631737dab9fa0b37f3979d8d2631e348c3b4e8325d6873c2541d0ae5a48 + - sha256:f44e517131a98f7a76696a7b21b164bcb85291cee106a23beccce454e1f433a4 + - sha256:a9506a7e80bcf6eacfff7f804c0ad5350c8c95b9010e4356a4b36f5322f09abb + - sha256:3c02411a3b62668200910090a0dff17c0b25aaa36145082a5a6adf08fa281e54 + - sha256:0cee5187b60ed26d56eb2960136288ce91bcf61e2a9405660d271d1f122a69a4 + - sha256:a8156e6a7f5e2a0ff0c5b21d6bcb45145efece1909efcbbbf48c56f8da68221d + - sha256:205e40ccde0f37496904572035deea747390a8b7dc65146d30b96e2dd1359a83 + - sha256:3f24df7124c323fceb53ff6168da70dbfbae1442b4f3da439cd441681f54fe25 + - sha256:5208ebd5152e040640518a77827bdfcc73773a15a33d6644015b763b9c9febc1 + - sha256:17776ecd3a1fdd2b2cd5373e5ef8b307162f581c693575ec62e7c5399d80794c + - sha256:d4d9d6c1a455d4babd320203b918ccc7fcbefe308615c521062bc2ba1aa4d26e + - sha256:0cba8477e300d64a11a9789ed40ee8932b59f9ee05f85276dbb4b59acee5dd09 + - sha256:5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e + automat: + version: "20.2.0" + hashes: + - sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111 + - sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 + shapely: + version: "2.0.6" + hashes: + - sha256:29a34e068da2d321e926b5073539fd2a1d4429a2c656bd63f0bd4c8f5b236d0b + - sha256:e1c84c3f53144febf6af909d6b581bc05e8785d57e27f35ebaa5c1ab9baba13b + - sha256:2ad2fae12dca8d2b727fa12b007e46fbc522148a584f5d6546c539f3464dccde + - sha256:b3304883bd82d44be1b27a9d17f1167fda8c7f5a02a897958d86c59ec69b705e + - sha256:3ec3a0eab496b5e04633a39fa3d5eb5454628228201fb24903d38174ee34565e + - sha256:28f87cdf5308a514763a5c38de295544cb27429cfa655d50ed8431a4796090c4 + - sha256:5aeb0f51a9db176da9a30cb2f4329b6fbd1e26d359012bb0ac3d3c7781667a9e + - sha256:9a7a78b0d51257a367ee115f4d41ca4d46edbd0dd280f697a8092dd3989867b2 + - sha256:f32c23d2f43d54029f986479f7c1f6e09c6b3a19353a3833c2ffb226fb63a855 + - sha256:b3dc9fb0eb56498912025f5eb352b5126f04801ed0e8bdbd867d21bdbfd7cbd0 + - sha256:d93b7e0e71c9f095e09454bf18dad5ea716fb6ced5df3cb044564a00723f339d + - sha256:c02eb6bf4cfb9fe6568502e85bb2647921ee49171bcd2d4116c7b3109724ef9b + - sha256:cec9193519940e9d1b86a3b4f5af9eb6910197d24af02f247afbfb47bcb3fab0 + - sha256:83b94a44ab04a90e88be69e7ddcc6f332da7c0a0ebb1156e1c4f568bbec983c3 + - sha256:537c4b2716d22c92036d00b34aac9d3775e3691f80c7aa517c2c290351f42cd8 + - sha256:98fea108334be345c283ce74bf064fa00cfdd718048a8af7343c59eb40f59726 + - sha256:42fd4cd4834747e4990227e4cbafb02242c0cffe9ce7ef9971f53ac52d80d55f + - sha256:665990c84aece05efb68a21b3523a6b2057e84a1afbef426ad287f0796ef8a48 + - sha256:42805ef90783ce689a4dde2b6b2f261e2c52609226a0438d882e3ced40bb3013 + - sha256:6d2cb146191a47bd0cee8ff5f90b47547b82b6345c0d02dd8b25b88b68af62d7 + - sha256:e3fdef0a1794a8fe70dc1f514440aa34426cc0ae98d9a1027fb299d45741c381 + - sha256:2c665a0301c645615a107ff7f52adafa2153beab51daf34587170d85e8ba6805 + - sha256:0334bd51828f68cd54b87d80b3e7cee93f249d82ae55a0faf3ea21c9be7b323a + - sha256:d37d070da9e0e0f0a530a621e17c0b8c3c9d04105655132a87cfff8bd77cc4c2 + - sha256:fa7468e4f5b92049c0f36d63c3e309f85f2775752e076378e36c6387245c5462 + - sha256:ed5867e598a9e8ac3291da6cc9baa62ca25706eea186117034e8ec0ea4355653 + - sha256:81d9dfe155f371f78c8d895a7b7f323bb241fb148d848a2bf2244f79213123fe + - sha256:fbb7bf02a7542dba55129062570211cfb0defa05386409b3e306c39612e7fbcc + - sha256:837d395fac58aa01aa544495b97940995211e3e25f9aaf87bc3ba5b3a8cd1ac7 + - sha256:c6d88ade96bf02f6bfd667ddd3626913098e243e419a0325ebef2bbd481d1eb6 + - sha256:8b3b818c4407eaa0b4cb376fd2305e20ff6df757bf1356651589eadc14aab41b + - sha256:1bbc783529a21f2bd50c79cef90761f72d41c45622b3e57acf78d984c50a5d13 + - sha256:2423f6c0903ebe5df6d32e0066b3d94029aab18425ad4b07bf98c3972a6e25a1 + - sha256:2de00c3bfa80d6750832bde1d9487e302a6dd21d90cb2f210515cefdb616e5f5 + - sha256:3a82d58a1134d5e975f19268710e53bddd9c473743356c90d97ce04b73e101ee + - sha256:392f66f458a0a2c706254f473290418236e52aa4c9b476a072539d63a2460595 + - sha256:eba5bae271d523c938274c61658ebc34de6c4b33fdf43ef7e938b5776388c1be + - sha256:7060566bc4888b0c8ed14b5d57df8a0ead5c28f9b69fb6bed4476df31c51b0af + - sha256:b02154b3e9d076a29a8513dffcb80f047a5ea63c897c0cd3d3679f29363cf7e5 + - sha256:44246d30124a4f1a638a7d5419149959532b99dfa25b54393512e6acc9c211ac + - sha256:2b542d7f1dbb89192d3512c52b679c822ba916f93479fa5d4fc2fe4fa0b3c9e8 + - sha256:997f6159b1484059ec239cacaa53467fd8b5564dabe186cd84ac2944663b0bf6 + cython: + version: "0.29.26" + hashes: + - sha256:c4b003b6b7aa9e74552ef8d4e6009b3e3c3e8fa585710b3a6d062e088e460c1b + - sha256:ce804a021c92fea66c8c100781a111706f21bade7a546895c5a9c57fe2df8b24 + - sha256:93840f2071c1f15e613509eadee1fbcd335e8666772437fe5038e24059edd48c + - sha256:10402f0f1564ffc6ecb9c45e07f995771d05bb0b0e1d151e40574638292ee3a5 + - sha256:8e07121b34221458a2151d37e137b8f5b011a9c51dd38db2499a6198590aa319 + - sha256:233a87db76941626f1db08f4b25a4a5b425b13b64ed0e673c3641f7b650a48d8 + - sha256:6773cce9d4b3b6168d8feb2b6f06b658ef1e11cbfec075041745666d8e2a5e45 + - sha256:c813799d533194b7d85203d881d8b4f567a8c644a67f50d47f1ffbf316df412f + - sha256:362fbb9cb4627c7786231429768b54aaba5459a2a0e46c25e59f202ca6155437 + - sha256:2b834ff6e4d10ba6d7a0d676dd71c1b427a181ddbbbbf79e91d1861557aab59f + - sha256:0c3093bc99facfc97e5019f6c5bc39987663792265c1334d9fc9e37c3a3dcd6f + - sha256:bbf0149680c1fca07200a3ed372b22e6bad7851d191b717a61f9a68af370e180 + - sha256:a1cc55db32cd39474081d478263b96e036552cdbbab8831c90ea43fb385a9b66 + - sha256:ebe32e002a9e6553de399033e259ece72aa17c77f740b265e66f122572a8a278 + - sha256:6b385f68789c3e8a75b4827e8a4970ff04605ad3cb1c0b41005cc69368dad65d + - sha256:1519eb639de308f5763eb0666b4cc7bd3958268f3f6228cc610b7b4d6c94b68b + - sha256:e118525defec3f67471d8ee5ce04340d43195410a87e5d7ec8a1a9e953c0066a + - sha256:706ea55f58c2722206e51cd9a8754ed0995c4c4231d24b095875d2641d745222 + - sha256:77913fe27c5e22c995bac090d01e200ff91e5f58aa944e2d2e94cbf67ea2ae34 + - sha256:51923120f57a42c59f5ee6bba9e89a31a394ae8cd419c753f64d8a3aea1ee8b7 + - sha256:82881565d04027728d7762edd8c085927a840873af7ee049d703e0ca226bc08d + - sha256:531303085503959338e6cdac630626280ef111aecbb22d48321673a8c3897c0a + - sha256:0205b685802eb4c039b14f67b7ac3f00c55ff04b9e3871df2249576d3e59ba42 + - sha256:7df94e56872df8f396ca669466fee60256f69f678654239f706b1e643c2ac4a5 + - sha256:4b7d04b393d9a4b5fec0cbc4b0f29fe083a9d862d95231a6e7608978bd661d7e + - sha256:af91dd63ac5f1f7fc70dc91ea063f727db42b5eb934d1f3832611be18e25171e + - sha256:d83dad8dc6c63706cb3178dc79010b3865b1345090727189d2cd61758a825ee8 + - sha256:ca10e9fde0eaba1407ab353ff07a26daaa3e4dbe356108a149e482d441f070dd + - sha256:fec66cd0a48697fab903854566235aecf1084f62e3163d6589ae7335a1b4d448 + - sha256:b3041e45aefaa4449fd671902132c0ac1f72eedaedac745c0e1a70a13bf990bb + - sha256:ed76fb98979f02b5e89079906071983a36f3634d3028b86f935cf0196f24fcaa + - sha256:4d868e1a41f5123f51a20c1b8e82f7cb6fa3370c104e98e707f7c910e8cadad1 + - sha256:868f309095e557f06dc58723ae865e8c65cfedb2646a562bd8080c92d69e4e4b + - sha256:be550b566345bf53b95616334793ce42a128cf1d9dcde1e28cbf7ce52ea61d6d + - sha256:be13be1e2b9b7395588f2a23bfa692f2f3e6f7936ccf7825c83431b8c8c3452b + - sha256:41ee918480371ae5e5851ba9b1ead5a183e24aedb27bf807c7405d124e943f40 + - sha256:c91b1ba0d43f7f7ccde8121c672207c7891735ddcc83496af1e0ab617ddc4aba + - sha256:5ecf5cf5b57086cc6c1cfc76d6353bbd7023e95da32e0883f1302ca50e481c33 + - sha256:0ffce25bf50fa926ec6bf8d6f29650e7cb33fae445938c9880e1ce9b776353ef + - sha256:5041adfef502d67ecd5e291a7cf645a37fed7a9dac557f40d491053f35204d00 + - sha256:5fd5db458c9d3d2c2abd047f3190624d9cce8a80a8e0ca0baa69cfd133a523bc + - sha256:75eaa22911d2ec37a3841f77b710b178c805cd378b5e1c4fb82dbc35620d2062 + - sha256:3aed8c642e8fb27024bca46830b7f62335a44a92354acf708d6b8d050f945a3a + - sha256:b5ca05c2bfba0c2480b5fd390ecffe46b8da574d887d600388d6e3caf3f99a88 + - sha256:f5e15ff892c8afad64931ee3dd723c4755c2c516606f9aae7613bebfac62b0f6 + - sha256:af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 + pybind11: + version: "2.6.2" + hashes: + - sha256:2d8aebe1709bc367e34e3b23d8eccbf3f387ee9d5640548c6260d33b59f02405 + - sha256:d0e0aed9279656f21501243b707eb6e3b951e89e10c3271dedf3ae41c365e5ed + wheel: + version: "0.37.1" + hashes: + - sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a + - sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 + ifaddr: + version: "0.1.7" + hashes: + - sha256:d1f603952f0a71c9ab4e705754511e4e03b02565bc4cec7188ad6415ff534cd3 + - sha256:1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 + pycparser: + version: "2.20" + hashes: + - sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 + - sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 + zipp: + version: "3.5.0" + hashes: + - sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 + - sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4 + cffi: + version: "1.15.0" + hashes: + - sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962 + - sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0 + - sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14 + - sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27 + - sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023 + - sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474 + - sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6 + - sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 + - sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e + - sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7 + - sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 + - sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c + - sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962 + - sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382 + - sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55 + - sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0 + - sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e + - sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39 + - sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc + - sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032 + - sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8 + - sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605 + - sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e + - sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc + - sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636 + - sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4 + - sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997 + - sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b + - sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2 + - sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7 + - sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66 + - sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029 + - sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880 + - sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20 + - sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024 + - sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e + - sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728 + - sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6 + - sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c + - sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443 + - sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a + - sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37 + - sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a + - sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e + - sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796 + - sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df + - sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8 + - sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a + - sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139 + - sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 + urllib3: + version: "1.25.9" + hashes: + - sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115 + - sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 + jeepney: + version: "0.7.1" + hashes: + - sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac + - sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f + SecretStorage: + version: "3.3.3" + hashes: + - sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 + - sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 + keyring: + version: "23.0.1" + hashes: + - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 + - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 + charset-normalizer: + version: "2.1.0" + hashes: + - sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 + - sha256:575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413 + Windows: + twisted-iocpsupport: + version: "1.0.2" + hashes: + - sha256:985c06a33f5c0dae92c71a036d1ea63872ee86a21dd9b01e1f287486f15524b4 + - sha256:81b3abe3527b367da0220482820cb12a16c661672b7bcfcde328902890d63323 + - sha256:9dbb8823b49f06d4de52721b47de4d3b3026064ef4788ce62b1a21c57c3fff6f + - sha256:b9fed67cf0f951573f06d560ac2f10f2a4bbdc6697770113a2fc396ea2cb2565 + - sha256:b76b4eed9b27fd63ddb0877efdd2d15835fdcb6baa745cb85b66e5d016ac2878 + - sha256:851b3735ca7e8102e661872390e3bce88f8901bece95c25a0c8bb9ecb8a23d32 + - sha256:bf4133139d77fc706d8f572e6b7d82871d82ec7ef25d685c2351bdacfb701415 + - sha256:306becd6e22ab6e8e4f36b6bdafd9c92e867c98a5ce517b27fdd27760ee7ae41 + - sha256:3c61742cb0bc6c1ac117a7e5f422c129832f0c295af49e01d8a6066df8cfc04d + - sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 + - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf + - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 + pywin32: + version: "303" + hashes: + - sha256:6fed4af057039f309263fd3285d7b8042d41507343cd5fa781d98fcc5b90e8bb + - sha256:51cb52c5ec6709f96c3f26e7795b0bf169ee0d8395b2c1d7eb2c029a5008ed51 + - sha256:d9b5d87ca944eb3aa4cd45516203ead4b37ab06b8b777c54aedc35975dec0dee + - sha256:fcf44032f5b14fcda86028cdf49b6ebdaea091230eb0a757282aa656e4732439 + - sha256:aad484d52ec58008ca36bd4ad14a71d7dd0a99db1a4ca71072213f63bf49c7d9 + - sha256:2a09632916b6bb231ba49983fe989f2f625cea237219530e81a69239cd0c4559 + - sha256:b1675d82bcf6dbc96363fca747bac8bff6f6e4a447a4287ac652aa4b9adc796e + - sha256:c268040769b48a13367221fced6d4232ed52f044ffafeda247bd9d2c6bdc29ca + - sha256:5f9ec054f5a46a0f4dfd72af2ce1372f3d5a6e4052af20b858aa7df2df7d355b + - sha256:793bf74fce164bcffd9d57bb13c2c15d56e43c9542a7b9687b4fccf8f8a41aba + - sha256:7d3271c98434617a11921c5ccf74615794d97b079e22ed7773790822735cc352 + - sha256:79cbb862c11b9af19bcb682891c1b91942ec2ff7de8151e2aea2e175899cda34 + pywin32-ctypes: + version: "0.2.0" + hashes: + - sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 + - sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 + +pip_requirements_dev: + - pytest + - pyinstaller==6.3.0 + - pyinstaller-hooks-contrib + - pyyaml + - sip==6.5.1 + - jinja2 + diff --git a/conanfile.py b/conanfile.py index 999cca3362..8b34e959d3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -11,7 +11,7 @@ from conan.tools.env import VirtualRunEnv, Environment, VirtualBuildEnv from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration, ConanException -required_conan_version = ">=1.58.0 <2.0.0" +required_conan_version = ">=2.7.0" class CuraConan(ConanFile): @@ -26,26 +26,26 @@ class CuraConan(ConanFile): settings = "os", "compiler", "build_type", "arch" # FIXME: Remove specific branch once merged to main - python_requires = "translationextractor/[>=2.2.0]@ultimaker/stable" + python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" options = { - "enterprise": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string - "staging": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string + "enterprise": [True, False], + "staging": [True, False], "devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools - "cloud_api_version": "ANY", - "display_name": "ANY", # TODO: should this be an option?? + "cloud_api_version": ["ANY"], + "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles - "internal": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string + "internal": [True, False], "enable_i18n": [True, False], } default_options = { - "enterprise": "False", - "staging": "False", + "enterprise": False, + "staging": False, "devtools": False, "cloud_api_version": "1", "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented - "internal": "False", + "internal": False, "enable_i18n": False, } @@ -72,8 +72,7 @@ class CuraConan(ConanFile): self._cura_env = Environment() self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) - if not self.in_local_cache: - self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) + self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) if self.settings.os == "Linux": self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") @@ -81,42 +80,21 @@ class CuraConan(ConanFile): self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") return self._cura_env - @property - def _enterprise(self): - return self.options.enterprise in ["True", 'true'] - - @property - def _internal(self): - return self.options.internal in ["True", 'true'] - @property def _app_name(self): - if self._enterprise: + if self.options.enterprise: return str(self.options.display_name) + " Enterprise" return str(self.options.display_name) @property def _urls(self): - if self.options.staging in ["True", 'true']: + if self.options.staging: return "staging" return "default" - @property - def requirements_txts(self): - if self.options.devtools: - return ["requirements.txt", "requirements-ultimaker.txt", "requirements-dev.txt"] - return ["requirements.txt", "requirements-ultimaker.txt"] - @property def _base_dir(self): - if self.install_folder is None: - if self.build_folder is not None: - return Path(self.build_folder) - return Path(os.getcwd(), "venv") - if self.in_local_cache: - return Path(self.install_folder) - else: - return Path(self.source_folder, "venv") + return Path(self.source_folder, "venv") @property def _share_dir(self): @@ -132,7 +110,7 @@ class CuraConan(ConanFile): def _site_packages(self): if self.settings.os == "Windows": return self._base_dir.joinpath("Lib", "site-packages") - py_version = Version(self.deps_cpp_info["cpython"].version) + py_version = Version(self.dependencies["cpython"].ref.version) return self._base_dir.joinpath("lib", f"python{py_version.major}.{py_version.minor}", "site-packages") @property @@ -176,12 +154,11 @@ class CuraConan(ConanFile): inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() with venv_vars.apply(): - self.run(f"""python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}""", + self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", env = "conanrun", - output = buffer) + stdout = buffer) - packages = str(buffer.getvalue()).split("-----------------\n") - packages = packages[1].strip('\r\n').split(";") + packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: name, version = package.split(",") python_installs[name] = {"version": version} @@ -197,7 +174,7 @@ class CuraConan(ConanFile): cura_version = Version(self.conf.get("user.cura:version", default = self.version, check_type = str)) pre_tag = f"-{cura_version.pre}" if cura_version.pre else "" build_tag = f"+{cura_version.build}" if cura_version.build else "" - internal_tag = f"+internal" if self._internal else "" + internal_tag = f"+internal" if self.options.internal else "" cura_version = f"{cura_version.major}.{cura_version.minor}.{cura_version.patch}{pre_tag}{build_tag}{internal_tag}" with open(os.path.join(location, "CuraVersion.py"), "w") as f: @@ -205,7 +182,7 @@ class CuraConan(ConanFile): cura_app_name = self.name, cura_app_display_name = self._app_name, cura_version = cura_version, - cura_build_type = "Enterprise" if self._enterprise else "", + cura_build_type = "Enterprise" if self.options.enterprise else "", cura_debug_mode = self.options.cura_debug_mode, cura_cloud_api_root = self.conan_data["urls"][self._urls]["cloud_api_root"], cura_cloud_api_version = self.options.cloud_api_version, @@ -221,7 +198,7 @@ class CuraConan(ConanFile): pyinstaller_metadata = self.conan_data["pyinstaller"] datas = [] for data in pyinstaller_metadata["datas"].values(): - if not self._internal and data.get("internal", False): + if not self.options.internal and data.get("internal", False): continue if "package" in data: # get the paths from conan package @@ -321,20 +298,6 @@ class CuraConan(ConanFile): if self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): del self.options.enable_i18n - def configure(self): - self.options["pyarcus"].shared = True - self.options["pysavitar"].shared = True - self.options["pynest2d"].shared = True - self.options["dulcificum"].shared = self.settings.os != "Windows" - self.options["cpython"].shared = True - self.options["boost"].header_only = True - if self.settings.os == "Linux": - self.options["openssl"].shared = True - if self.conf.get("user.curaengine:sentry_url", "", check_type=str) != "": - self.options["curaengine"].enable_sentry = True - self.options["arcus"].enable_sentry = True - self.options["clipper"].enable_sentry = True - def validate(self): version = self.conf.get("user.cura:version", default = self.version, check_type = str) if version and Version(version) <= Version("4"): @@ -342,22 +305,16 @@ class CuraConan(ConanFile): def requirements(self): for req in self.conan_data["requirements"]: - if self._internal and "fdm_materials" in req: - continue - if not self._enterprise and "native_cad_plugin" in req: + if self.options.internal and "fdm_materials" in req: continue self.requires(req) - if self._internal: + if self.options.internal: for req in self.conan_data["requirements_internal"]: self.requires(req) - self.requires("cpython/3.10.4@ultimaker/stable") - self.requires("clipper/6.4.2@ultimaker/stable") - self.requires("openssl/3.2.0") - self.requires("protobuf/3.21.12") - self.requires("boost/1.82.0") - self.requires("spdlog/1.12.0") - self.requires("fmt/10.1.1") - self.requires("zlib/1.2.13") + if self.options.enterprise: + for req in self.conan_data["requirements_enterprise"]: + self.requires(req) + self.requires("cpython/3.12.2") def build_requirements(self): if self.options.get_safe("enable_i18n", False): @@ -383,18 +340,17 @@ class CuraConan(ConanFile): self._generate_cura_version(os.path.join(self.source_folder, "cura")) - if not self.in_local_cache: - # Copy CuraEngine.exe to bindirs of Virtual Python Environment - curaengine = self.dependencies["curaengine"].cpp_info - copy(self, "CuraEngine.exe", curaengine.bindirs[0], self.source_folder, keep_path = False) - copy(self, "CuraEngine", curaengine.bindirs[0], self.source_folder, keep_path = False) + # Copy CuraEngine.exe to bindirs of Virtual Python Environment + curaengine = self.dependencies["curaengine"].cpp_info + copy(self, "CuraEngine.exe", curaengine.bindirs[0], self.source_folder, keep_path = False) + copy(self, "CuraEngine", curaengine.bindirs[0], self.source_folder, keep_path = False) - # Copy the external plugins that we want to bundle with Cura - if self._enterprise: - rmdir(self, str(self.source_path.joinpath("plugins", "NativeCADplugin"))) - native_cad_plugin = self.dependencies["native_cad_plugin"].cpp_info - copy(self, "*", native_cad_plugin.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True) - copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) + # Copy the external plugins that we want to bundle with Cura + if self.options.enterprise: + rmdir(self, str(self.source_path.joinpath("plugins", "NativeCADplugin"))) + native_cad_plugin = self.dependencies["native_cad_plugin"].cpp_info + copy(self, "*", native_cad_plugin.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True) + copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) # Copy resources of cura_binary_data cura_binary_data = self.dependencies["cura_binary_data"].cpp_info @@ -417,7 +373,7 @@ class CuraConan(ConanFile): copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources - if self._internal: + if self.options.internal: cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) @@ -537,8 +493,6 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV self.env_info.PYTHONPATH.append(os.path.join(self.source_folder, "plugins")) def package_id(self): - self.info.clear() - # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` del self.info.options.enterprise @@ -547,8 +501,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV del self.info.options.cloud_api_version del self.info.options.display_name del self.info.options.cura_debug_mode - if self.options.get_safe("enable_i18n", False): - del self.info.options.enable_i18n + self.info.options.rm_safe("enable_i18n") # TODO: Use the hash of requirements.txt and requirements-ultimaker.txt, Because changing these will actually result in a different # Cura. This is needed because the requirements.txt aren't managed by Conan and therefor not resolved in the package_id. This isn't diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index 162b33bf15..0000000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,6 +0,0 @@ -pytest -pyinstaller==6.3.0 -pyinstaller-hooks-contrib -pyyaml -sip==6.5.1 -jinja2 diff --git a/requirements-ultimaker.txt b/requirements-ultimaker.txt deleted file mode 100644 index 8a412d8596..0000000000 --- a/requirements-ultimaker.txt +++ /dev/null @@ -1 +0,0 @@ -git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 344a0156d8..0000000000 --- a/requirements.txt +++ /dev/null @@ -1,408 +0,0 @@ -### Direct requirements for Uranium and libCharon ### -PyQt6-sip==13.6.0 \ - --hash=sha256:0dfd22cfedd87e96f9d51e0778ca2ba3dc0be83e424e9e0f98f6994d8d9c90f0 \ - --hash=sha256:13885361ca2cb2f5085d50359ba61b3fabd41b139fb58f37332acbe631ef2357 \ - --hash=sha256:24441032a29791e82beb7dfd76878339058def0e97fdb7c1cea517f3a0e6e96b \ - --hash=sha256:2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778 \ - --hash=sha256:3075d8b325382750829e6cde6971c943352309d35768a4d4da0587459606d562 \ - --hash=sha256:33ea771fe777eb0d1a2c3ef35bcc3f7a286eb3ff09cd5b2fdd3d87d1f392d7e8 \ - --hash=sha256:39854dba35f8e5a4288da26ecb5f40b4c5ec1932efffb3f49d5ea435a7f37fb3 \ - --hash=sha256:3bf03e130fbfd75c9c06e687b86ba375410c7a9e835e4e03285889e61dd4b0c4 \ - --hash=sha256:43fb8551796030aae3d66d6e35e277494071ec6172cd182c9569ab7db268a2f5 \ - --hash=sha256:58f68a48400e0b3d1ccb18090090299bad26e3aed7ccb7057c65887b79b8aeea \ - --hash=sha256:5b9c6b6f9cfccb48cbb78a59603145a698fb4ffd176764d7083e5bf47631d8df \ - --hash=sha256:747f6ca44af81777a2c696bd501bc4815a53ec6fc94d4e25830e10bc1391f8ab \ - --hash=sha256:86a7b67c64436e32bffa9c28c9f21bf14a9faa54991520b12c3f6f435f24df7f \ - --hash=sha256:8c282062125eea5baf830c6998587d98c50be7c3a817a057fb95fef647184012 \ - --hash=sha256:8f9df9f7ccd8a9f0f1d36948c686f03ce1a1281543a3e636b7b7d5e086e1a436 \ - --hash=sha256:98bf954103b087162fa63b3a78f30b0b63da22fd6450b610ec1b851dbb798228 \ - --hash=sha256:9adf672f9114687533a74d5c2d4c03a9a929ad5ad9c3e88098a7da1a440ab916 \ - --hash=sha256:a6ce80bc24618d8a41be8ca51ad9f10e8bc4296dd90ab2809573df30a23ae0e5 \ - --hash=sha256:d6b5f699aaed0ac1fcd23e8fbca70d8a77965831b7c1ce474b81b1678817a49d \ - --hash=sha256:fa759b6339ff7e25f9afe2a6b651b775f0a36bcb3f5fa85e81a90d3b033c83f4 \ - --hash=sha256:fa7b10af7488efc5e53b41dd42c0f421bde6c2865a107af7ae259aff9d841da9 -PyQt6==6.6.0 \ - --hash=sha256:33655db05ac2de699320f035250c21434c77144a6a2943aca3f4c579dabc3f7b \ - --hash=sha256:3ef68830a9b32050c30f7962c56a5927802c9193b68eaf405faecb8ce9ae10a8 \ - --hash=sha256:d41512d66044c2df9c5f515a56a922170d68a37b3406ffddc8b4adc57181b576 \ - --hash=sha256:fc7185d65755f26d7a6842492ec5398c92544dc4eafbbcbef1b1922aca585c96 -PyQt6-Qt6==6.6.0 \ - --hash=sha256:1b079a33088d32ff47872cdb37fd15aa42101f0be46c3340244483849b781438 \ - --hash=sha256:8cb30d64a4d32465ea1686bc827cbe452225fb387c4873356b0fa7b9ae63534f \ - --hash=sha256:a151f34712cd645111e89cb30b02e5fb69c9dcc3603ab3c03a561e874bd7cbcf \ - --hash=sha256:e5483ae04bf107411c7469f1be9f9e2eb9840303e788b3ac524fe30af90d45f4 -PyQt6-NetworkAuth==6.6.0 \ - --hash=sha256:7b90b81792fe53105287c8cbb5e4b22bc44a482268ffb7d3e33f852807f86182 \ - --hash=sha256:c7e2335159aa795e2fe6fb069ccce6308672ab80f26c50fab57caf957371cbb5 \ - --hash=sha256:cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb \ - --hash=sha256:f60ff9a62f5129dc2a9d4c495fb47f9a03e4dfb666b50fb7d61f46e89bf7b6a2 -PyQt6-NetworkAuth-Qt6==6.6.0 \ - --hash=sha256:481d9093e1fb1ac6843d8beabcd359cc34b74b9a2cbb3e2b68d96bd3f178d4e0 \ - --hash=sha256:4cc48fd375730a0ba5fbed9d64abb2914f587377560a78a63aff893f9e276a45 \ - --hash=sha256:5006deabf55304d4a3e0b3c954f93e5835546b11e789d14653a2493d12d3a063 \ - --hash=sha256:bcd56bfc892fec961c51eba3c0bf32ba8317a762d9e254d3830569611ed569d6 - -certifi==2023.5.7; \ - --hash=sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716 -cryptography==41.0.1 \ - --hash=sha256:059e348f9a3c1950937e1b5d7ba1f8e968508ab181e75fc32b879452f08356db \ - --hash=sha256:1a5472d40c8f8e91ff7a3d8ac6dfa363d8e3138b961529c996f3e2df0c7a411a \ - --hash=sha256:1a8e6c2de6fbbcc5e14fd27fb24414507cb3333198ea9ab1258d916f00bc3039 \ - --hash=sha256:1fee5aacc7367487b4e22484d3c7e547992ed726d14864ee33c0176ae43b0d7c \ - --hash=sha256:5d092fdfedaec4cbbffbf98cddc915ba145313a6fdaab83c6e67f4e6c218e6f3 \ - --hash=sha256:5f0ff6e18d13a3de56f609dd1fd11470918f770c6bd5d00d632076c727d35485 \ - --hash=sha256:7bfc55a5eae8b86a287747053140ba221afc65eb06207bedf6e019b8934b477c \ - --hash=sha256:7fa01527046ca5facdf973eef2535a27fec4cb651e4daec4d043ef63f6ecd4ca \ - --hash=sha256:8dde71c4169ec5ccc1087bb7521d54251c016f126f922ab2dfe6649170a3b8c5 \ - --hash=sha256:8f4ab7021127a9b4323537300a2acfb450124b2def3756f64dc3a3d2160ee4b5 \ - --hash=sha256:948224d76c4b6457349d47c0c98657557f429b4e93057cf5a2f71d603e2fc3a3 \ - --hash=sha256:9a6c7a3c87d595608a39980ebaa04d5a37f94024c9f24eb7d10262b92f739ddb \ - --hash=sha256:b46e37db3cc267b4dea1f56da7346c9727e1209aa98487179ee8ebed09d21e43 \ - --hash=sha256:b4ceb5324b998ce2003bc17d519080b4ec8d5b7b70794cbd2836101406a9be31 \ - --hash=sha256:cb33ccf15e89f7ed89b235cff9d49e2e62c6c981a6061c9c8bb47ed7951190bc \ - --hash=sha256:d198820aba55660b4d74f7b5fd1f17db3aa5eb3e6893b0a41b75e84e4f9e0e4b \ - --hash=sha256:d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006 \ - --hash=sha256:eb8163f5e549a22888c18b0d53d6bb62a20510060a22fd5a995ec8a05268df8a \ - --hash=sha256:f73bff05db2a3e5974a6fd248af2566134d8981fd7ab012e5dd4ddb1d9a70699 -zeroconf==0.31.0 \ - --hash=sha256:53a180248471c6f81bd1fffcbce03ed93d7d8eaf10905c9121ac1ea996d19844 \ - --hash=sha256:5a468da018bc3f04bbce77ae247924d802df7aeb4c291bbbb5a9616d128800b0 -importlib-metadata==4.10.0 \ - --hash=sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4 \ - --hash=sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6 -keyring==23.0.1 \ - --hash=sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 \ - --hash=sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - -# Use Numpy wheel that is compiled with Intel optimizations (MKL). Obtained from https://www.lfd.uci.edu/~gohlke/pythonlibs/#numpy -# We cache this at software.ultimaker.com since this website tends to remove older versions rather quickly. -https://software.ultimaker.com/cura-binary-dependencies/numpy-1.21.5+mkl-cp310-cp310-win_amd64.whl; \ - sys_platform=="win32" \ - --hash=sha256:fbd5d5126b730a151134d21994a951fe28df06464e0c9a2cba2a4132e542a5fc -numpy==1.21.5; \ - sys_platform!="win32" \ - --hash=sha256:00c9fa73a6989895b8815d98300a20ac993c49ac36c8277e8ffeaa3631c0dbbb \ - --hash=sha256:025b497014bc33fc23897859350f284323f32a2fff7654697f5a5fc2a19e9939 \ - --hash=sha256:08de8472d9f7571f9d51b27b75e827f5296295fa78817032e84464be8bb905bc \ - --hash=sha256:1964db2d4a00348b7a60ee9d013c8cb0c566644a589eaa80995126eac3b99ced \ - --hash=sha256:2a9add27d7fc0fdb572abc3b2486eb3b1395da71e0254c5552b2aad2a18b5441 \ - --hash=sha256:2d8adfca843bc46ac199a4645233f13abf2011a0b2f4affc5c37cd552626f27b \ - --hash=sha256:301e408a052fdcda5cdcf03021ebafc3c6ea093021bf9d1aa47c54d48bdad166 \ - --hash=sha256:311283acf880cfcc20369201bd75da907909afc4666966c7895cbed6f9d2c640 \ - --hash=sha256:341dddcfe3b7b6427a28a27baa59af5ad51baa59bfec3264f1ab287aa3b30b13 \ - --hash=sha256:3a5098df115340fb17fc93867317a947e1dcd978c3888c5ddb118366095851f8 \ - --hash=sha256:3c978544be9e04ed12016dd295a74283773149b48f507d69b36f91aa90a643e5 \ - --hash=sha256:3d893b0871322eaa2f8c7072cdb552d8e2b27645b7875a70833c31e9274d4611 \ - --hash=sha256:4fe6a006557b87b352c04596a6e3f12a57d6e5f401d804947bd3188e6b0e0e76 \ - --hash=sha256:507c05c7a37b3683eb08a3ff993bd1ee1e6c752f77c2f275260533b265ecdb6c \ - --hash=sha256:58ca1d7c8aef6e996112d0ce873ac9dfa1eaf4a1196b4ff7ff73880a09923ba7 \ - --hash=sha256:61bada43d494515d5b122f4532af226fdb5ee08fe5b5918b111279843dc6836a \ - --hash=sha256:69a5a8d71c308d7ef33ef72371c2388a90e3495dbb7993430e674006f94797d5 \ - --hash=sha256:6a5928bc6241264dce5ed509e66f33676fc97f464e7a919edc672fb5532221ee \ - --hash=sha256:7b9d6b14fc9a4864b08d1ba57d732b248f0e482c7b2ff55c313137e3ed4d8449 \ - --hash=sha256:a7c4b701ca418cd39e28ec3b496e6388fe06de83f5f0cb74794fa31cfa384c02 \ - --hash=sha256:a7e8f6216f180f3fd4efb73de5d1eaefb5f5a1ee5b645c67333033e39440e63a \ - --hash=sha256:b545ebadaa2b878c8630e5bcdb97fc4096e779f335fc0f943547c1c91540c815 \ - --hash=sha256:c293d3c0321996cd8ffe84215ffe5d269fd9d1d12c6f4ffe2b597a7c30d3e593 \ - --hash=sha256:c5562bcc1a9b61960fc8950ade44d00e3de28f891af0acc96307c73613d18f6e \ - --hash=sha256:ca9c23848292c6fe0a19d212790e62f398fd9609aaa838859be8459bfbe558aa \ - --hash=sha256:cc1b30205d138d1005adb52087ff45708febbef0e420386f58664f984ef56954 \ - --hash=sha256:dbce7adeb66b895c6aaa1fad796aaefc299ced597f6fbd9ceddb0dd735245354 \ - --hash=sha256:dc4b2fb01f1b4ddbe2453468ea0719f4dbb1f5caa712c8b21bb3dd1480cd30d9 \ - --hash=sha256:eed2afaa97ec33b4411995be12f8bdb95c87984eaa28d76cf628970c8a2d689a \ - --hash=sha256:fc7a7d7b0ed72589fd8b8486b9b42a564f10b8762be8bd4d9df94b807af4a089 -pyclipper==1.3.0.post3; \ - --hash=sha256:1408461fba4985d58589fa74c59e273e8aa91d8b55c2e9a6abf966eed7562d90 \ - --hash=sha256:1df7e4bce6ac68abfe926d319f52b749b7c9d5e0a6bd7112a0c7f2f908abecbc \ - --hash=sha256:24b6b70114941805c14a33e9378e52d24b18791f1bfc365853d5adb33425f173 \ - --hash=sha256:2b0950dada5b56a002dddccf131815a8f9b55c4df86ff6a43b7ef48a91b572aa \ - --hash=sha256:2d51757df15f1721946f39016191c7d685306fc69d8a5f2933a1d22119150a1d \ - --hash=sha256:341556b83ce2a5d4ee36e263e04751a9949e4161f60f0011f9500b845b25ce3c \ - --hash=sha256:46b3996c8dcda562c408e653ccef8efd95a7d69400f9119df2c2cb8083d36bf8 \ - --hash=sha256:5434e1e69425dc7958579b1f7bedfa8a7cce79400e1b708a42be769a165a3a2c \ - --hash=sha256:5b4e0e360ebfc25d01c7e0873b27f912d1c02d99b84393d526bc01836a5fb9f4 \ - --hash=sha256:60f20e96e9e055e9bb2e729fe6078969ce252c6b7b1b18d8d963e5343d99f99e \ - --hash=sha256:615bece709d8c304d97089a83f8ff91ca0d2646e8fe42f2637d7cdfcf99a6e4e \ - --hash=sha256:639fbc55569b94487f89261b1656e3e655d06888a582218c5432c426705d1f6f \ - --hash=sha256:6748239b89a5edd00b3ce36cb5c7a177978ff3361de861fe2cc559bb2760625d \ - --hash=sha256:679bfd1fd4595a3f58a706256dc6cc7179ee40fbeff4d134aa3163a9c87ca545 \ - --hash=sha256:6ace0de72f252e48eda28981e24142a2b02ac17eacc3d8a2baf628671dd8cc8f \ - --hash=sha256:771ba332790e88eb4aa9de2172131af25525ac23fdda789691e543962849f149 \ - --hash=sha256:8fabba875314ebc751b66e571b8b0d5319c76e22051304880a552d70db2252af \ - --hash=sha256:a050ec9df95e9611461adb7f86da4f066848c045d966c46e7b124593e6410e2a \ - --hash=sha256:ab7e2f9b655333a37002b90bea47d77ff8d1f01293798911afa7f39217f1b71d \ - --hash=sha256:b0097aef9ac8a5e10434059641fea338fb682c61993bfe65670e459ec14b4151 \ - --hash=sha256:b509cfd696962683553cd6b9fc7f0baf05bff47c09fd68b085a8aea493436267 \ - --hash=sha256:bad590e701eaef644899ce164631f83e39669796e552f17aef5a37238646b392 \ - --hash=sha256:c586ca07c1418d4f010c6bc65215c4b193211e1b95dd8a1bd312d8207c5ccf6a \ - --hash=sha256:cb5ad68b82c2aa408672444e567cea138db29790997d603525878632d61fd6ec \ - --hash=sha256:cd9f0496daa9b505902848d401bfc3ffe80ee3a6863451fc6c05ceb2a45b9d8f \ - --hash=sha256:da4d8f253dd8e152b3364902bed5e221165d3af4e71e2ae81eb9a9a9802089a2 \ - --hash=sha256:e8d77755a00566e0f0cf48da2e42e76ff93423b55880621944f950058be3fc0e \ - --hash=sha256:ebc13dbfaec1b489fc6ed92a642b8a2c7072fa2d4bc12514cc2bbeacd47c5baf \ - --hash=sha256:ed5ea68bc6f3428fbf9d98f1e72e2020d763d88053cc9a9d31b2eeb49500b26f \ - --hash=sha256:ee52b9d29512eb7b8b9faee6db3f8694eb6c8455785a5d2d561c40eca67b226f \ - --hash=sha256:f428ecdd224ec30c1a4dbdbaac44e746cbe9a05c25627b05cc7bc2dcda235a26 \ - --hash=sha256:f5f3ad171f21511813085ac549bb717bbdcc0f4da27abf6b0629438e1f23ca0b -scipy==1.9.1 \ - --hash=sha256:c61b4a91a702e8e04aeb0bfc40460e1f17a640977c04dda8757efb0199c75332 \ - --hash=sha256:d79da472015d0120ba9b357b28a99146cd6c17b9609403164b1a8ed149b4dfc8 \ - --hash=sha256:825951b88f56765aeb6e5e38ac9d7d47407cfaaeb008d40aa1b45a2d7ea2731e \ - --hash=sha256:f950a04b33e17b38ff561d5a0951caf3f5b47caa841edd772ffb7959f20a6af0 \ - --hash=sha256:8cc81ac25659fec73599ccc52c989670e5ccd8974cf34bacd7b54a8d809aff1a \ - --hash=sha256:8d3faa40ac16c6357aaf7ea50394ea6f1e8e99d75e927a51102b1943b311b4d9 \ - --hash=sha256:7a412c476a91b080e456229e413792bbb5d6202865dae963d1e6e28c2bb58691 \ - --hash=sha256:eb954f5aca4d26f468bbebcdc5448348eb287f7bea536c6306f62ea062f63d9a \ - --hash=sha256:3c6f5d1d4b9a5e4fe5e14f26ffc9444fc59473bbf8d45dc4a9a15283b7063a72 \ - --hash=sha256:bc4e2c77d4cd015d739e75e74ebbafed59ba8497a7ed0fd400231ed7683497c4 \ - --hash=sha256:0419485dbcd0ed78c0d5bf234c5dd63e86065b39b4d669e45810d42199d49521 \ - --hash=sha256:34441dfbee5b002f9e15285014fd56e5e3372493c3e64ae297bae2c4b9659f5a \ - --hash=sha256:b97b479f39c7e4aaf807efd0424dec74bbb379108f7d22cf09323086afcd312c \ - --hash=sha256:e8fe305d9d67a81255e06203454729405706907dccbdfcc330b7b3482a6c371d \ - --hash=sha256:39ab9240cd215a9349c85ab908dda6d732f7d3b4b192fa05780812495536acc4 \ - --hash=sha256:71487c503e036740635f18324f62a11f283a632ace9d35933b2b0a04fd898c98 \ - --hash=sha256:3bc1ab68b9a096f368ba06c3a5e1d1d50957a86665fc929c4332d21355e7e8f4 \ - --hash=sha256:f7c39f7dbb57cce00c108d06d731f3b0e2a4d3a95c66d96bce697684876ce4d4 \ - --hash=sha256:47d1a95bd9d37302afcfe1b84c8011377c4f81e33649c5a5785db9ab827a6ade \ - --hash=sha256:96d7cf7b25c9f23c59a766385f6370dab0659741699ecc7a451f9b94604938ce \ - --hash=sha256:09412eb7fb60b8f00b328037fd814d25d261066ebc43a1e339cdce4f7502877e \ - --hash=sha256:90c805f30c46cf60f1e76e947574f02954d25e3bb1e97aa8a07bc53aa31cf7d1 \ - --hash=sha256:26d28c468900e6d5fdb37d2812ab46db0ccd22c63baa095057871faa3a498bc9 -trimesh==3.9.36 \ - --hash=sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e \ - --hash=sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 -sentry-sdk==0.13.5 \ - --hash=sha256:05285942901d38c7ce2498aba50d8e87b361fc603281a5902dda98f3f8c5e145 \ - --hash=sha256:c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82 -mypy==0.931 \ - --hash=sha256:0038b21890867793581e4cb0d810829f5fd4441aa75796b53033af3aa30430ce \ - --hash=sha256:1171f2e0859cfff2d366da2c7092b06130f232c636a3f7301e3feb8b41f6377d \ - --hash=sha256:1b06268df7eb53a8feea99cbfff77a6e2b205e70bf31743e786678ef87ee8069 \ - --hash=sha256:1b65714dc296a7991000b6ee59a35b3f550e0073411ac9d3202f6516621ba66c \ - --hash=sha256:1bf752559797c897cdd2c65f7b60c2b6969ffe458417b8d947b8340cc9cec08d \ - --hash=sha256:300717a07ad09525401a508ef5d105e6b56646f7942eb92715a1c8d610149714 \ - --hash=sha256:3c5b42d0815e15518b1f0990cff7a705805961613e701db60387e6fb663fe78a \ - --hash=sha256:4365c60266b95a3f216a3047f1d8e3f895da6c7402e9e1ddfab96393122cc58d \ - --hash=sha256:50c7346a46dc76a4ed88f3277d4959de8a2bd0a0fa47fa87a4cde36fe247ac05 \ - --hash=sha256:5b56154f8c09427bae082b32275a21f500b24d93c88d69a5e82f3978018a0266 \ - --hash=sha256:74f7eccbfd436abe9c352ad9fb65872cc0f1f0a868e9d9c44db0893440f0c697 \ - --hash=sha256:7b3f6f557ba4afc7f2ce6d3215d5db279bcf120b3cfd0add20a5d4f4abdae5bc \ - --hash=sha256:8c11003aaeaf7cc2d0f1bc101c1cc9454ec4cc9cb825aef3cafff8a5fdf4c799 \ - --hash=sha256:8ca7f8c4b1584d63c9a0f827c37ba7a47226c19a23a753d52e5b5eddb201afcd \ - --hash=sha256:c89702cac5b302f0c5d33b172d2b55b5df2bede3344a2fbed99ff96bddb2cf00 \ - --hash=sha256:d8f1ff62f7a879c9fe5917b3f9eb93a79b78aad47b533911b853a757223f72e7 \ - --hash=sha256:d9d2b84b2007cea426e327d2483238f040c49405a6bf4074f605f0156c91a47a \ - --hash=sha256:e839191b8da5b4e5d805f940537efcaa13ea5dd98418f06dc585d2891d228cf0 \ - --hash=sha256:f9fe20d0872b26c4bba1c1be02c5340de1019530302cf2dcc85c7f9fc3252ae0 \ - --hash=sha256:ff3bf387c14c805ab1388185dd22d6b210824e164d4bb324b195ff34e322d166 -pyserial==3.4 \ - --hash=sha256:6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 \ - --hash=sha256:e0770fadba80c31013896c7e6ef703f72e7834965954a78e71a3049488d4d7d8 - -### Indirect requirements ### -chardet==3.0.4 \ - --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \ - --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 -idna==2.8 \ - --hash=sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 \ - --hash=sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c -attrs==21.3.0 \ - --hash=sha256:8f7335278dedd26b58c38e006338242cc0977f06d51579b2b8b87b9b33bff66c \ - --hash=sha256:50f3c9b216dc9021042f71b392859a773b904ce1a029077f58f6598272432045 -requests==2.22.0 \ - --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \ - --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 -# twisted -Twisted==21.2.0 \ - --hash=sha256:77544a8945cf69b98d2946689bbe0c75de7d145cdf11f391dd487eae8fc95a12 \ - --hash=sha256:aab38085ea6cda5b378b519a0ec99986874921ee8881318626b0a3414bb2631e -constantly==15.1.0 \ - --hash=sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 \ - --hash=sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d -hyperlink==21.0.0 \ - --hash=sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b \ - --hash=sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4 -incremental==22.10.0 \ - --hash=sha256:b864a1f30885ee72c5ac2835a761b8fe8aa9c28b9395cacf27286602688d3e51 \ - --hash=sha256:912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 -zope.interface==5.4.0 \ - --hash=sha256:0f91b5b948686659a8e28b728ff5e74b1be6bf40cb04704453617e5f1e945ef3 \ - --hash=sha256:3c02411a3b62668200910090a0dff17c0b25aaa36145082a5a6adf08fa281e54 \ - --hash=sha256:5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e \ - --hash=sha256:bf68f4b2b6683e52bec69273562df15af352e5ed25d1b6641e7efddc5951d1a7 \ - --hash=sha256:db1fa631737dab9fa0b37f3979d8d2631e348c3b4e8325d6873c2541d0ae5a48 \ - --hash=sha256:f44e517131a98f7a76696a7b21b164bcb85291cee106a23beccce454e1f433a4 -Automat==20.2.0 \ - --hash=sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 \ - --hash=sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111 -twisted-iocpsupport==1.0.2; \ - sys_platform=="win32" \ - --hash=sha256:306becd6e22ab6e8e4f36b6bdafd9c92e867c98a5ce517b27fdd27760ee7ae41 \ - --hash=sha256:3c61742cb0bc6c1ac117a7e5f422c129832f0c295af49e01d8a6066df8cfc04d \ - --hash=sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 \ - --hash=sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf \ - --hash=sha256:81b3abe3527b367da0220482820cb12a16c661672b7bcfcde328902890d63323 \ - --hash=sha256:851b3735ca7e8102e661872390e3bce88f8901bece95c25a0c8bb9ecb8a23d32 \ - --hash=sha256:985c06a33f5c0dae92c71a036d1ea63872ee86a21dd9b01e1f287486f15524b4 \ - --hash=sha256:9dbb8823b49f06d4de52721b47de4d3b3026064ef4788ce62b1a21c57c3fff6f \ - --hash=sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 \ - --hash=sha256:b76b4eed9b27fd63ddb0877efdd2d15835fdcb6baa745cb85b66e5d016ac2878 \ - --hash=sha256:b9fed67cf0f951573f06d560ac2f10f2a4bbdc6697770113a2fc396ea2cb2565 \ - --hash=sha256:bf4133139d77fc706d8f572e6b7d82871d82ec7ef25d685c2351bdacfb701415 -numpy-stl==2.10.1 \ - --hash=sha256:f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c -python-utils==2.3.0 \ - --hash=sha256:34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3 \ - --hash=sha256:e25f840564554eaded56eaa395bca507b0b9e9f0ae5ecb13a8cb785305c56d25 -six==1.12.0 \ - --hash=sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c \ - --hash=sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 -shapely==2.0.1 \ - --hash=sha256:01224899ff692a62929ef1a3f5fe389043e262698a708ab7569f43a99a48ae82 \ - --hash=sha256:05c51a29336e604c084fb43ae5dbbfa2c0ef9bd6fedeae0a0d02c7b57a56ba46 \ - --hash=sha256:09d6c7763b1bee0d0a2b84bb32a4c25c6359ad1ac582a62d8b211e89de986154 \ - --hash=sha256:193a398d81c97a62fc3634a1a33798a58fd1dcf4aead254d080b273efbb7e3ff \ - --hash=sha256:1a34a23d6266ca162499e4a22b79159dc0052f4973d16f16f990baa4d29e58b6 \ - --hash=sha256:2569a4b91caeef54dd5ae9091ae6f63526d8ca0b376b5bb9fd1a3195d047d7d4 \ - --hash=sha256:33403b8896e1d98aaa3a52110d828b18985d740cc9f34f198922018b1e0f8afe \ - --hash=sha256:3ad81f292fffbd568ae71828e6c387da7eb5384a79db9b4fde14dd9fdeffca9a \ - --hash=sha256:3cb256ae0c01b17f7bc68ee2ffdd45aebf42af8992484ea55c29a6151abe4386 \ - --hash=sha256:45b4833235b90bc87ee26c6537438fa77559d994d2d3be5190dd2e54d31b2820 \ - --hash=sha256:4641325e065fd3e07d55677849c9ddfd0cf3ee98f96475126942e746d55b17c8 \ - --hash=sha256:502e0a607f1dcc6dee0125aeee886379be5242c854500ea5fd2e7ac076b9ce6d \ - --hash=sha256:66a6b1a3e72ece97fc85536a281476f9b7794de2e646ca8a4517e2e3c1446893 \ - --hash=sha256:70a18fc7d6418e5aea76ac55dce33f98e75bd413c6eb39cfed6a1ba36469d7d4 \ - --hash=sha256:7d3bbeefd8a6a1a1017265d2d36f8ff2d79d0162d8c141aa0d37a87063525656 \ - --hash=sha256:83a8ec0ee0192b6e3feee9f6a499d1377e9c295af74d7f81ecba5a42a6b195b7 \ - --hash=sha256:865bc3d7cc0ea63189d11a0b1120d1307ed7a64720a8bfa5be2fde5fc6d0d33f \ - --hash=sha256:90cfa4144ff189a3c3de62e2f3669283c98fb760cfa2e82ff70df40f11cadb39 \ - --hash=sha256:91575d97fd67391b85686573d758896ed2fc7476321c9d2e2b0c398b628b961c \ - --hash=sha256:9a6ac34c16f4d5d3c174c76c9d7614ec8fe735f8f82b6cc97a46b54f386a86bf \ - --hash=sha256:a529218e72a3dbdc83676198e610485fdfa31178f4be5b519a8ae12ea688db14 \ - --hash=sha256:a70a614791ff65f5e283feed747e1cc3d9e6c6ba91556e640636bbb0a1e32a71 \ - --hash=sha256:ac1dfc397475d1de485e76de0c3c91cc9d79bd39012a84bb0f5e8a199fc17bef \ - --hash=sha256:b06d031bc64149e340448fea25eee01360a58936c89985cf584134171e05863f \ - --hash=sha256:b4f0711cc83734c6fad94fc8d4ec30f3d52c1787b17d9dca261dc841d4731c64 \ - --hash=sha256:b50c401b64883e61556a90b89948297f1714dbac29243d17ed9284a47e6dd731 \ - --hash=sha256:b519cf3726ddb6c67f6a951d1bb1d29691111eaa67ea19ddca4d454fbe35949c \ - --hash=sha256:bca57b683e3d94d0919e2f31e4d70fdfbb7059650ef1b431d9f4e045690edcd5 \ - --hash=sha256:c43755d2c46b75a7b74ac6226d2cc9fa2a76c3263c5ae70c195c6fb4e7b08e79 \ - --hash=sha256:c7eed1fb3008a8a4a56425334b7eb82651a51f9e9a9c2f72844a2fb394f38a6c \ - --hash=sha256:c8b0d834b11be97d5ab2b4dceada20ae8e07bcccbc0f55d71df6729965f406ad \ - --hash=sha256:ce88ec79df55430e37178a191ad8df45cae90b0f6972d46d867bf6ebbb58cc4d \ - --hash=sha256:d173d24e85e51510e658fb108513d5bc11e3fd2820db6b1bd0522266ddd11f51 \ - --hash=sha256:d8f55f355be7821dade839df785a49dc9f16d1af363134d07eb11e9207e0b189 \ - --hash=sha256:da71de5bf552d83dcc21b78cc0020e86f8d0feea43e202110973987ffa781c21 \ - --hash=sha256:e55698e0ed95a70fe9ff9a23c763acfe0bf335b02df12142f74e4543095e9a9b \ - --hash=sha256:f32a748703e7bf6e92dfa3d2936b2fbfe76f8ce5f756e24f49ef72d17d26ad02 \ - --hash=sha256:f470a130d6ddb05b810fc1776d918659407f8d025b7f56d2742a596b6dffa6c7 -cython==0.29.26 \ - --hash=sha256:af377d543a762867da11fcf6e558f7a4a535ff8693f30cce123fab10c00fa312 \ - --hash=sha256:f5e15ff892c8afad64931ee3dd723c4755c2c516606f9aae7613bebfac62b0f6 \ - --hash=sha256:2b834ff6e4d10ba6d7a0d676dd71c1b427a181ddbbbbf79e91d1861557aab59f \ - --hash=sha256:c813799d533194b7d85203d881d8b4f567a8c644a67f50d47f1ffbf316df412f \ - --hash=sha256:6773cce9d4b3b6168d8feb2b6f06b658ef1e11cbfec075041745666d8e2a5e45 \ - --hash=sha256:362fbb9cb4627c7786231429768b54aaba5459a2a0e46c25e59f202ca6155437 -pybind11==2.6.2 \ - --hash=sha256:2d8aebe1709bc367e34e3b23d8eccbf3f387ee9d5640548c6260d33b59f02405 \ - --hash=sha256:d0e0aed9279656f21501243b707eb6e3b951e89e10c3271dedf3ae41c365e5ed -wheel==0.37.1 \ - --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 \ - --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a -setuptools==62.0.0 \ - --hash=sha256:7999cbd87f1b6e1f33bf47efa368b224bed5e27b5ef2c4d46580186cbcb1a86a \ - --hash=sha256:a65e3802053e99fc64c6b3b29c11132943d5b8c8facbcc461157511546510967 -ifaddr==0.1.7 \ - --hash=sha256:1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 \ - --hash=sha256:d1f603952f0a71c9ab4e705754511e4e03b02565bc4cec7188ad6415ff534cd3 -pycparser==2.20 \ - --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \ - --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 -zipp==3.5.0 \ - --hash=sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 \ - --hash=sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4 -cffi==1.15.0 \ - --hash=sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 \ - --hash=sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 \ - --hash=sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636 \ - --hash=sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20 \ - --hash=sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728 \ - --hash=sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27 \ - --hash=sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66 \ - --hash=sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443 \ - --hash=sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0 \ - --hash=sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7 \ - --hash=sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39 \ - --hash=sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605 \ - --hash=sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a \ - --hash=sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37 \ - --hash=sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029 \ - --hash=sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139 \ - --hash=sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc \ - --hash=sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df \ - --hash=sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14 \ - --hash=sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880 \ - --hash=sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2 \ - --hash=sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a \ - --hash=sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e \ - --hash=sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474 \ - --hash=sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024 \ - --hash=sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8 \ - --hash=sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0 \ - --hash=sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e \ - --hash=sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a \ - --hash=sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e \ - --hash=sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032 \ - --hash=sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6 \ - --hash=sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e \ - --hash=sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b \ - --hash=sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e \ - --hash=sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 \ - --hash=sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962 \ - --hash=sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c \ - --hash=sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4 \ - --hash=sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55 \ - --hash=sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962 \ - --hash=sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023 \ - --hash=sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c \ - --hash=sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6 \ - --hash=sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8 \ - --hash=sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382 \ - --hash=sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7 \ - --hash=sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc \ - --hash=sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997 \ - --hash=sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796 -urllib3==1.25.9 \ - --hash=sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 \ - --hash=sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115 -mypy-extensions==0.4.3 \ - --hash=sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d \ - --hash=sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8 -tomli==2.0.1 \ - --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ - --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f -typing-extensions==3.10.0.2 \ - --hash=sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e \ - --hash=sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34 -jeepney==0.7.1; \ - --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ - --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f -SecretStorage==3.3.3 \ - --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ - --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 -keyring==23.0.1 \ - --hash=sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 \ - --hash=sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 -networkx==2.6.2 \ - --hash=sha256:2306f1950ce772c5a59a57f5486d59bb9cab98497c45fc49cbc45ac0dec119bb \ - --hash=sha256:5fcb7004be69e8fbdf07dcb502efa5c77cadcaad6982164134eeb9721f826c2e -pywin32==303; \ - sys_platform=="win32" \ - --hash=sha256:51cb52c5ec6709f96c3f26e7795b0bf169ee0d8395b2c1d7eb2c029a5008ed51 -pywin32-ctypes==0.2.0; \ - sys_platform=="win32" \ - --hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \ - --hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 - -charset-normalizer==2.1.0; \ - --hash=sha256:5189b6f22b01957427f35b6a08d9a0bc45b46d3788ef5a92e978433c7a35f8a5 From d26c5b74a6af7b69f0e4efb7043c4c9859d06cd8 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Sep 2024 16:37:15 +0200 Subject: [PATCH 019/166] Fix incompatible Python dependencies and files generation --- conandata.yml | 12 ++++++------ conanfile.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conandata.yml b/conandata.yml index f40ad698a2..535c345e6e 100644 --- a/conandata.yml +++ b/conandata.yml @@ -317,10 +317,10 @@ pip_requirements: - sha256:8f7335278dedd26b58c38e006338242cc0977f06d51579b2b8b87b9b33bff66c - sha256:50f3c9b216dc9021042f71b392859a773b904ce1a029077f58f6598272432045 requests: - version: "2.22.0" + version: "2.32.3" hashes: - - sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 - - sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 + - sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6 + - sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 twisted: version: "21.2.0" hashes: @@ -573,10 +573,10 @@ pip_requirements: - sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139 - sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 urllib3: - version: "1.25.9" + version: "2.2.3" hashes: - - sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115 - - sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 + - sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac + - sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9 jeepney: version: "0.7.1" hashes: diff --git a/conanfile.py b/conanfile.py index 8b34e959d3..3710db42ae 100644 --- a/conanfile.py +++ b/conanfile.py @@ -135,7 +135,7 @@ class CuraConan(ConanFile): # list of conan installs for dependency in self.dependencies.host.values(): conan_installs[dependency.ref.name] = { - "version": dependency.ref.version, + "version": str(dependency.ref.version), "revision": dependency.ref.revision } return conan_installs From b526920e7c8313d9cf7a38cc9d8766e5f5a86f7d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 08:48:54 +0200 Subject: [PATCH 020/166] Use common package creation workflow --- .github/workflows/conan-package.yml | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 42d03b5038..a85756777c 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -32,28 +32,13 @@ on: - '[0-9].[0-9]*' - '[0-9].[0-9][0-9]*' -env: - CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} - CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} - jobs: - conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main +# FIXME: Use main once merged + conan-package: + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: project_name: cura - - conan-package-export: - needs: [ conan-recipe-version ] - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} - secrets: inherit - - conan-package-create: - needs: [ conan-recipe-version, conan-package-export ] - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} + platform_windows: false + platform_mac: false conan_extra_args: "-o cura:enable_i18n=True" - secrets: inherit \ No newline at end of file + secrets: inherit From 219782b5adc4692646e02350f6df466f1e579259 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 08:58:42 +0200 Subject: [PATCH 021/166] Fix conan argument syntax --- .github/workflows/conan-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index a85756777c..bfc24c9f36 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -40,5 +40,5 @@ jobs: project_name: cura platform_windows: false platform_mac: false - conan_extra_args: "-o cura:enable_i18n=True" + conan_extra_args: "-o \"cura/*:enable_i18n=True\"" secrets: inherit From 5506d57d38f12945e00538d1c4a0b43435ff2841 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 09:17:11 +0200 Subject: [PATCH 022/166] Fix dep and remove references to pip requirements txt files --- conanfile.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/conanfile.py b/conanfile.py index 3710db42ae..154f0e6bdb 100644 --- a/conanfile.py +++ b/conanfile.py @@ -318,7 +318,7 @@ class CuraConan(ConanFile): def build_requirements(self): if self.options.get_safe("enable_i18n", False): - self.tool_requires("gettext/0.21", force_host_context = True) + self.test_requires("gettext/0.21") def layout(self): self.folders.source = "." @@ -327,7 +327,7 @@ class CuraConan(ConanFile): self.cpp.package.libdirs = [os.path.join("site-packages", "cura")] self.cpp.package.bindirs = ["bin"] - self.cpp.package.resdirs = ["resources", "plugins", "packaging", "pip_requirements"] # pip_requirements should be the last item in the list + self.cpp.package.resdirs = ["resources", "plugins", "packaging"] def generate(self): copy(self, "cura_app.py", self.source_folder, str(self._script_dir)) @@ -477,10 +477,6 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], Path(res_dir).name)) def package_info(self): - self.user_info.pip_requirements = "requirements.txt" - self.user_info.pip_requirements_git = "requirements-ultimaker.txt" - self.user_info.pip_requirements_build = "requirements-dev.txt" - if self.in_local_cache: self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "site-packages")) self.env_info.PYTHONPATH.append(os.path.join(self.package_folder, "site-packages")) @@ -502,7 +498,3 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV del self.info.options.display_name del self.info.options.cura_debug_mode self.info.options.rm_safe("enable_i18n") - - # TODO: Use the hash of requirements.txt and requirements-ultimaker.txt, Because changing these will actually result in a different - # Cura. This is needed because the requirements.txt aren't managed by Conan and therefor not resolved in the package_id. This isn't - # ideal but an acceptable solution for now. From 7e9ca6f35fe1bd7753cb3b0013c60961090b1c5e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 10:40:31 +0200 Subject: [PATCH 023/166] Set translations sources folders --- conandata.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conandata.yml b/conandata.yml index 535c345e6e..8d37d40bca 100644 --- a/conandata.yml +++ b/conandata.yml @@ -642,3 +642,9 @@ pip_requirements_dev: - sip==6.5.1 - jinja2 +python_translation_source_folders: + - cura + - plugins +qml_translation_source_folders: + - resources/qml + - plugins From d91ff40e34142c9fe687ea94b3a333ad6fd90b96 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 10:42:49 +0200 Subject: [PATCH 024/166] Do not update translations automatically --- .github/workflows/conan-package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index bfc24c9f36..abdb17f48e 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -40,5 +40,4 @@ jobs: project_name: cura platform_windows: false platform_mac: false - conan_extra_args: "-o \"cura/*:enable_i18n=True\"" secrets: inherit From 7ddd65987f2a87bc538c7ecae41b082eefc31bc9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 11:32:51 +0200 Subject: [PATCH 025/166] Update recipe for package creation --- conanfile.py | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/conanfile.py b/conanfile.py index 154f0e6bdb..d554850a49 100644 --- a/conanfile.py +++ b/conanfile.py @@ -204,9 +204,9 @@ class CuraConan(ConanFile): if "package" in data: # get the paths from conan package if data["package"] == self.name: if self.in_local_cache: - src_path = os.path.join(self.package_folder, data["src"]) + src_path = str(Path(self.package_folder, data["src"])) else: - src_path = os.path.join(self.source_folder, data["src"]) + src_path = str(Path(self.source_folder, data["src"])) else: if data["package"] not in self.deps_cpp_info.deps: continue @@ -223,7 +223,7 @@ class CuraConan(ConanFile): if "package" in binary: # get the paths from conan package src_path = os.path.join(self.deps_cpp_info[binary["package"]].rootpath, binary["src"]) elif "root" in binary: # get the paths relative from the sourcefolder - src_path = str(self.source_path.joinpath(binary["root"], binary["src"])) + src_path = str(Path(self.source_folder, binary["root"], binary["src"])) if self.settings.os == "Windows": src_path = src_path.replace("\\", "\\\\") else: @@ -338,7 +338,7 @@ class CuraConan(ConanFile): vr = VirtualRunEnv(self) vr.generate() - self._generate_cura_version(os.path.join(self.source_folder, "cura")) + self._generate_cura_version(str(Path(self.source_folder, "cura"))) # Copy CuraEngine.exe to bindirs of Virtual Python Environment curaengine = self.dependencies["curaengine"].cpp_info @@ -347,10 +347,10 @@ class CuraConan(ConanFile): # Copy the external plugins that we want to bundle with Cura if self.options.enterprise: - rmdir(self, str(self.source_path.joinpath("plugins", "NativeCADplugin"))) + rmdir(self, str(Path(self.source_folder, "plugins", "NativeCADplugin"))) native_cad_plugin = self.dependencies["native_cad_plugin"].cpp_info - copy(self, "*", native_cad_plugin.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True) - copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) + copy(self, "*", native_cad_plugin.resdirs[0], str(Path(self.source_folder, "plugins", "NativeCADplugin")), keep_path = True) + copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(Path(self.source_folder, "resources", "bundled_packages")), keep_path = False) # Copy resources of cura_binary_data cura_binary_data = self.dependencies["cura_binary_data"].cpp_info @@ -368,7 +368,7 @@ class CuraConan(ConanFile): copy(self, "*.dylib", libdir, str(self._base_dir.joinpath("lib")), keep_path = False) # Copy materials (flat) - rmdir(self, os.path.join(self.source_folder, "resources", "materials")) + rmdir(self, str(Path(self.source_folder, "resources", "materials"))) fdm_materials = self.dependencies["fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) @@ -378,7 +378,7 @@ class CuraConan(ConanFile): copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) if self.options.devtools: - entitlements_file = "'{}'".format(os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements")) + entitlements_file = "'{}'".format(str(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements"))) self._generate_pyinstaller_spec( location=self.generators_folder, entrypoint_location="'{}'".format( @@ -401,8 +401,8 @@ class CuraConan(ConanFile): def build(self): if self.options.get_safe("enable_i18n", False) and self._i18n_options["build"]: - for po_file in self.source_path.joinpath("resources", "i18n").glob("**/*.po"): - mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_path)) + for po_file in Path(self.source_folder, "resources", "i18n").glob("**/*.po"): + mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_folder)) mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) mkdir(self, str(unix_path(self, Path(mo_file).parent))) cpp_info = self.dependencies["gettext"].cpp_info @@ -477,16 +477,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], Path(res_dir).name)) def package_info(self): - if self.in_local_cache: - self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "site-packages")) - self.env_info.PYTHONPATH.append(os.path.join(self.package_folder, "site-packages")) - self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "plugins")) - self.env_info.PYTHONPATH.append(os.path.join(self.package_folder, "plugins")) - else: - self.runenv_info.append_path("PYTHONPATH", self.source_folder) - self.env_info.PYTHONPATH.append(self.source_folder) - self.runenv_info.append_path("PYTHONPATH", os.path.join(self.source_folder, "plugins")) - self.env_info.PYTHONPATH.append(os.path.join(self.source_folder, "plugins")) + self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "site-packages")) + self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "plugins")) def package_id(self): # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py From edbfb9a9ca10fc7675d8749022efa5c6ef795278 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 11:36:26 +0200 Subject: [PATCH 026/166] Use common workflow --- .github/workflows/unit-test.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 2165540889..fb997464d1 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -37,26 +37,10 @@ on: - main - '[0-9]+.[0-9]+' -permissions: - contents: read - -env: - CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER }} - CONAN_PASSWORD: ${{ secrets.CONAN_PASS }} - jobs: - conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main - with: - project_name: cura - testing: - uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main - needs: [ conan-recipe-version ] + name: Run unit tests +# FIXME: use main once merged + uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-11622_conan_v2 with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - conan_extra_args: '-g VirtualPythonEnv -o cura:devtools=True -c tools.build:skip_test=False --options "*:enable_sentry=False"' - unit_test_cmd: 'pytest --junitxml=junit_cura.xml' - unit_test_dir: 'tests' - conan_generator_dir: './venv/bin' - secrets: inherit \ No newline at end of file + test_use_pytest: true From b95512392186d0b0fb433cf6fe9295084518e18a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 15:31:37 +0200 Subject: [PATCH 027/166] Update variable name --- .github/workflows/conan-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index abdb17f48e..65e467f4c3 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -37,7 +37,7 @@ jobs: conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: - project_name: cura + package_name: cura platform_windows: false platform_mac: false secrets: inherit From 9c5e763aaa565d3ab66f6f5f775821f5da29a5e9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 15:33:48 +0200 Subject: [PATCH 028/166] Update variable name --- .github/workflows/conan-package-resources.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 94705c7348..4bad3d2bcb 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -25,7 +25,7 @@ jobs: conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: - project_name: cura_resources + package_name: cura_resources conan_recipe_root: "./resources/" platform_windows: false platform_mac: false From 3199437403da2996e162530f6bd40996468904a1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 16:52:51 +0200 Subject: [PATCH 029/166] Remove now useless attribute --- conanfile.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index d554850a49..ee367a2c52 100644 --- a/conanfile.py +++ b/conanfile.py @@ -57,10 +57,6 @@ class CuraConan(ConanFile): def _i18n_options(self): return self.conf.get("user.i18n:options", default = {"extract": True, "build": True}, check_type = dict) - @property - def _pycharm_targets(self): - return self.conan_data["pycharm_targets"] - # FIXME: These env vars should be defined in the runenv. _cura_env = None From 57cd7a99a0f5c0e8a2418dd2f64acddc0911eced Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 09:12:40 +0200 Subject: [PATCH 030/166] Fix unit tests --- tests/API/TestAccount.py | 4 +-- tests/Settings/TestCuraStackBuilder.py | 5 ++-- tests/TestOAuth2.py | 41 ++++++++++++++++---------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/tests/API/TestAccount.py b/tests/API/TestAccount.py index 9d62646eff..26da8d04cd 100644 --- a/tests/API/TestAccount.py +++ b/tests/API/TestAccount.py @@ -80,12 +80,12 @@ def test_errorLoginState(application): with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): # Don't want triggers for account information to actually make HTTP requests. account._onLoginStateChanged(True, "BLARG!") # Even though we said that the login worked, it had an error message, so the login failed. - account.loginStateChanged.emit.called_with(False) + account.loginStateChanged.emit.assert_called_with(False) with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance"): account._onLoginStateChanged(True) account._onLoginStateChanged(False, "OMGZOMG!") - account.loginStateChanged.emit.called_with(False) + account.loginStateChanged.emit.assert_called_with(False) def test_sync_success(): account = Account(MagicMock()) diff --git a/tests/Settings/TestCuraStackBuilder.py b/tests/Settings/TestCuraStackBuilder.py index 6bd19a0d30..b049433923 100644 --- a/tests/Settings/TestCuraStackBuilder.py +++ b/tests/Settings/TestCuraStackBuilder.py @@ -50,9 +50,10 @@ def quality_changes_container(): def test_createMachineWithUnknownDefinition(application, container_registry): application.getContainerRegistry = MagicMock(return_value=container_registry) with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): - with patch("UM.ConfigurationErrorMessage.ConfigurationErrorMessage.getInstance") as mocked_config_error: + mocked_config_error = MagicMock() + with patch("UM.ConfigurationErrorMessage.ConfigurationErrorMessage.getInstance", MagicMock(return_value=mocked_config_error)): assert CuraStackBuilder.createMachine("Whatever", "NOPE") is None - assert mocked_config_error.addFaultyContainers.called_with("NOPE") + mocked_config_error.addFaultyContainers.assert_called_once_with("NOPE") def test_createMachine(application, container_registry, definition_container, global_variant, material_instance_container, diff --git a/tests/TestOAuth2.py b/tests/TestOAuth2.py index 41edaebbf7..d49d42f065 100644 --- a/tests/TestOAuth2.py +++ b/tests/TestOAuth2.py @@ -3,6 +3,7 @@ from datetime import datetime from unittest.mock import MagicMock, Mock, patch +from pytest import fixture from PyQt6.QtGui import QDesktopServices from PyQt6.QtNetwork import QNetworkReply @@ -59,6 +60,17 @@ NO_REFRESH_AUTH_RESPONSE = AuthenticationResponse( MALFORMED_AUTH_RESPONSE = AuthenticationResponse(success=False) +@fixture +def http_request_manager(): + mock_reply = Mock() # The user profile that the service should respond with. + mock_reply.error = Mock(return_value=QNetworkReply.NetworkError.NoError) + + http_mock = Mock() + http_mock.get = lambda url, headers_dict, callback, error_callback, timeout: callback(mock_reply) + http_mock.readJSON = Mock(return_value={"data": {"user_id": "id_ego_or_superego", "username": "Ghostkeeper"}}) + http_mock.setDelayRequests = Mock() + return http_mock + def test_cleanAuthService() -> None: """ Ensure that when setting up an AuthorizationService, no data is set. @@ -72,18 +84,20 @@ def test_cleanAuthService() -> None: assert authorization_service.getAccessToken() is None -def test_refreshAccessTokenSuccess(): +def test_refreshAccessTokenSuccess(http_request_manager): authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) authorization_service.initialize() with patch.object(AuthorizationService, "getUserProfile", return_value=UserProfile()): authorization_service._storeAuthData(SUCCESSFUL_AUTH_RESPONSE) authorization_service.onAuthStateChanged.emit = MagicMock() - with patch.object(AuthorizationHelpers, "getAccessTokenUsingRefreshToken", return_value=SUCCESSFUL_AUTH_RESPONSE): - authorization_service.refreshAccessToken() - assert authorization_service.onAuthStateChanged.emit.called_with(True) + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value=http_request_manager)): + with patch.object(AuthorizationService, "getUserProfile", return_value=UserProfile()): + with patch.object(AuthorizationHelpers, "getAccessTokenUsingRefreshToken", side_effect=lambda refresh_token, callback: callback(SUCCESSFUL_AUTH_RESPONSE)): + authorization_service.refreshAccessToken() + authorization_service.onAuthStateChanged.emit.assert_called_once_with(logged_in = True) -def test__parseJWTNoRefreshToken(): +def test__parseJWTNoRefreshToken(http_request_manager): """ Tests parsing the user profile if there is no refresh token stored, but there is a normal authentication token. @@ -94,13 +108,8 @@ def test__parseJWTNoRefreshToken(): authorization_service._storeAuthData(NO_REFRESH_AUTH_RESPONSE) mock_callback = Mock() # To log the final profile response. - mock_reply = Mock() # The user profile that the service should respond with. - mock_reply.error = Mock(return_value = QNetworkReply.NetworkError.NoError) - http_mock = Mock() - http_mock.get = lambda url, headers_dict, callback, error_callback, timeout: callback(mock_reply) - http_mock.readJSON = Mock(return_value = {"data": {"user_id": "id_ego_or_superego", "username": "Ghostkeeper"}}) - with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_mock)): + with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_request_manager)): authorization_service._parseJWT(mock_callback) mock_callback.assert_called_once() profile_reply = mock_callback.call_args_list[0][0][0] @@ -175,9 +184,10 @@ def test_refreshAccessTokenFailed(): """ authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) authorization_service.initialize() + with patch.object(AuthorizationService, "getUserProfile", return_value=UserProfile()): + authorization_service._storeAuthData(SUCCESSFUL_AUTH_RESPONSE) + authorization_service.onAuthStateChanged.emit = MagicMock() - def mock_refresh(self, refresh_token, callback): # Refreshing gives a valid token. - callback(FAILED_AUTH_RESPONSE) mock_reply = Mock() # The response that the request should give, containing an error about it failing to authenticate. mock_reply.error = Mock(return_value = QNetworkReply.NetworkError.AuthenticationRequiredError) # The reply is 403: Authentication required, meaning the server responded with a "Can't do that, Dave". http_mock = Mock() @@ -187,10 +197,9 @@ def test_refreshAccessTokenFailed(): with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.readJSON", Mock(return_value = {"error_description": "Mock a failed request!"})): with patch("UM.TaskManagement.HttpRequestManager.HttpRequestManager.getInstance", MagicMock(return_value = http_mock)): authorization_service._storeAuthData(SUCCESSFUL_AUTH_RESPONSE) - authorization_service.onAuthStateChanged.emit = MagicMock() - with patch("cura.OAuth2.AuthorizationHelpers.AuthorizationHelpers.getAccessTokenUsingRefreshToken", mock_refresh): + with patch("cura.OAuth2.AuthorizationHelpers.AuthorizationHelpers.getAccessTokenUsingRefreshToken", side_effect=lambda refresh_token, callback: callback(FAILED_AUTH_RESPONSE)): authorization_service.refreshAccessToken() - assert authorization_service.onAuthStateChanged.emit.called_with(False) + authorization_service.onAuthStateChanged.emit.assert_called_with(logged_in = False) def test_refreshAccesTokenWithoutData(): authorization_service = AuthorizationService(OAUTH_SETTINGS, Preferences()) From 906e4e6c424b3d8940b1aa6e83733235de26f051 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 09:50:16 +0200 Subject: [PATCH 031/166] Use common workflow for translation update --- .../workflows/requirements-conan-package.txt | 2 - .../workflows/requirements-printer-linter.txt | 1 - .github/workflows/requirements-runner.txt | 0 .github/workflows/update-translation.yml | 93 +++---------------- 4 files changed, 11 insertions(+), 85 deletions(-) delete mode 100644 .github/workflows/requirements-conan-package.txt delete mode 100644 .github/workflows/requirements-printer-linter.txt delete mode 100644 .github/workflows/requirements-runner.txt diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt deleted file mode 100644 index 215557e367..0000000000 --- a/.github/workflows/requirements-conan-package.txt +++ /dev/null @@ -1,2 +0,0 @@ -conan>=1.60.2,<2.0.0 -sip<=6.7.12 diff --git a/.github/workflows/requirements-printer-linter.txt b/.github/workflows/requirements-printer-linter.txt deleted file mode 100644 index 4818cc5419..0000000000 --- a/.github/workflows/requirements-printer-linter.txt +++ /dev/null @@ -1 +0,0 @@ -pyyaml \ No newline at end of file diff --git a/.github/workflows/requirements-runner.txt b/.github/workflows/requirements-runner.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/.github/workflows/update-translation.yml b/.github/workflows/update-translation.yml index 55ce144666..aa897e5e2c 100644 --- a/.github/workflows/update-translation.yml +++ b/.github/workflows/update-translation.yml @@ -1,87 +1,16 @@ -name: update-translations +name: Update translations on: - push: - paths: - - 'plugins/**' - - 'resources/**' - - 'cura/**' - - 'icons/**' - - 'tests/**' - - 'packaging/**' - - '.github/workflows/conan-*.yml' - - '.github/workflows/notify.yml' - - '.github/workflows/requirements-conan-package.txt' - - 'requirements*.txt' - - 'conanfile.py' - - 'conandata.yml' - - 'GitVersion.yml' - - '*.jinja' - branches: - - '[1-9].[0-9]' - - '[1-9].[0-9][0-9]' - tags: - - '[1-9].[0-9].[0-9]*' - - '[1-9].[0-9].[0-9]' - - '[1-9].[0-9][0-9].[0-9]*' + workflow_dispatch: + inputs: + branch: + description: 'Specific branch to update translations on' + required: false + type: string jobs: update-translations: - name: Update translations - - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Cache Conan data - id: cache-conan - uses: actions/cache@v3 - with: - path: ~/.conan - key: ${{ runner.os }}-conan - - - name: Setup Python and pip - uses: actions/setup-python@v4 - with: - python-version: 3.11.x - cache: pip - cache-dependency-path: .github/workflows/requirements-conan-package.txt - - - name: Install Python requirements for runner - run: pip install -r .github/workflows/requirements-conan-package.txt - - # NOTE: Due to what are probably github issues, we have to remove the cache and reconfigure before the rest. - # This is maybe because grub caches the disk it uses last time, which is recreated each time. - - name: Install Linux system requirements - if: ${{ runner.os == 'Linux' }} - run: | - sudo rm /var/cache/debconf/config.dat - sudo dpkg --configure -a - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt update - sudo apt upgrade - sudo apt install efibootmgr build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config flex bison g++-12 gcc-12 -y - - - name: Install GCC-13 - run: | - sudo apt install g++-13 gcc-13 -y - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13 - - - name: Create the default Conan profile - run: conan profile new default --detect --force - - - name: Get Conan configuration - run: | - conan config install https://github.com/Ultimaker/conan-config.git - conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - - - name: generate the files using Conan install - run: conan install . --build=missing --update -o cura:devtools=True - - - uses: stefanzweifel/git-auto-commit-action@v4 - with: - file_pattern: resources/i18n/*.po resources/i18n/*.pot - status_options: --untracked-files=no - commit_message: update translations +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@CURA-11622_conan_v2 + with: + branch: ${{ inputs.branch }} From 961862bb2b8161cb1fb22cf8e5e2a3f06c067514 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 11:16:35 +0200 Subject: [PATCH 032/166] Use uptodate linux installer workflow --- .github/workflows/installers.yml | 6 +++--- .github/workflows/linux.yml | 13 +++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 805f1917aa..134b2f5e89 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -10,7 +10,7 @@ on: required: true type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args, e.g. --requires' default: '' required: false type: string @@ -84,15 +84,15 @@ jobs: operating_system: self-hosted-Windows-X64 secrets: inherit +# FIXME: Use main once merged linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} conan_args: ${{ github.event.inputs.conan_args }} enterprise: ${{ github.event.inputs.enterprise == 'true' }} staging: ${{ github.event.inputs.staging == 'true' }} - architecture: X64 operating_system: self-hosted-Ubuntu22-X64 secrets: inherit diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f9d800c77d..6d428a8cc9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -10,7 +10,7 @@ on: required: true type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args, e.g. --requires' default: '' required: false type: string @@ -24,13 +24,6 @@ on: default: false required: true type: boolean - architecture: - description: 'Architecture' - required: true - default: 'X64' - type: choice - options: - - X64 operating_system: description: 'OS' required: true @@ -41,13 +34,13 @@ on: - self-hosted-Ubuntu22-X64 jobs: +# FIXME: Use main once merged linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} - architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} secrets: inherit From cee46ae1ea7a30b3f06b431d54161efb506b88db Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 12:58:35 +0200 Subject: [PATCH 033/166] Rename devtools option to pyinstaller --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index ee367a2c52..21d55d4d2c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -31,7 +31,7 @@ class CuraConan(ConanFile): options = { "enterprise": [True, False], "staging": [True, False], - "devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools + "pyinstaller": [True, False], "cloud_api_version": ["ANY"], "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles @@ -41,7 +41,7 @@ class CuraConan(ConanFile): default_options = { "enterprise": False, "staging": False, - "devtools": False, + "pyinstaller": False, "cloud_api_version": "1", "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented @@ -373,7 +373,7 @@ class CuraConan(ConanFile): cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) - if self.options.devtools: + if self.options.pyinstaller: entitlements_file = "'{}'".format(str(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements"))) self._generate_pyinstaller_spec( location=self.generators_folder, @@ -481,7 +481,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` del self.info.options.enterprise del self.info.options.staging - del self.info.options.devtools + del self.info.options.pyinstaller del self.info.options.cloud_api_version del self.info.options.display_name del self.info.options.cura_debug_mode From ab96236a8f16014706da86c3a5715b85fa784929 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Sep 2024 16:38:23 +0200 Subject: [PATCH 034/166] Fix pyinstaller data generation --- conandata.yml | 8 -------- conanfile.py | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/conandata.yml b/conandata.yml index 8d37d40bca..d1fd19af9f 100644 --- a/conandata.yml +++ b/conandata.yml @@ -86,14 +86,6 @@ pyinstaller: package: "fdm_materials" src: "res/resources/materials" dst: "share/cura/resources/materials" - tcl: - package: "tcl" - src: "lib/tcl8.6" - dst: "tcl" - tk: - package: "tk" - src: "lib/tk8.6" - dst: "tk" binaries: curaengine: package: "curaengine" diff --git a/conanfile.py b/conanfile.py index 21d55d4d2c..21a8c80843 100644 --- a/conanfile.py +++ b/conanfile.py @@ -199,14 +199,11 @@ class CuraConan(ConanFile): if "package" in data: # get the paths from conan package if data["package"] == self.name: - if self.in_local_cache: - src_path = str(Path(self.package_folder, data["src"])) - else: - src_path = str(Path(self.source_folder, data["src"])) + src_path = str(Path(self.source_folder, data["src"])) else: - if data["package"] not in self.deps_cpp_info.deps: + if data["package"] not in self.dependencies: continue - src_path = os.path.join(self.deps_cpp_info[data["package"]].rootpath, data["src"]) + src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) else: @@ -217,7 +214,7 @@ class CuraConan(ConanFile): binaries = [] for binary in pyinstaller_metadata["binaries"].values(): if "package" in binary: # get the paths from conan package - src_path = os.path.join(self.deps_cpp_info[binary["package"]].rootpath, binary["src"]) + src_path = os.path.join(self.dependencies[binary["package"]].package_folder, binary["src"]) elif "root" in binary: # get the paths relative from the sourcefolder src_path = str(Path(self.source_folder, binary["root"], binary["src"])) if self.settings.os == "Windows": From 863569b7dece3c7f77eaebe0532722ec40056da5 Mon Sep 17 00:00:00 2001 From: Dmitry Gribenchuk Date: Thu, 17 Oct 2024 11:24:48 +0300 Subject: [PATCH 035/166] small code-style fixes --- tests/TestBuildVolume.py | 1 - tests/TestConvexHullDecorator.py | 2 +- tests/TestCuraSceneController.py | 3 +-- tests/TestCuraSceneNode.py | 2 -- tests/TestLayer.py | 2 +- tests/TestObjectsModel.py | 1 - tests/TestPrintInformation.py | 2 +- tests/TestProfileRequirements.py | 6 +++--- 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/TestBuildVolume.py b/tests/TestBuildVolume.py index 5012784bdf..ece4b22d6f 100644 --- a/tests/TestBuildVolume.py +++ b/tests/TestBuildVolume.py @@ -424,4 +424,3 @@ class TestGetEdgeDisallowedSize: with patch("cura.Settings.ExtruderManager.ExtruderManager.getInstance"): with patch.dict(self.setting_property_dict, {"print_sequence": {"value": "one_at_a_time"}}): assert build_volume.getEdgeDisallowedSize() == 0.1 - diff --git a/tests/TestConvexHullDecorator.py b/tests/TestConvexHullDecorator.py index eed5a3a6c3..94bcd58f37 100644 --- a/tests/TestConvexHullDecorator.py +++ b/tests/TestConvexHullDecorator.py @@ -188,4 +188,4 @@ def test_compute2DConvexHullMeshDataGrouped(convex_hull_decorator): copied_decorator._global_stack = mocked_stack copied_decorator._getSettingProperty = MagicMock(return_value=0) node.addDecorator(copied_decorator) - assert convex_hull_decorator._compute2DConvexHull() == Polygon([[-5.0, 5.0], [5.0, 5.0], [5.0, -5.0], [-5.0, -5.0]]) \ No newline at end of file + assert convex_hull_decorator._compute2DConvexHull() == Polygon([[-5.0, 5.0], [5.0, 5.0], [5.0, -5.0], [-5.0, -5.0]]) diff --git a/tests/TestCuraSceneController.py b/tests/TestCuraSceneController.py index 634ce89d86..fe6f964593 100644 --- a/tests/TestCuraSceneController.py +++ b/tests/TestCuraSceneController.py @@ -75,5 +75,4 @@ def test_updateMaxBuildPlate(objects_model, multi_build_plate_model): # And check what happens if we move down again! controller._calcMaxBuildPlate = MagicMock(return_value=2) controller.updateMaxBuildPlate(SceneNode()) - assert controller._active_build_plate == 0 # We don't have any items anywhere, so default to 0 - + assert controller._active_build_plate == 0 # We don't have any items anywhere, so default to 0 diff --git a/tests/TestCuraSceneNode.py b/tests/TestCuraSceneNode.py index 9e2fcb1188..77f4051a99 100644 --- a/tests/TestCuraSceneNode.py +++ b/tests/TestCuraSceneNode.py @@ -53,5 +53,3 @@ class TestCollidesWithAreas: def test_outsideBuildArea(cura_scene_node): cura_scene_node.setOutsideBuildArea(True) assert cura_scene_node.isOutsideBuildArea - - diff --git a/tests/TestLayer.py b/tests/TestLayer.py index f8183437d6..602a0a5061 100644 --- a/tests/TestLayer.py +++ b/tests/TestLayer.py @@ -36,4 +36,4 @@ def test_elementCount(): layer_polygon.elementCount = 12 layer.polygons.append(layer_polygon) assert layer.build(0, 0, [], [], [], [], [] ,[] , []) == (9001, 9002) - assert layer.elementCount == 12 \ No newline at end of file + assert layer.elementCount == 12 diff --git a/tests/TestObjectsModel.py b/tests/TestObjectsModel.py index b34c32a95e..1bc0bf6ace 100644 --- a/tests/TestObjectsModel.py +++ b/tests/TestObjectsModel.py @@ -226,4 +226,3 @@ class Test_Update: "per_object_settings_count": 0, "mesh_type": "" }] - diff --git a/tests/TestPrintInformation.py b/tests/TestPrintInformation.py index bfebe4a528..4135782f0c 100644 --- a/tests/TestPrintInformation.py +++ b/tests/TestPrintInformation.py @@ -148,4 +148,4 @@ def test_defineAbbreviatedMachineName(): # Test not ultimaker printer, name suffix should have first letter from the printer name project_name = ["HelloWorld", ".3mf"] print_information.setProjectName(project_name[0] + project_name[1]) - assert printer_name[0] + "_" + project_name[0] == print_information._job_name \ No newline at end of file + assert printer_name[0] + "_" + project_name[0] == print_information._job_name diff --git a/tests/TestProfileRequirements.py b/tests/TestProfileRequirements.py index a88513ce24..c2114cba79 100644 --- a/tests/TestProfileRequirements.py +++ b/tests/TestProfileRequirements.py @@ -1,8 +1,8 @@ # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -import configparser #To read the profiles. -import os #To join paths. +import configparser # To read the profiles. +import os # To join paths. import pytest ## Makes sure that the variants for the Ultimaker 3 Extended are exactly the @@ -13,7 +13,7 @@ import pytest # needed, but until then we should keep them the same. It's happened all too # often that we updated the variants for the UM3 but forgot about the UM3E. @pytest.mark.parametrize("um3_file, um3e_file", [ - #List the corresponding files below. + # List the corresponding files below. ("ultimaker3_aa0.25.inst.cfg", "ultimaker3_extended_aa0.25.inst.cfg"), ("ultimaker3_aa0.8.inst.cfg", "ultimaker3_extended_aa0.8.inst.cfg"), ("ultimaker3_aa04.inst.cfg", "ultimaker3_extended_aa04.inst.cfg"), From 0991c3c01d2f685dd69eb0fadf51e42a2ffe0b12 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 11 Nov 2024 16:13:10 +0100 Subject: [PATCH 036/166] Loop back to the beginning when ending simulation playback CURA-12192 --- plugins/SimulationView/SimulationView.py | 13 +++++-------- .../SimulationView/SimulationViewMainComponent.qml | 4 +--- plugins/SimulationView/SimulationViewProxy.py | 6 +++--- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index b433321914..10861acfd0 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -222,12 +222,11 @@ class SimulationView(CuraView): self.setPath(i + fractional_value) - def advanceTime(self, time_increase: float) -> bool: + def advanceTime(self, time_increase: float) -> None: """ Advance the time by the given amount. :param time_increase: The amount of time to advance (in seconds). - :return: True if the time was advanced, False if the end of the simulation was reached. """ total_duration = 0.0 if len(self.cumulativeLineDuration()) > 0: @@ -237,15 +236,13 @@ class SimulationView(CuraView): # If we have reached the end of the simulation, go to the next layer. if self.getCurrentLayer() == self.getMaxLayers(): # If we are already at the last layer, go to the first layer. - self.setTime(total_duration) - return False - - # advance to the next layer, and reset the time - self.setLayer(self.getCurrentLayer() + 1) + self.setLayer(0) + else: + # advance to the next layer, and reset the time + self.setLayer(self.getCurrentLayer() + 1) self.setTime(0.0) else: self.setTime(self._current_time + time_increase) - return True def cumulativeLineDuration(self) -> List[float]: # Make sure _cumulative_line_duration is initialized properly diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index d9e7a95bc1..602d403a8a 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -144,9 +144,7 @@ Item { // divide by 1000 to account for ms to s conversion const advance_time = simulationTimer.interval / 1000.0; - if (!UM.SimulationView.advanceTime(advance_time)) { - playButton.pauseSimulation(); - } + UM.SimulationView.advanceTime(advance_time); // The status must be set here instead of in the resumeSimulation function otherwise it won't work // correctly, because part of the logic is in this trigger function. isSimulationPlaying = true; diff --git a/plugins/SimulationView/SimulationViewProxy.py b/plugins/SimulationView/SimulationViewProxy.py index bf449a99d1..30fed1422c 100644 --- a/plugins/SimulationView/SimulationViewProxy.py +++ b/plugins/SimulationView/SimulationViewProxy.py @@ -54,9 +54,9 @@ class SimulationViewProxy(QObject): def currentPath(self): return self._simulation_view.getCurrentPath() - @pyqtSlot(float, result=bool) - def advanceTime(self, duration: float) -> bool: - return self._simulation_view.advanceTime(duration) + @pyqtSlot(float) + def advanceTime(self, duration: float) -> None: + self._simulation_view.advanceTime(duration) @pyqtProperty(int, notify=currentPathChanged) def minimumPath(self): From 9a1e384f9ae293a217dbaa8d64adf1e753963ec3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 12 Nov 2024 15:45:57 +0100 Subject: [PATCH 037/166] Fix deploy step --- conanfile.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index 21a8c80843..e59dc1eb9c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -90,7 +90,7 @@ class CuraConan(ConanFile): @property def _base_dir(self): - return Path(self.source_folder, "venv") + return Path(self.source_folder if self.source_folder is not None else self.deploy_folder, "venv") @property def _share_dir(self): @@ -199,7 +199,7 @@ class CuraConan(ConanFile): if "package" in data: # get the paths from conan package if data["package"] == self.name: - src_path = str(Path(self.source_folder, data["src"])) + src_path = str(Path(self._base_dir, data["src"])) else: if data["package"] not in self.dependencies: continue @@ -216,7 +216,7 @@ class CuraConan(ConanFile): if "package" in binary: # get the paths from conan package src_path = os.path.join(self.dependencies[binary["package"]].package_folder, binary["src"]) elif "root" in binary: # get the paths relative from the sourcefolder - src_path = str(Path(self.source_folder, binary["root"], binary["src"])) + src_path = str(Path(self._base_dir, binary["root"], binary["src"])) if self.settings.os == "Windows": src_path = src_path.replace("\\", "\\\\") else: @@ -402,7 +402,7 @@ class CuraConan(ConanFile): self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def deploy(self): - copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]), os.path.join(self.install_folder, "packaging"), keep_path = True) + copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]), os.path.join(self.deploy_folder, "packaging"), keep_path = True) # Copy resources of Cura (keep folder structure) needed by pyinstaller to determine the module structure copy(self, "*", os.path.join(self.package_folder, self.cpp_info.bindirs[0]), str(self._base_dir), keep_path = False) @@ -445,8 +445,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV self._generate_cura_version(os.path.join(self._site_packages, "cura")) - entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements")) - self._generate_pyinstaller_spec(location = self._base_dir, + entitlements_file = "'{}'".format(Path(self.deploy_folder, "packaging", "MacOS", "cura.entitlements")) + self._generate_pyinstaller_spec(location = self.deploy_folder, entrypoint_location = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.bindirs[0], self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") From 440b51c189fe77f2ea39159f6c4379f3da1ce4b0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 09:20:21 +0100 Subject: [PATCH 038/166] Add debug information to try and fix build --- conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conanfile.py b/conanfile.py index e59dc1eb9c..4c6346454b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -203,6 +203,7 @@ class CuraConan(ConanFile): else: if data["package"] not in self.dependencies: continue + print(data["package"], dir(self.dependencies[data["package"]])) src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) From b78143546c911ba3408d3ad94cb1ee349fc47dc4 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 10:25:04 +0100 Subject: [PATCH 039/166] Add more debug printed information --- conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 4c6346454b..d81eae4075 100644 --- a/conanfile.py +++ b/conanfile.py @@ -203,7 +203,10 @@ class CuraConan(ConanFile): else: if data["package"] not in self.dependencies: continue - print(data["package"], dir(self.dependencies[data["package"]])) + print("#########################################", data["package"]) + print(dir(self.dependencies[data["package"]])) + for attr in dir(self.dependencies[data["package"]]): + print(attr, self.dependencies[data["package"]].__getattribute__(attr)) src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) From 1e9eeb8ac5d7def789407770798574203124b753 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 13:27:21 +0100 Subject: [PATCH 040/166] Change cura_resources package type --- resources/conanfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/conanfile.py b/resources/conanfile.py index 666b5719e8..4f2e9af467 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -15,9 +15,8 @@ class CuraResource(ConanFile): url = "https://github.com/Ultimaker/cura" description = "Cura Resources" topics = ("conan", "cura") - settings = "os", "compiler", "build_type", "arch" no_copy_source = True - package_type = "header-library" + package_type = "shared-library" @property def _shared_resources(self): From 85644b621e77130f1c2ec22d3d55f9eee64b3920 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 13:33:15 +0100 Subject: [PATCH 041/166] Remove debug print --- conanfile.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index d81eae4075..e59dc1eb9c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -203,10 +203,6 @@ class CuraConan(ConanFile): else: if data["package"] not in self.dependencies: continue - print("#########################################", data["package"]) - print(dir(self.dependencies[data["package"]])) - for attr in dir(self.dependencies[data["package"]]): - print(attr, self.dependencies[data["package"]].__getattribute__(attr)) src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) From 4fedf332a09162829cdd8e4f472f631c473e5347 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 13 Nov 2024 16:22:03 +0100 Subject: [PATCH 042/166] Raise exceptions on critical errors --- conandata.yml | 12 ++++++------ conanfile.py | 15 +++++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/conandata.yml b/conandata.yml index d1fd19af9f..77b6469f78 100644 --- a/conandata.yml +++ b/conandata.yml @@ -38,13 +38,13 @@ pyinstaller: src: "plugins" dst: "share/cura/plugins" native_cad_plugin: - package: "native_cad_plugin" - src: "res/plugins/NativeCADplugin" - dst: "share/cura/plugins/NativeCADplugin" + package: "native_cad_plugin" + src: "res/plugins/NativeCADplugin" + dst: "share/cura/plugins/NativeCADplugin" native_cad_plugin_bundled: - package: "native_cad_plugin" - src: "res/bundled_packages" - dst: "share/cura/resources/bundled_packages" + package: "native_cad_plugin" + src: "res/bundled_packages" + dst: "share/cura/resources/bundled_packages" cura_resources: package: "cura" src: "resources" diff --git a/conanfile.py b/conanfile.py index e59dc1eb9c..b1280385b3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -207,9 +207,12 @@ class CuraConan(ConanFile): elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) else: - continue - if Path(src_path).exists(): - datas.append((str(src_path), data["dst"])) + raise ConanException("Misformatted conan data for pyinstaller datas, expected either package or root option") + + if not Path(src_path).exists(): + raise ConanException(f"Missing folder {src_path} for pyinstaller data {data}") + + datas.append((str(src_path), data["dst"])) binaries = [] for binary in pyinstaller_metadata["binaries"].values(): @@ -220,10 +223,10 @@ class CuraConan(ConanFile): if self.settings.os == "Windows": src_path = src_path.replace("\\", "\\\\") else: - continue + raise ConanException("Misformatted conan data for pyinstaller binaries, expected either package or root option") + if not Path(src_path).exists(): - self.output.warning(f"Source path for binary {binary['binary']} does not exist") - continue + raise ConanException(f"Missing folder {src_path} for pyinstaller binary {binary}") for bin in Path(src_path).glob(binary["binary"] + "*[.exe|.dll|.so|.dylib|.so.]*"): binaries.append((str(bin), binary["dst"])) From f02481cd1c19c040d30b384dc8b5454a74cee994 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 13 Nov 2024 16:39:57 +0100 Subject: [PATCH 043/166] Start moving installer code to Conan-v2 for Windows too. CURA-11622 --- .github/workflows/windows.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 704aa4ddde..2ff8dffe91 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,7 +10,7 @@ on: required: true type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args: eq.: --requires' default: '' required: false type: string @@ -24,13 +24,6 @@ on: default: false required: true type: boolean - architecture: - description: 'Architecture' - required: true - default: 'X64' - type: choice - options: - - X64 operating_system: description: 'OS' required: true @@ -42,12 +35,12 @@ on: jobs: windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main + # FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} - architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} secrets: inherit From bec1ff12436699f588daa4784efbb39923dd4990 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 13:59:27 +0100 Subject: [PATCH 044/166] Fix pyinstaller resources deployment --- conandata.yml | 2 ++ conanfile.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 77b6469f78..9b0517a744 100644 --- a/conandata.yml +++ b/conandata.yml @@ -82,6 +82,8 @@ pyinstaller: package: "cura_binary_data" src: "windows" dst: "share/windows" + oses: + - "Windows" fdm_materials: package: "fdm_materials" src: "res/resources/materials" diff --git a/conanfile.py b/conanfile.py index b1280385b3..04782345b6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -197,9 +197,12 @@ class CuraConan(ConanFile): if not self.options.internal and data.get("internal", False): continue + if "oses" in data and self.settings.os not in data["oses"]: + continue + if "package" in data: # get the paths from conan package if data["package"] == self.name: - src_path = str(Path(self._base_dir, data["src"])) + src_path = str(Path(self.source_folder, data["src"])) else: if data["package"] not in self.dependencies: continue @@ -219,7 +222,7 @@ class CuraConan(ConanFile): if "package" in binary: # get the paths from conan package src_path = os.path.join(self.dependencies[binary["package"]].package_folder, binary["src"]) elif "root" in binary: # get the paths relative from the sourcefolder - src_path = str(Path(self._base_dir, binary["root"], binary["src"])) + src_path = str(Path(self.source_folder, binary["root"], binary["src"])) if self.settings.os == "Windows": src_path = src_path.replace("\\", "\\\\") else: From 8bd69ecc3dd9e52149b5f24cbdc167bb0be65c3e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 14:29:07 +0100 Subject: [PATCH 045/166] Store versions script in deploy folder --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 04782345b6..cacb97c7e1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -447,7 +447,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV env_prefix = env_prefix) ext = ".sh" if self.settings.os != "Windows" else ".ps1" - save(self, os.path.join(self._script_dir, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) + save(self, os.path.join(self.deploy_folder, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) self._generate_cura_version(os.path.join(self._site_packages, "cura")) From 85cd1422666b9cde72cdf6dfed1dab153bf76b44 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 14:55:28 +0100 Subject: [PATCH 046/166] Add explicit errors on missing package information --- conanfile.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index cacb97c7e1..901c502603 100644 --- a/conanfile.py +++ b/conanfile.py @@ -205,7 +205,12 @@ class CuraConan(ConanFile): src_path = str(Path(self.source_folder, data["src"])) else: if data["package"] not in self.dependencies: - continue + raise ConanException(f"Required package {data["package"]} does not exist as a dependency") + + package_folder = self.dependencies[data["package"]].package_folder + if package_folder is None: + raise ConanException(f"Unable to find package_folder for {data["package"]}, check that it has not been skipped") + src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder src_path = os.path.join(self.install_folder, data["root"], data["src"]) From 3910ab0b78bb20eaf71d762fe3a87218aea95eaf Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 15:04:39 +0100 Subject: [PATCH 047/166] Do not include enterprise resources if not needed --- conandata.yml | 2 ++ conanfile.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 9b0517a744..be238bd4c0 100644 --- a/conandata.yml +++ b/conandata.yml @@ -41,10 +41,12 @@ pyinstaller: package: "native_cad_plugin" src: "res/plugins/NativeCADplugin" dst: "share/cura/plugins/NativeCADplugin" + enterprise_only: true native_cad_plugin_bundled: package: "native_cad_plugin" src: "res/bundled_packages" dst: "share/cura/resources/bundled_packages" + enterprise_only: true cura_resources: package: "cura" src: "resources" diff --git a/conanfile.py b/conanfile.py index 901c502603..edf755ae43 100644 --- a/conanfile.py +++ b/conanfile.py @@ -194,7 +194,7 @@ class CuraConan(ConanFile): pyinstaller_metadata = self.conan_data["pyinstaller"] datas = [] for data in pyinstaller_metadata["datas"].values(): - if not self.options.internal and data.get("internal", False): + if (not self.options.internal and data.get("internal", False)) or (not self.options.enterprise and data.get("enterprise_only", False)): continue if "oses" in data and self.settings.os not in data["oses"]: From f50676a18cb60c7cc970cf95fedbd1bd1a7d4b81 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 15:46:54 +0100 Subject: [PATCH 048/166] Fix pyinstaller file generation in some cases --- conanfile.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index edf755ae43..639343db9a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -190,7 +190,7 @@ class CuraConan(ConanFile): python_installs=self._python_installs(), )) - def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): + def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file, cura_source_folder): pyinstaller_metadata = self.conan_data["pyinstaller"] datas = [] for data in pyinstaller_metadata["datas"].values(): @@ -202,7 +202,7 @@ class CuraConan(ConanFile): if "package" in data: # get the paths from conan package if data["package"] == self.name: - src_path = str(Path(self.source_folder, data["src"])) + src_path = str(Path(cura_source_folder, data["src"])) else: if data["package"] not in self.dependencies: raise ConanException(f"Required package {data["package"]} does not exist as a dependency") @@ -391,7 +391,8 @@ class CuraConan(ConanFile): icon_path="'{}'".format(os.path.join(self.source_folder, "packaging", self.conan_data["pyinstaller"]["icon"][ str(self.settings.os)])).replace("\\", "\\\\"), - entitlements_file=entitlements_file if self.settings.os == "Macos" else "None" + entitlements_file=entitlements_file if self.settings.os == "Macos" else "None", + cura_source_folder=self.source_folder ) if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]: @@ -460,7 +461,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV self._generate_pyinstaller_spec(location = self.deploy_folder, entrypoint_location = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.bindirs[0], self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), - entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") + entitlements_file = entitlements_file if self.settings.os == "Macos" else "None", + cura_source_folder = self.package_folder) def package(self): copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0])) From cd48c7cb9db1f9a00897b604ba0e4097ded26e69 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 11:33:42 +0100 Subject: [PATCH 049/166] Add debug information for python dependencies generation --- conanfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conanfile.py b/conanfile.py index 639343db9a..f0d3fb4c7b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -154,11 +154,13 @@ class CuraConan(ConanFile): env = "conanrun", stdout = buffer) + print(f"############################################################ {buffer.getvalue()}") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: name, version = package.split(",") python_installs[name] = {"version": version} + print(python_installs) return python_installs def _generate_cura_version(self, location): @@ -173,6 +175,8 @@ class CuraConan(ConanFile): internal_tag = f"+internal" if self.options.internal else "" cura_version = f"{cura_version.major}.{cura_version.minor}.{cura_version.patch}{pre_tag}{build_tag}{internal_tag}" + self.output.info(f"Write CuraVersion.py to {self.recipe_folder}") + with open(os.path.join(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( cura_app_name = self.name, From 0e363202ed725f43e6817f01a92c04f64bdbb709 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 11:39:01 +0100 Subject: [PATCH 050/166] Remove specific PYTHONPATH --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index f0d3fb4c7b..c1ff14f01d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -143,7 +143,7 @@ class CuraConan(ConanFile): # list of python installs run_env = VirtualRunEnv(self) env = run_env.environment() - env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) + #env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) venv_vars = env.vars(self, scope = "run") outer = '"' if self.settings.os == "Windows" else "'" From 35e52efcfa6205d566806d356eadb69cd2103e6a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 11:55:43 +0100 Subject: [PATCH 051/166] Change environment to gater Python dependencies --- conanfile.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/conanfile.py b/conanfile.py index c1ff14f01d..e69c5f1e74 100644 --- a/conanfile.py +++ b/conanfile.py @@ -141,20 +141,22 @@ class CuraConan(ConanFile): python_installs = {} # list of python installs - run_env = VirtualRunEnv(self) - env = run_env.environment() + # run_env = VirtualRunEnv(self) + # env = run_env.environment() #env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) - venv_vars = env.vars(self, scope = "run") + # venv_vars = env.vars(self, scope = "run") outer = '"' if self.settings.os == "Windows" else "'" inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() - with venv_vars.apply(): - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "conanrun", - stdout = buffer) + # with venv_vars.apply(): + self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", + env = "run", + stdout = buffer) print(f"############################################################ {buffer.getvalue()}") + # for name, value in venv_vars.items(): + # print(f"{name}={value}") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: name, version = package.split(",") From ebe701899d1066780b71024b122e5ae94ec136d5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 12:06:53 +0100 Subject: [PATCH 052/166] Use Python virtual env to get dependencies --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index e69c5f1e74..facff0e647 100644 --- a/conanfile.py +++ b/conanfile.py @@ -151,7 +151,7 @@ class CuraConan(ConanFile): buffer = StringIO() # with venv_vars.apply(): self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "run", + env = "virtual_python_env", stdout = buffer) print(f"############################################################ {buffer.getvalue()}") From 806fedef618fb9af778cb0586f03f2d56b7ec71f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 12:15:41 +0100 Subject: [PATCH 053/166] An other desperate attempt to get the proper env --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index facff0e647..237da96a19 100644 --- a/conanfile.py +++ b/conanfile.py @@ -151,7 +151,7 @@ class CuraConan(ConanFile): buffer = StringIO() # with venv_vars.apply(): self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "virtual_python_env", + env = ["conanrun", "virtual_python_env"], stdout = buffer) print(f"############################################################ {buffer.getvalue()}") From 656573e905efa0483239de44239dad19d60ffc67 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 14:12:30 +0100 Subject: [PATCH 054/166] User proper environment to get dependencies list --- conanfile.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/conanfile.py b/conanfile.py index 237da96a19..47ca471e2b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -88,9 +88,13 @@ class CuraConan(ConanFile): return "staging" return "default" + @property + def _root_dir(self): + return Path(self.deploy_folder if hasattr(self, "deploy_folder") else self.source_folder) + @property def _base_dir(self): - return Path(self.source_folder if self.source_folder is not None else self.deploy_folder, "venv") + return self._root_dir.joinpath("venv") @property def _share_dir(self): @@ -140,23 +144,14 @@ class CuraConan(ConanFile): self.output.info("Collecting python installs") python_installs = {} - # list of python installs - # run_env = VirtualRunEnv(self) - # env = run_env.environment() - #env.prepend_path("PYTHONPATH", str(self._site_packages.as_posix())) - # venv_vars = env.vars(self, scope = "run") - outer = '"' if self.settings.os == "Windows" else "'" inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() - # with venv_vars.apply(): - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = ["conanrun", "virtual_python_env"], + env_path = str(self._root_dir.joinpath("conanrun")) + self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", + env = env_path, stdout = buffer) - print(f"############################################################ {buffer.getvalue()}") - # for name, value in venv_vars.items(): - # print(f"{name}={value}") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: name, version = package.split(",") From fc8581709525802dc441ceff639b026ab1fd6922 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 15 Nov 2024 15:28:43 +0100 Subject: [PATCH 055/166] Change the way we get Python installs --- CuraVersion.py.jinja | 3 ++- conanfile.py | 21 --------------------- cura/__init__.py | 4 ++++ 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 515293b8af..2f0de1872c 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -1,6 +1,8 @@ # Copyright (c) 2023 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. +import importlib.metadata + CuraAppName = "{{ cura_app_name }}" CuraAppDisplayName = "{{ cura_app_display_name }}" CuraVersion = "{{ cura_version }}" @@ -14,4 +16,3 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}" CuraLatestURL = "{{ cura_latest_url }}" ConanInstalls = {{ conan_installs }} -PythonInstalls = {{ python_installs }} diff --git a/conanfile.py b/conanfile.py index 47ca471e2b..a4b6dd3d10 100644 --- a/conanfile.py +++ b/conanfile.py @@ -140,26 +140,6 @@ class CuraConan(ConanFile): } return conan_installs - def _python_installs(self): - self.output.info("Collecting python installs") - python_installs = {} - - outer = '"' if self.settings.os == "Windows" else "'" - inner = "'" if self.settings.os == "Windows" else '"' - buffer = StringIO() - env_path = str(self._root_dir.joinpath("conanrun")) - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = env_path, - stdout = buffer) - - packages = str(buffer.getvalue()).strip('\r\n').split(";") - for package in packages: - name, version = package.split(",") - python_installs[name] = {"version": version} - - print(python_installs) - return python_installs - def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -188,7 +168,6 @@ class CuraConan(ConanFile): cura_digital_factory_url = self.conan_data["urls"][self._urls]["digital_factory_url"], cura_latest_url=self.conan_data["urls"][self._urls]["cura_latest_url"], conan_installs=self._conan_installs(), - python_installs=self._python_installs(), )) def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file, cura_source_folder): diff --git a/cura/__init__.py b/cura/__init__.py index e69de29bb2..d4ff0f2a6d 100644 --- a/cura/__init__.py +++ b/cura/__init__.py @@ -0,0 +1,4 @@ +import importlib.metadata +from . import CuraVersion + +CuraVersion.PythonInstalls = {package.metadata['Name']: {'version': package.metadata['Version']} for package in importlib.metadata.distributions()} From 6a7cfca0a58a3df3cdecf0bf17ca510d4109c885 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 18 Nov 2024 13:58:19 +0100 Subject: [PATCH 056/166] Revert "Change the way we get Python installs" This reverts commit fc8581709525802dc441ceff639b026ab1fd6922. --- CuraVersion.py.jinja | 3 +-- conanfile.py | 21 +++++++++++++++++++++ cura/__init__.py | 4 ---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 2f0de1872c..515293b8af 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -1,8 +1,6 @@ # Copyright (c) 2023 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. -import importlib.metadata - CuraAppName = "{{ cura_app_name }}" CuraAppDisplayName = "{{ cura_app_display_name }}" CuraVersion = "{{ cura_version }}" @@ -16,3 +14,4 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}" CuraLatestURL = "{{ cura_latest_url }}" ConanInstalls = {{ conan_installs }} +PythonInstalls = {{ python_installs }} diff --git a/conanfile.py b/conanfile.py index a4b6dd3d10..47ca471e2b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -140,6 +140,26 @@ class CuraConan(ConanFile): } return conan_installs + def _python_installs(self): + self.output.info("Collecting python installs") + python_installs = {} + + outer = '"' if self.settings.os == "Windows" else "'" + inner = "'" if self.settings.os == "Windows" else '"' + buffer = StringIO() + env_path = str(self._root_dir.joinpath("conanrun")) + self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", + env = env_path, + stdout = buffer) + + packages = str(buffer.getvalue()).strip('\r\n').split(";") + for package in packages: + name, version = package.split(",") + python_installs[name] = {"version": version} + + print(python_installs) + return python_installs + def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -168,6 +188,7 @@ class CuraConan(ConanFile): cura_digital_factory_url = self.conan_data["urls"][self._urls]["digital_factory_url"], cura_latest_url=self.conan_data["urls"][self._urls]["cura_latest_url"], conan_installs=self._conan_installs(), + python_installs=self._python_installs(), )) def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file, cura_source_folder): diff --git a/cura/__init__.py b/cura/__init__.py index d4ff0f2a6d..e69de29bb2 100644 --- a/cura/__init__.py +++ b/cura/__init__.py @@ -1,4 +0,0 @@ -import importlib.metadata -from . import CuraVersion - -CuraVersion.PythonInstalls = {package.metadata['Name']: {'version': package.metadata['Version']} for package in importlib.metadata.distributions()} From e044d941440843f1cc2102c39dcef69b54b970c0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 18 Nov 2024 14:04:22 +0100 Subject: [PATCH 057/166] Use virtual env for dependencies --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 47ca471e2b..322c79ab25 100644 --- a/conanfile.py +++ b/conanfile.py @@ -147,7 +147,7 @@ class CuraConan(ConanFile): outer = '"' if self.settings.os == "Windows" else "'" inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() - env_path = str(self._root_dir.joinpath("conanrun")) + env_path = str(self._root_dir.joinpath("virtual_python_env")) self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", env = env_path, stdout = buffer) From 23b896251fd1409c08c7bb6f89c978ac8093d46d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 19 Nov 2024 09:22:51 +0100 Subject: [PATCH 058/166] Split dev and installer requirements --- conandata.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index be238bd4c0..8599b20145 100644 --- a/conandata.yml +++ b/conandata.yml @@ -632,12 +632,14 @@ pip_requirements: pip_requirements_dev: - pytest - - pyinstaller==6.3.0 - - pyinstaller-hooks-contrib - pyyaml - sip==6.5.1 - jinja2 +pip_requirements_installer: + - pyinstaller==6.3.0 + - pyinstaller-hooks-contrib + python_translation_source_folders: - cura - plugins From 5e204ab24202fee7e909b7e6caf27398ef4d18d3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 19 Nov 2024 09:23:09 +0100 Subject: [PATCH 059/166] Use virtual python env to get dependencies --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 322c79ab25..d0addf7188 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,6 +24,7 @@ class CuraConan(ConanFile): build_policy = "missing" exports = "LICENSE*", "*.jinja" settings = "os", "compiler", "build_type", "arch" + generators = "VirtualPythonEnv" # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" @@ -147,9 +148,8 @@ class CuraConan(ConanFile): outer = '"' if self.settings.os == "Windows" else "'" inner = "'" if self.settings.os == "Windows" else '"' buffer = StringIO() - env_path = str(self._root_dir.joinpath("virtual_python_env")) self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = env_path, + env = "virtual_python_env", stdout = buffer) packages = str(buffer.getvalue()).strip('\r\n').split(";") From 43a3db9c5d8fc752291b8634bb3043a1719f1ee5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 20 Nov 2024 21:36:43 +0100 Subject: [PATCH 060/166] Remove build steps from Conan recipe --- .github/workflows/conan-package.yml | 2 - CuraVersion.py.jinja | 1 + conandata.yml | 18 ++--- conanfile.py | 100 ++++++++++++---------------- 4 files changed, 53 insertions(+), 68 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 65e467f4c3..6f19078895 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -38,6 +38,4 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: package_name: cura - platform_windows: false - platform_mac: false secrets: inherit diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 515293b8af..0a3b0241eb 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -4,6 +4,7 @@ CuraAppName = "{{ cura_app_name }}" CuraAppDisplayName = "{{ cura_app_display_name }}" CuraVersion = "{{ cura_version }}" +CuraVersionFull = "{{ cura_version_full }}" CuraBuildType = "{{ cura_build_type }}" CuraDebugMode = {{ cura_debug_mode }} CuraCloudAPIRoot = "{{ cura_cloud_api_root }}" diff --git a/conandata.yml b/conandata.yml index 8599b20145..12c70f8455 100644 --- a/conandata.yml +++ b/conandata.yml @@ -244,8 +244,8 @@ pycharm_targets: name: pytest in TestSettingVisibilityPresets.py script_name: tests/Settings/TestSettingVisibilityPresets.py -pip_requirements: - any: +pip_requirements_core: + any_os: libCharon: url: "git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon" PyQt6-NetworkAuth: @@ -631,14 +631,16 @@ pip_requirements: - sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 pip_requirements_dev: - - pytest - - pyyaml - - sip==6.5.1 - - jinja2 + any_os: + pytest: {} + pyyaml: {} + sip: { version: "6.5.1" } + jinja2: {} pip_requirements_installer: - - pyinstaller==6.3.0 - - pyinstaller-hooks-contrib + any_os: + pyinstaller: { version: "6.3.0" } + pyinstaller-hooks-contrib: {} python_translation_source_folders: - cura diff --git a/conanfile.py b/conanfile.py index d0addf7188..b16e72a4e1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,7 +24,7 @@ class CuraConan(ConanFile): build_policy = "missing" exports = "LICENSE*", "*.jinja" settings = "os", "compiler", "build_type", "arch" - generators = "VirtualPythonEnv" + generators = "VirtualPythonEnv"#, "VirtualRunEnv" # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" @@ -61,21 +61,21 @@ class CuraConan(ConanFile): # FIXME: These env vars should be defined in the runenv. _cura_env = None - @property - def _cura_run_env(self): - if self._cura_env: - return self._cura_env - - self._cura_env = Environment() - self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) - self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) - self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) - - if self.settings.os == "Linux": - self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") - self._cura_env.define("QT_QPA_PLATFORMTHEME", "xdgdesktopportal") - self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") - return self._cura_env + # @property + # def _cura_run_env(self): + # if self._cura_env: + # return self._cura_env + # + # self._cura_env = Environment() + # self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) + # self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) + # self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) + # + # if self.settings.os == "Linux": + # self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") + # self._cura_env.define("QT_QPA_PLATFORMTHEME", "xdgdesktopportal") + # self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") + # return self._cura_env @property def _app_name(self): @@ -160,6 +160,23 @@ class CuraConan(ConanFile): print(python_installs) return python_installs + # def _generate_version_summary(self): + # version = self.conf.get("user.cura:version", default = self.version, check_type = str) + # cura_version = Version(version) + # + # version_data = { + # "version_major": cura_version.major, + # "version_minor": cura_version.minor, + # "version_patch": cura_version.patch, + # "version_build": cura_version.build if cura_version.build != "" else "0", + # "version_full": self.version, + # "cura_app_name": self._app_name, + # } + # + # file_path = os.path.join(os.getcwd(), 'version_summary.yml') + # self.output.info(f"Generating version summary to {file_path}") + # save(self, file_path, activate_github_actions_version_env) + def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -179,6 +196,7 @@ class CuraConan(ConanFile): cura_app_name = self.name, cura_app_display_name = self._app_name, cura_version = cura_version, + cura_version_full = self.version, cura_build_type = "Enterprise" if self.options.enterprise else "", cura_debug_mode = self.options.cura_debug_mode, cura_cloud_api_root = self.conan_data["urls"][self._urls]["cloud_api_root"], @@ -294,9 +312,6 @@ class CuraConan(ConanFile): copy(self, "*", os.path.join(self.recipe_folder, "cura"), os.path.join(self.export_sources_folder, "cura"), excludes="CuraVersion.py") copy(self, "*", os.path.join(self.recipe_folder, "packaging"), os.path.join(self.export_sources_folder, "packaging")) copy(self, "*", os.path.join(self.recipe_folder, ".run_templates"), os.path.join(self.export_sources_folder, ".run_templates")) - copy(self, "requirements.txt", self.recipe_folder, self.export_sources_folder) - copy(self, "requirements-dev.txt", self.recipe_folder, self.export_sources_folder) - copy(self, "requirements-ultimaker.txt", self.recipe_folder, self.export_sources_folder) copy(self, "cura_app.py", self.recipe_folder, self.export_sources_folder) def config_options(self): @@ -327,8 +342,8 @@ class CuraConan(ConanFile): def layout(self): self.folders.source = "." - self.folders.build = "venv" - self.folders.generators = os.path.join(self.folders.build, "conan") + self.folders.build = "build" + self.folders.generators = os.path.join(self.folders.build, "generators") self.cpp.package.libdirs = [os.path.join("site-packages", "cura")] self.cpp.package.bindirs = ["bin"] @@ -336,12 +351,12 @@ class CuraConan(ConanFile): def generate(self): copy(self, "cura_app.py", self.source_folder, str(self._script_dir)) - cura_run_envvars = self._cura_run_env.vars(self, scope = "run") - ext = ".ps1" if self.settings.os == "Windows" else ".sh" - cura_run_envvars.save_script(os.path.join(self.folders.generators, f"cura_run_environment{ext}")) + # cura_run_envvars = self._cura_run_env.vars(self, scope = "run") + # ext = ".ps1" if self.settings.os == "Windows" else ".sh" + # cura_run_envvars.save_script(os.path.join(self.folders.generators, f"cura_run_environment{ext}")) - vr = VirtualRunEnv(self) - vr.generate() + # vr = VirtualRunEnv(self) + # vr.generate() self._generate_cura_version(str(Path(self.source_folder, "cura"))) @@ -435,29 +450,6 @@ class CuraConan(ConanFile): copy(self, "*", uranium.resdirs[1], str(self._share_dir.joinpath("uranium", "plugins")), keep_path = True) copy(self, "*", uranium.libdirs[0], str(self._site_packages.joinpath("UM")), keep_path = True) - # Generate the GitHub Action version info Environment - version = self.conf.get("user.cura:version", default = self.version, check_type = str) - cura_version = Version(version) - env_prefix = "Env:" if self.settings.os == "Windows" else "" - activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV - """).render(cura_version_major = cura_version.major, - cura_version_minor = cura_version.minor, - cura_version_patch = cura_version.patch, - cura_version_build = cura_version.build if cura_version.build != "" else "0", - cura_version_full = self.version, - cura_app_name = self._app_name, - env_prefix = env_prefix) - - ext = ".sh" if self.settings.os != "Windows" else ".ps1" - save(self, os.path.join(self.deploy_folder, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) - - self._generate_cura_version(os.path.join(self._site_packages, "cura")) - entitlements_file = "'{}'".format(Path(self.deploy_folder, "packaging", "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self.deploy_folder, entrypoint_location = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.bindirs[0], self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), @@ -471,8 +463,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV copy(self, "*", src = os.path.join(self.source_folder, "resources"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[0])) copy(self, "*.mo", os.path.join(self.build_folder, "resources"), os.path.join(self.package_folder, "resources")) copy(self, "*", src = os.path.join(self.source_folder, "plugins"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[1])) - copy(self, "requirement*.txt", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.resdirs[-1])) copy(self, "*", src = os.path.join(self.source_folder, "packaging"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[2])) + copy(self, "pip_requirements_*.txt", src = self.generators_folder, dst = os.path.join(self.package_folder, self.cpp.package.resdirs[-1])) # Remove the fdm_materials from the package rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], "materials")) @@ -488,12 +480,4 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV self.runenv_info.append_path("PYTHONPATH", os.path.join(self.package_folder, "plugins")) def package_id(self): - # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py - # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` - del self.info.options.enterprise - del self.info.options.staging - del self.info.options.pyinstaller - del self.info.options.cloud_api_version - del self.info.options.display_name - del self.info.options.cura_debug_mode self.info.options.rm_safe("enable_i18n") From f2343e98ce95e900b14477c21e8859416ad5c999 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 21 Nov 2024 10:50:28 +0100 Subject: [PATCH 061/166] Remove dead code --- CuraVersion.py.jinja | 1 + conanfile.py | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 0a3b0241eb..76a75b4e3a 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -15,4 +15,5 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}" CuraLatestURL = "{{ cura_latest_url }}" ConanInstalls = {{ conan_installs }} + PythonInstalls = {{ python_installs }} diff --git a/conanfile.py b/conanfile.py index b16e72a4e1..7d9e910f9a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -58,25 +58,6 @@ class CuraConan(ConanFile): def _i18n_options(self): return self.conf.get("user.i18n:options", default = {"extract": True, "build": True}, check_type = dict) - # FIXME: These env vars should be defined in the runenv. - _cura_env = None - - # @property - # def _cura_run_env(self): - # if self._cura_env: - # return self._cura_env - # - # self._cura_env = Environment() - # self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml"))) - # self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins"))) - # self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura"))) - # - # if self.settings.os == "Linux": - # self._cura_env.define("QT_QPA_FONTDIR", "/usr/share/fonts") - # self._cura_env.define("QT_QPA_PLATFORMTHEME", "xdgdesktopportal") - # self._cura_env.define("QT_XKB_CONFIG_ROOT", "/usr/share/X11/xkb") - # return self._cura_env - @property def _app_name(self): if self.options.enterprise: @@ -160,23 +141,6 @@ class CuraConan(ConanFile): print(python_installs) return python_installs - # def _generate_version_summary(self): - # version = self.conf.get("user.cura:version", default = self.version, check_type = str) - # cura_version = Version(version) - # - # version_data = { - # "version_major": cura_version.major, - # "version_minor": cura_version.minor, - # "version_patch": cura_version.patch, - # "version_build": cura_version.build if cura_version.build != "" else "0", - # "version_full": self.version, - # "cura_app_name": self._app_name, - # } - # - # file_path = os.path.join(os.getcwd(), 'version_summary.yml') - # self.output.info(f"Generating version summary to {file_path}") - # save(self, file_path, activate_github_actions_version_env) - def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -351,12 +315,6 @@ class CuraConan(ConanFile): def generate(self): copy(self, "cura_app.py", self.source_folder, str(self._script_dir)) - # cura_run_envvars = self._cura_run_env.vars(self, scope = "run") - # ext = ".ps1" if self.settings.os == "Windows" else ".sh" - # cura_run_envvars.save_script(os.path.join(self.folders.generators, f"cura_run_environment{ext}")) - - # vr = VirtualRunEnv(self) - # vr.generate() self._generate_cura_version(str(Path(self.source_folder, "cura"))) From b8fd3d7ab0753ba65f388cd3cbcf36f87b42d7c3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 21 Nov 2024 11:15:31 +0100 Subject: [PATCH 062/166] Remove pyinstaller spec generation at generate() time --- conanfile.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/conanfile.py b/conanfile.py index 7d9e910f9a..6a0fe99b7e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -32,7 +32,6 @@ class CuraConan(ConanFile): options = { "enterprise": [True, False], "staging": [True, False], - "pyinstaller": [True, False], "cloud_api_version": ["ANY"], "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles @@ -42,7 +41,6 @@ class CuraConan(ConanFile): default_options = { "enterprise": False, "staging": False, - "pyinstaller": False, "cloud_api_version": "1", "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented @@ -355,20 +353,6 @@ class CuraConan(ConanFile): cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) - if self.options.pyinstaller: - entitlements_file = "'{}'".format(str(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements"))) - self._generate_pyinstaller_spec( - location=self.generators_folder, - entrypoint_location="'{}'".format( - os.path.join(self.source_folder, self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace( - "\\", "\\\\"), - icon_path="'{}'".format(os.path.join(self.source_folder, "packaging", - self.conan_data["pyinstaller"]["icon"][ - str(self.settings.os)])).replace("\\", "\\\\"), - entitlements_file=entitlements_file if self.settings.os == "Macos" else "None", - cura_source_folder=self.source_folder - ) - if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]: vb = VirtualBuildEnv(self) vb.generate() From 50b13cdd77687787236737e8dfe7634a020d9dd7 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 22 Nov 2024 10:56:41 +0100 Subject: [PATCH 063/166] Cleanup code --- conanfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 6a0fe99b7e..311c3183b4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -136,7 +136,6 @@ class CuraConan(ConanFile): name, version = package.split(",") python_installs[name] = {"version": version} - print(python_installs) return python_installs def _generate_cura_version(self, location): @@ -372,6 +371,9 @@ class CuraConan(ConanFile): self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def deploy(self): + ''' Note: this deploy step is actually used to prepare for building a Cura distribution with pyinstaller, which is not + the original purpose in the Conan philosophy ''' + copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]), os.path.join(self.deploy_folder, "packaging"), keep_path = True) # Copy resources of Cura (keep folder structure) needed by pyinstaller to determine the module structure From 2b8a96042174f317bb81c477bcb4d9bdbbf7919a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 22 Nov 2024 16:06:03 +0100 Subject: [PATCH 064/166] Use most recent get-diff action --- .github/workflows/printer-linter-format.yml | 2 +- .github/workflows/printer-linter-pr-diagnose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index d8e136f156..87a8cdcc94 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -18,7 +18,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - uses: technote-space/get-diff-action@v6 + - uses: greguintow/get-diff-action@v7 with: PATTERNS: | resources/+(definitions|extruders)/*.def.json diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index e70cabce7d..e14c763e9e 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -19,7 +19,7 @@ jobs: with: fetch-depth: 2 - - uses: technote-space/get-diff-action@v6 + - uses: greguintow/get-diff-action@v7 with: DIFF_FILTER: AMRCD PATTERNS: | From 1feadb4be71c1b60515f61daa00458a772a2b70e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 08:33:53 +0100 Subject: [PATCH 065/166] Update/fix nightly build (untested) --- .github/workflows/installers.yml | 16 +-- .github/workflows/nightly-stable.yml | 17 ++++ .github/workflows/nightly-testing.yml | 17 ++++ .github/workflows/nightly.yml | 99 +++++++++++++++++++ ...d.jinja => nightly_release_notes.md.jinja} | 4 +- 5 files changed, 136 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/nightly-stable.yml create mode 100644 .github/workflows/nightly-testing.yml create mode 100644 .github/workflows/nightly.yml rename .github/workflows/{release_notes.md.jinja => nightly_release_notes.md.jinja} (98%) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 134b2f5e89..b2b91b7e73 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: @@ -24,11 +24,6 @@ on: default: false required: true type: boolean - nightly: - description: 'Upload to nightly release' - default: false - required: true - type: boolean workflow_call: inputs: @@ -48,15 +43,6 @@ on: default: false required: true type: boolean - nightly: - default: false - required: true - type: boolean - - schedule: - # Daily at 4:15 CET (main-branch) and 5:15 CET (release-branch) - - cron: '15 3 * * *' - - cron: '15 4 * * *' env: CONAN_ARGS: ${{ inputs.conan_args || '' }} diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml new file mode 100644 index 0000000000..d8e1754fcf --- /dev/null +++ b/.github/workflows/nightly-stable.yml @@ -0,0 +1,17 @@ +name: Nightly build - stable release +run-name: Nightly build - stable release + +on: + schedule: + # Daily at 5:15 CET + - cron: '15 4 * * *' + +jobs: + build-nightly: +# FIXME: Use main once merged + uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + with: +# FIXME: Use stable channel once merged + cura_conan_version: "cura/[*]@ultimaker/cura_11622" + release_tag: "nightly" + caller_workflow: "nightly-stable.yml" diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml new file mode 100644 index 0000000000..e00d65ab85 --- /dev/null +++ b/.github/workflows/nightly-testing.yml @@ -0,0 +1,17 @@ +name: Nightly build - dev release +run-name: Nightly build - dev release + +on: + schedule: + # Daily at 4:15 CET + - cron: '15 3 * * *' + +jobs: + build-nightly: +# FIXME: Use main once merged + uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + with: +# FIXME: Use testing channel once merged + cura_conan_version: "cura/[*]@ultimaker/cura_11622" + release_tag: "nightly-5.6" # Fixed version, we reuse the same tag forever + caller_workflow: "nightly-testing.yml" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml new file mode 100644 index 0000000000..92c7ba64a0 --- /dev/null +++ b/.github/workflows/nightly.yml @@ -0,0 +1,99 @@ +name: Nightly build +run-name: Nightly build + +on: + workflow_call: + inputs: + cura_conan_version: + default: '' + required: true + type: string + release_tag: + default: '' + required: true + type: string + caller_workflow: + default: '' + required: true + type: string + + +jobs: + create-installers: + name: Create installers + id: create-installers +# FIXME: Use main once merged + uses: ultimaker/cura/github/workflows/installers.yml@CURA-11622_conan_v2 + with: + cura_conan_version: ${{ inputs.cura_conan_version }} + secrets: inherit + + update-nightly-release: + runs-on: ubuntu-latest + needs: [ create-installers ] + steps: + - name: Download installers jobs artifacts + uses: actions/download-artifact@v4 + with: + path: installers + merge-multiple: true + + - name: Rename the installers + id: rename-installers + shell: python + working-directory: installers + run: | + import os + + first_file = True + + for file in os.listdir("."): + if file.startswith("UltiMaker-Cura-"): + # Find the commit tag, and replace it with "nightly" + index_plus = file.index("+") + file_start = file[:index_plus] + file_end = file[index_plus:] + file_end = file_end[file_end.index("-")+1:] + + new_file_name = f"{file_start}-nightly-{file_end}" + os.rename(file, new_file_name) + + if first_file: + first_file = False + + short_version = file_start.split("-")[2] + short_version = ".".join(short_version.split(".")[:2]) + + with open(os.environ["GITHUB_OUTPUT"], "a") as github_output: + github_output.write(f"cura_version={file_start}\n") + github_output.write(f"short_version={file_start}\n") + + + - name: create the release notes + shell: python + run: | + import os + import datetime + from jinja2 import Template + + with open(".github/workflows/nightly_release_notes.md.jinja", "r") as f: + release_notes = Template(f.read()) + + short_version = "${{ steps.rename-installers.outputs.short_version }}" + caller_workflow = "${{ inputs.caller_workflow }}" + is_main = os.getenv("GITHUB_REF") == "refs/heads/main" + + with open("release-notes.md", "w") as f: + f.write(release_notes.render( + timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")), + caller_workflow=caller_workflow, + branch="" if is_main else short_version, + branch_specific="" is_main else f"?branch={short_version}", + )) + + - name: Update nightly release description (with date) + if: always() + run: | + gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja similarity index 98% rename from .github/workflows/release_notes.md.jinja rename to .github/workflows/nightly_release_notes.md.jinja index e66eeca677..62edf16408 100644 --- a/.github/workflows/release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -4,7 +4,7 @@ | | | |--------------:|--------------------------------------------------------------------------------------------| -| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml/badge.svg{{ branch_specific }} +| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }} ?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | # Unit Test results @@ -36,4 +36,4 @@ | **libSavitar** | [![conan-package](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml) | | **pySavitar** | [![conan-package](https://github.com/Ultimaker/pySavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pySavitar/actions/workflows/conan-package.yml) | | **libnest2d** | [![conan-package](https://github.com/Ultimaker/libnest2d/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/conan-package.yml) | -| **pynest2d** | [![conan-package](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml) | \ No newline at end of file +| **pynest2d** | [![conan-package](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pynest2d/actions/workflows/conan-package.yml) | From b9a915024ef774d9de09c5f911427dca50aed3eb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 08:34:42 +0100 Subject: [PATCH 066/166] Always build binary translations files at build time --- conanfile.py | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/conanfile.py b/conanfile.py index 311c3183b4..2c34d55c4d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,7 +24,8 @@ class CuraConan(ConanFile): build_policy = "missing" exports = "LICENSE*", "*.jinja" settings = "os", "compiler", "build_type", "arch" - generators = "VirtualPythonEnv"#, "VirtualRunEnv" + generators = "VirtualPythonEnv" + tool_requires = "gettext/0.21" # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" @@ -36,7 +37,7 @@ class CuraConan(ConanFile): "display_name": ["ANY"], # TODO: should this be an option?? "cura_debug_mode": [True, False], # FIXME: Use profiles "internal": [True, False], - "enable_i18n": [True, False], + "i18n_extract": [True, False], } default_options = { "enterprise": False, @@ -45,17 +46,13 @@ class CuraConan(ConanFile): "display_name": "UltiMaker Cura", "cura_debug_mode": False, # Not yet implemented "internal": False, - "enable_i18n": False, + "i18n_extract": False, } def set_version(self): if not self.version: self.version = self.conan_data["version"] - @property - def _i18n_options(self): - return self.conf.get("user.i18n:options", default = {"extract": True, "build": True}, check_type = dict) - @property def _app_name(self): if self.options.enterprise: @@ -275,15 +272,14 @@ class CuraConan(ConanFile): copy(self, "*", os.path.join(self.recipe_folder, ".run_templates"), os.path.join(self.export_sources_folder, ".run_templates")) copy(self, "cura_app.py", self.recipe_folder, self.export_sources_folder) - def config_options(self): - if self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): - del self.options.enable_i18n - def validate(self): version = self.conf.get("user.cura:version", default = self.version, check_type = str) if version and Version(version) <= Version("4"): raise ConanInvalidConfiguration("Only versions 5+ are support") + if self.options.i18n_extract and self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): + raise ConanInvalidConfiguration("Unable to extract translations on Windows without Bash installed") + def requirements(self): for req in self.conan_data["requirements"]: if self.options.internal and "fdm_materials" in req: @@ -297,10 +293,6 @@ class CuraConan(ConanFile): self.requires(req) self.requires("cpython/3.12.2") - def build_requirements(self): - if self.options.get_safe("enable_i18n", False): - self.test_requires("gettext/0.21") - def layout(self): self.folders.source = "." self.folders.build = "build" @@ -352,7 +344,7 @@ class CuraConan(ConanFile): cura_private_data = self.dependencies["cura_private_data"].cpp_info copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) - if self.options.get_safe("enable_i18n", False) and self._i18n_options["extract"]: + if self.options.i18n_extract: vb = VirtualBuildEnv(self) vb.generate() @@ -362,13 +354,16 @@ class CuraConan(ConanFile): pot.generate() def build(self): - if self.options.get_safe("enable_i18n", False) and self._i18n_options["build"]: - for po_file in Path(self.source_folder, "resources", "i18n").glob("**/*.po"): - mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_folder)) - mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) - mkdir(self, str(unix_path(self, Path(mo_file).parent))) - cpp_info = self.dependencies["gettext"].cpp_info - self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) + if self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): + self.output.warning("Skipping generation of binary translation files because Bash could not be found and is required") + return + + for po_file in Path(self.source_folder, "resources", "i18n").glob("**/*.po"): + mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_folder)) + mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) + mkdir(self, str(unix_path(self, Path(mo_file).parent))) + cpp_info = self.dependencies["gettext"].cpp_info + self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def deploy(self): ''' Note: this deploy step is actually used to prepare for building a Cura distribution with pyinstaller, which is not From 644751fa730b82684904749d33bbe6e13949e665 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 08:46:03 +0100 Subject: [PATCH 067/166] Restore binaries upload for nightlies --- .github/workflows/nightly.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 92c7ba64a0..d5fd0e98d2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -91,9 +91,13 @@ jobs: branch_specific="" is_main else f"?branch={short_version}", )) - - name: Update nightly release description (with date) + - name: Update nightly release description and binaries if: always() run: | gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md + + for file in "installers/*"; do + gh release upload ${{ inputs.release_tag }} $file --clobber + done env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From bb07c0840bc16d6bbdf63ed3adceb7db9b01a57c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 08:50:41 +0100 Subject: [PATCH 068/166] Remove the nightlies build from installers --- .github/workflows/installers.yml | 218 +++---------------------------- 1 file changed, 16 insertions(+), 202 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index b2b91b7e73..2e51266081 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -44,28 +44,16 @@ on: required: true type: boolean -env: - CONAN_ARGS: ${{ inputs.conan_args || '' }} - ENTERPRISE: ${{ inputs.enterprise || false }} - STAGING: ${{ inputs.staging || false }} jobs: - default_values: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@main - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - latest_release: '5.6' - latest_release_schedule_hour: 4 - latest_release_tag: 'nightly' - windows-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main needs: [ default_values ] with: - cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} - conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise == 'true' }} - staging: ${{ github.event.inputs.staging == 'true' }} + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise == 'true' }} + staging: ${{ inputs.staging == 'true' }} architecture: X64 operating_system: self-hosted-Windows-X64 secrets: inherit @@ -75,10 +63,10 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 needs: [ default_values ] with: - cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} - conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise == 'true' }} - staging: ${{ github.event.inputs.staging == 'true' }} + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise == 'true' }} + staging: ${{ inputs.staging == 'true' }} operating_system: self-hosted-Ubuntu22-X64 secrets: inherit @@ -86,10 +74,10 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main needs: [ default_values ] with: - cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} - conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise == 'true' }} - staging: ${{ github.event.inputs.staging == 'true' }} + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise == 'true' }} + staging: ${{ inputs.staging == 'true' }} architecture: X64 operating_system: self-hosted-X64 secrets: inherit @@ -98,184 +86,10 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main needs: [ default_values ] with: - cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} - conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise == 'true' }} - staging: ${{ github.event.inputs.staging == 'true' }} + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise == 'true' }} + staging: ${{ inputs.staging == 'true' }} architecture: ARM64 operating_system: self-hosted-ARM64 secrets: inherit - - # Run and update nightly release when the nightly input is set to true or if the schedule is triggered - update-nightly-release: - if: ${{ inputs.nightly || github.event_name == 'schedule' }} - runs-on: ubuntu-latest - needs: [ default_values, windows-installer, linux-installer, macos-installer, macos-arm-installer ] - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 1 - - - name: Download the run info - uses: actions/download-artifact@v4 - with: - name: linux-run-info - - - name: Set the run info as environment variables - run: | - . run_info.sh - - - name: Output the name file name and extension - id: filename - shell: python - run: | - import os - import datetime - enterprise = "-Enterprise" if "${{ github.event.inputs.enterprise }}" == "true" else "" - linux = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-X64" - mac_x64_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64" - mac_x64_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64" - mac_arm_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64" - mac_arm_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64" - win_msi = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64" - win_exe = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64" - nightly_name = "UltiMaker-Cura-" + os.getenv('CURA_VERSION_FULL').split("+")[0] - nightly_creation_time = str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) - output_env = os.environ["GITHUB_OUTPUT"] - content = "" - if os.path.exists(output_env): - with open(output_env, "r") as f: - content = f.read() - with open(output_env, "w") as f: - f.write(content) - f.writelines(f"LINUX={linux}\n") - f.writelines(f"MAC_X64_DMG={mac_x64_dmg}\n") - f.writelines(f"MAC_X64_PKG={mac_x64_pkg}\n") - f.writelines(f"MAC_ARM_DMG={mac_arm_dmg}\n") - f.writelines(f"MAC_ARM_PKG={mac_arm_pkg}\n") - f.writelines(f"WIN_MSI={win_msi}\n") - f.writelines(f"WIN_EXE={win_exe}\n") - f.writelines(f"NIGHTLY_NAME={nightly_name}\n") - f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n") - - - name: Download linux installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.LINUX }}-AppImage - path: installers - - - name: Download linux installer jobs asc artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.LINUX }}-asc - path: installers - - - name: Rename Linux installer to nightlies - run: | - mv installers/${{ steps.filename.outputs.LINUX }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage - mv installers/${{ steps.filename.outputs.LINUX }}.AppImage.asc installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc - - - name: Update nightly release for Linux - run: | - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Download win msi installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.WIN_MSI }}-msi - path: installers - - - name: Download win exe installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.WIN_EXE }}-exe - path: installers - - - name: Rename Windows installers to nightlies - run: | - mv installers/${{ steps.filename.outputs.WIN_MSI }}.msi installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi - mv installers/${{ steps.filename.outputs.WIN_EXE }}.exe installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe - - - name: Update nightly release for Windows - run: | - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Download MacOS (X64) dmg installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.MAC_X64_DMG }}-dmg - path: installers - - - name: Download MacOS (X64) pkg installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.MAC_X64_PKG }}-pkg - path: installers - - - name: Rename MacOS (X64) installers to nightlies - run: | - mv installers/${{ steps.filename.outputs.MAC_X64_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg - mv installers/${{ steps.filename.outputs.MAC_X64_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg - - - name: Update nightly release for MacOS (X64) - run: | - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Download MacOS (ARM-64) dmg installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.MAC_ARM_DMG }}-dmg - path: installers - - - name: Download MacOS (ARM-64) pkg installer jobs artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ steps.filename.outputs.MAC_ARM_PKG }}-pkg - path: installers - - - name: Rename MacOS (ARM-64) installers to nightlies - run: | - mv installers/${{ steps.filename.outputs.MAC_ARM_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg - mv installers/${{ steps.filename.outputs.MAC_ARM_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg - - - name: Update nightly release for MacOS (ARM-64) - run: | - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber - gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: create the release notes - shell: python - run: | - import os - import datetime - from jinja2 import Template - - with open(".github/workflows/release_notes.md.jinja", "r") as f: - release_notes = Template(f.read()) - - current_nightly_beta = "${{ needs.default_values.outputs.release_tag }}".split("nightly-")[-1] - with open("release-notes.md", "w") as f: - f.write(release_notes.render( - timestamp="${{ steps.filename.outputs.NIGHTLY_TIME }}", - branch="" if "${{ needs.default-values.outputs.release_tag == 'nightly' }}" == 'true' else current_nightly_beta, - branch_specific="" if os.getenv("GITHUB_REF") == "refs/heads/main" else f"?branch={current_nightly_beta}", - )) - - - name: Update nightly release description (with date) - if: always() - run: | - gh release edit ${{ needs.default_values.outputs.release_tag }} --title "${{ steps.filename.outputs.NIGHTLY_NAME }}" --notes-file release-notes.md - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6d0a30d496d904af32c4d8319239322c3d925a3f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Nov 2024 11:51:11 +0100 Subject: [PATCH 069/166] Use simplified package creation workflow --- .github/workflows/conan-package.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 6f19078895..961052d69f 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -36,6 +36,4 @@ jobs: # FIXME: Use main once merged conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 - with: - package_name: cura secrets: inherit From 9002e010cfa10aa4358ecfacb02c9a8fdfc1344c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 26 Nov 2024 15:06:48 +0100 Subject: [PATCH 070/166] Fix syntax of thrown errors. done as part of CURA-11622 --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 2c34d55c4d..23f77b708c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -182,11 +182,11 @@ class CuraConan(ConanFile): src_path = str(Path(cura_source_folder, data["src"])) else: if data["package"] not in self.dependencies: - raise ConanException(f"Required package {data["package"]} does not exist as a dependency") + raise ConanException(f"Required package {data['package']} does not exist as a dependency") - package_folder = self.dependencies[data["package"]].package_folder + package_folder = self.dependencies[data['package']].package_folder if package_folder is None: - raise ConanException(f"Unable to find package_folder for {data["package"]}, check that it has not been skipped") + raise ConanException(f"Unable to find package_folder for {data['package']}, check that it has not been skipped") src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) elif "root" in data: # get the paths relative from the install folder From c8f040e90e876affac9b4816867be06735ad3c54 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 08:56:23 +0100 Subject: [PATCH 071/166] Use production environment for Sentry --- .github/workflows/installers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 2e51266081..943083138e 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -37,11 +37,11 @@ on: type: string enterprise: default: false - required: true + required: false type: boolean staging: default: false - required: true + required: false type: boolean From a1657dc329e0df114573f9928f5af47b96c3ca29 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 08:58:24 +0100 Subject: [PATCH 072/166] Use more explicit tag for nightlies --- .github/workflows/nightly-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index e00d65ab85..0d66c17e20 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -13,5 +13,5 @@ jobs: with: # FIXME: Use testing channel once merged cura_conan_version: "cura/[*]@ultimaker/cura_11622" - release_tag: "nightly-5.6" # Fixed version, we reuse the same tag forever + release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" From 6313a89cd6a02c5912cc67b6cda54a4a3c9b5ce5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 08:59:01 +0100 Subject: [PATCH 073/166] Use uptodate install python script --- .github/workflows/printer-linter-format.yml | 2 +- .github/workflows/printer-linter-pr-diagnose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 87a8cdcc94..07ba8bb989 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Python and pip if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11.x cache: 'pip' diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index e14c763e9e..106c9123e6 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Python and pip if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11.x cache: "pip" From b46c89ad983802566fc1f4e7ad8d3d6679d9d06e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 08:59:42 +0100 Subject: [PATCH 074/166] Update release candidate workflow --- .../release-process_release-candidate.yml | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 1afb8aad04..2d9bd77757 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -99,7 +99,6 @@ jobs: run: | echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT" - create-dependencies-packages: name: Create conan packages for dependencies uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main @@ -113,38 +112,17 @@ jobs: conan_recipe_root: "resources" with: repository: ${{ matrix.repository }} - ref_name: ${{ needs.parse-version.outputs.branch_name }} - version: ${{ inputs.cura_version }} - conan_release: true - conan_user_channel: ultimaker/stable - conan_internal: false - conan_latest: true + branch: ${{ needs.parse-version.outputs.branch_name }} conan_recipe_root: ${{ matrix.conan_recipe_root }} secrets: inherit - create-cura-package: - name: Create conan package for Cura - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main - needs: [parse-version, create-dependencies-packages] - with: - repository: Cura - ref_name: ${{ needs.parse-version.outputs.branch_name }} - version: ${{ inputs.cura_version }} - conan_release: true - conan_user_channel: ultimaker/stable - conan_internal: false - conan_latest: true - secrets: inherit - create-installers: name: Create installers uses: ./.github/workflows/installers.yml needs: [parse-version, create-cura-package] with: - cura_conan_version: cura/${{ inputs.cura_version }}@/ - enterprise: false - staging: false - nightly: false + cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable + conan_args: "-c user.sentry:environment=production" secrets: inherit create-release-draft: @@ -174,7 +152,7 @@ jobs: body: formatted_changelog.txt - name: Download artifacts - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: path: artifacts merge-multiple: true From 5782ee435abf1a0cd5222d299af2e49af0a2b1d1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 09:16:15 +0100 Subject: [PATCH 075/166] Fix called step name --- .github/workflows/release-process_release-candidate.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 2d9bd77757..1560f48c16 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -99,8 +99,8 @@ jobs: run: | echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT" - create-dependencies-packages: - name: Create conan packages for dependencies + create-packages: + name: Create conan packages uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main needs: [parse-version, freeze-packages-versions] strategy: @@ -119,7 +119,7 @@ jobs: create-installers: name: Create installers uses: ./.github/workflows/installers.yml - needs: [parse-version, create-cura-package] + needs: [parse-version, create-packages] with: cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable conan_args: "-c user.sentry:environment=production" From 6704265bc371bd6af6ba8c02181b28e62af72829 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 09:23:42 +0100 Subject: [PATCH 076/166] Use the workflows from the branch --- .github/workflows/release-process_release-candidate.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 1560f48c16..7809b93aeb 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -32,7 +32,8 @@ jobs: freeze-packages-versions: name: Freeze packges versions - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main +# FIXME: Use main once merged + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} @@ -101,7 +102,8 @@ jobs: create-packages: name: Create conan packages - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-11622_conan_v2 needs: [parse-version, freeze-packages-versions] strategy: matrix: From a9a4c5d49e80bf4800cb7d45e22ef3fcea3f4594 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 09:33:29 +0100 Subject: [PATCH 077/166] Fix jobs dependencies --- .github/workflows/installers.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 943083138e..012efe38da 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -48,7 +48,6 @@ on: jobs: windows-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main - needs: [ default_values ] with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -61,7 +60,6 @@ jobs: # FIXME: Use main once merged linux-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 - needs: [ default_values ] with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -72,7 +70,6 @@ jobs: macos-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main - needs: [ default_values ] with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -84,7 +81,6 @@ jobs: macos-arm-installer: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main - needs: [ default_values ] with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} From 09be7723558854a797d2f918fab6868528f13d1b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 09:49:34 +0100 Subject: [PATCH 078/166] Use workflows from branch --- .github/workflows/installers.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 012efe38da..8c73200231 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -47,7 +47,8 @@ on: jobs: windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -69,7 +70,8 @@ jobs: secrets: inherit macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -80,7 +82,8 @@ jobs: secrets: inherit macos-arm-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} From 0000ba334cedc8f69904752bd6f58de6df972986 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 11:17:13 +0100 Subject: [PATCH 079/166] Use gettext tools in path (experimental) --- conanfile.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index 23f77b708c..6fce951def 100644 --- a/conanfile.py +++ b/conanfile.py @@ -25,7 +25,7 @@ class CuraConan(ConanFile): exports = "LICENSE*", "*.jinja" settings = "os", "compiler", "build_type", "arch" generators = "VirtualPythonEnv" - tool_requires = "gettext/0.21" + tool_requires = "gettext/0.22.5" # FIXME: Remove specific branch once merged to main python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" @@ -348,9 +348,7 @@ class CuraConan(ConanFile): vb = VirtualBuildEnv(self) vb.generate() - # # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement - cpp_info = self.dependencies["gettext"].cpp_info - pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0]) + pot = self.python_requires["translationextractor"].module.ExtractTranslations(self) pot.generate() def build(self): @@ -362,8 +360,7 @@ class CuraConan(ConanFile): mo_file = Path(self.build_folder, po_file.with_suffix('.mo').relative_to(self.source_folder)) mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) mkdir(self, str(unix_path(self, Path(mo_file).parent))) - cpp_info = self.dependencies["gettext"].cpp_info - self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) + self.run(f"msgfmt {po_file} -o {mo_file} -f", env="conanbuild") def deploy(self): ''' Note: this deploy step is actually used to prepare for building a Cura distribution with pyinstaller, which is not From 19743d000891fcd7d032278627acc71d183a2191 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 11:52:19 +0100 Subject: [PATCH 080/166] Remove windows installer architecture argument --- .github/workflows/installers.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 8c73200231..a7ee9bfc49 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -54,7 +54,6 @@ jobs: conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise == 'true' }} staging: ${{ inputs.staging == 'true' }} - architecture: X64 operating_system: self-hosted-Windows-X64 secrets: inherit From 0b323764abeb25d1244875183d121f43c8855421 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 11:57:49 +0100 Subject: [PATCH 081/166] Set proper repository name for packages creation --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 7809b93aeb..8fab10613a 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -113,7 +113,7 @@ jobs: - repository: Cura conan_recipe_root: "resources" with: - repository: ${{ matrix.repository }} + repository: Ultimaker/${{ matrix.repository }} branch: ${{ needs.parse-version.outputs.branch_name }} conan_recipe_root: ${{ matrix.conan_recipe_root }} secrets: inherit From dd659e3fbe7991b6357782fb20b8017f0944e377 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 12:04:16 +0100 Subject: [PATCH 082/166] Give branch name to script to avoid recalculating it --- .github/workflows/release-process_feature-freeze.yml | 1 + .github/workflows/release-process_release-candidate.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index 3a07799665..d3a4b35fc9 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -28,5 +28,6 @@ jobs: needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} + branch: ${{ needs.parse-version.outputs.branch_name }} create_feature_branch: true secrets: inherit diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 8fab10613a..ecd20449f6 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -37,6 +37,7 @@ jobs: needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} + branch: ${{ needs.parse-version.outputs.branch_name }} create_feature_branch: false secrets: inherit From 2ef1462f824d1d14c8e1badb302439c8471a4495 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 26 Nov 2024 15:21:48 +0100 Subject: [PATCH 083/166] Update pywin32. done as part of CURA-11622 --- conandata.yml | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/conandata.yml b/conandata.yml index 12c70f8455..131c52bd83 100644 --- a/conandata.yml +++ b/conandata.yml @@ -610,20 +610,26 @@ pip_requirements_core: - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 pywin32: - version: "303" + version: "306" hashes: - - sha256:6fed4af057039f309263fd3285d7b8042d41507343cd5fa781d98fcc5b90e8bb - - sha256:51cb52c5ec6709f96c3f26e7795b0bf169ee0d8395b2c1d7eb2c029a5008ed51 - - sha256:d9b5d87ca944eb3aa4cd45516203ead4b37ab06b8b777c54aedc35975dec0dee - - sha256:fcf44032f5b14fcda86028cdf49b6ebdaea091230eb0a757282aa656e4732439 - - sha256:aad484d52ec58008ca36bd4ad14a71d7dd0a99db1a4ca71072213f63bf49c7d9 - - sha256:2a09632916b6bb231ba49983fe989f2f625cea237219530e81a69239cd0c4559 - - sha256:b1675d82bcf6dbc96363fca747bac8bff6f6e4a447a4287ac652aa4b9adc796e - - sha256:c268040769b48a13367221fced6d4232ed52f044ffafeda247bd9d2c6bdc29ca - - sha256:5f9ec054f5a46a0f4dfd72af2ce1372f3d5a6e4052af20b858aa7df2df7d355b - - sha256:793bf74fce164bcffd9d57bb13c2c15d56e43c9542a7b9687b4fccf8f8a41aba - - sha256:7d3271c98434617a11921c5ccf74615794d97b079e22ed7773790822735cc352 - - sha256:79cbb862c11b9af19bcb682891c1b91942ec2ff7de8151e2aea2e175899cda34 + - sha256:796ff4426437896550d2981b9c2ac0ffd75238ad9ea2d3bfa67a1abd546d262e + - sha256:4fc888c59b3c0bef905ce7eb7e2106a07712015ea1c8234b703a088d46110e8e + - sha256:a5ab5381813b40f264fa3495b98af850098f814a25a63589a8e9eb12560f450c + - sha256:5d8c8015b24a7d6855b1550d8e660d8daa09983c80e5daf89a273e5c6fb5095a + - sha256:575621b90f0dc2695fec346b2d6302faebd4f0f45c05ea29404cefe35d89442b + - sha256:100a5442b7332070983c4cd03f2e906a5648a5104b8a7f50175f7906efd16bb6 + - sha256:587f3e19696f4bf96fde9d8a57cec74a57021ad5f204c9e627e15c33ff568897 + - sha256:00b3e11ef09ede56c6a43c71f2d31857cf7c54b0ab6e78ac659497abd2834f47 + - sha256:9b4de86c8d909aed15b7011182c8cab38c8850de36e6afb1f0db22b8959e3091 + - sha256:1c44539a37a5b7b21d02ab34e6a4d314e0788f1690d65b48e9b0b89f31abbbed + - sha256:fd380990e792eaf6827fcb7e187b2b4b1cede0585e3d0c9e84201ec27b9905e4 + - sha256:ef313c46d4c18dfb82a2431e3051ac8f112ccee1a34f29c263c583c568db63cd + - sha256:1f696ab352a2ddd63bd07430080dd598e6369152ea13a25ebcdd2f503a38f1ff + - sha256:13dcb914ed4347019fbec6697a01a0aec61019c1046c2b905410d197856326a6 + - sha256:5794e764ebcabf4ff08c555b31bd348c9025929371763b2183172ff4708152f0 + - sha256:3b92622e29d651c6b783e368ba7d6722b1634b8e70bd376fd7610fe1992e19de + - sha256:7873ca4dc60ab3287919881a7d4f88baee4a6e639aa6962de25a98ba6b193341 + - sha256:71b3322d949b4cc20776436a9c9ba0eeedcbc9c650daa536df63f0ff111bb920 pywin32-ctypes: version: "0.2.0" hashes: From b7a5b2fd62d3b134ec0b275217a7283c4cc76939 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 27 Nov 2024 09:19:56 +0100 Subject: [PATCH 084/166] (win build) make it work locally again part if CURA-11622 --- conanfile.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6fce951def..39767f67f2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -121,12 +121,13 @@ class CuraConan(ConanFile): self.output.info("Collecting python installs") python_installs = {} - outer = '"' if self.settings.os == "Windows" else "'" - inner = "'" if self.settings.os == "Windows" else '"' + temp_exec = "temp.py" + code = f"import importlib.metadata; print(';'.join([(package.metadata['Name']+','+ package.metadata['Version']) for package in importlib.metadata.distributions()]))" + save(self, temp_exec, code) + buffer = StringIO() - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "virtual_python_env", - stdout = buffer) + self.run(f"""python {temp_exec}""", env = "virtual_python_env", stdout = buffer) + rm(self, temp_exec, ".") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: From 12961014621ac9ac77da18855deddac06dc8fc80 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 13:48:41 +0100 Subject: [PATCH 085/166] Name installers --- .github/workflows/installers.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index a7ee9bfc49..e0ed6dbfe7 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -48,6 +48,7 @@ on: jobs: windows-installer: # FIXME: Use main once merged + name: Create Windows installer uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} @@ -59,6 +60,7 @@ jobs: # FIXME: Use main once merged linux-installer: + name: Create Linux AppImage uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} @@ -70,6 +72,7 @@ jobs: macos-installer: # FIXME: Use main once merged + name: Create MacOS-X64 packages uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} @@ -82,6 +85,7 @@ jobs: macos-arm-installer: # FIXME: Use main once merged + name: Create MacOS-ARM64 packages uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} From af22593326fd0a75044ed35f50de507b6744e33a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 14:42:57 +0100 Subject: [PATCH 086/166] Remove version limit --- conanfile.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6fce951def..6d26112696 100644 --- a/conanfile.py +++ b/conanfile.py @@ -273,10 +273,6 @@ class CuraConan(ConanFile): copy(self, "cura_app.py", self.recipe_folder, self.export_sources_folder) def validate(self): - version = self.conf.get("user.cura:version", default = self.version, check_type = str) - if version and Version(version) <= Version("4"): - raise ConanInvalidConfiguration("Only versions 5+ are support") - if self.options.i18n_extract and self.settings.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", check_type=str): raise ConanInvalidConfiguration("Unable to extract translations on Windows without Bash installed") From 33ac9a9bc1323ae7b51fcefea82823ea46e2cdaa Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 16:25:33 +0100 Subject: [PATCH 087/166] Use workflow from branch --- .github/workflows/release-process_feature-freeze.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index d3a4b35fc9..e366a4a642 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -24,7 +24,8 @@ jobs: feature-freeze: name: Process feature freeze - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main +# FIXME: Use main once merged + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} From 9238e7e5b71eebbc592d6b30f061cc8b5ebfcd00 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 16:32:47 +0100 Subject: [PATCH 088/166] Give proper branch name --- .github/workflows/release-process_feature-freeze.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index e366a4a642..07242790ce 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -15,6 +15,7 @@ jobs: runs-on: ubuntu-latest outputs: package_version: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }}.0-alpha.1 + branch: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }} steps: - name: Parse version string id: version_parser @@ -29,6 +30,6 @@ jobs: needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} - branch: ${{ needs.parse-version.outputs.branch_name }} + branch: ${{ needs.parse-version.outputs.branch }} create_feature_branch: true secrets: inherit From d8200a3cb3837280bc998b30a81664a4eb8233fd Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 17:56:16 +0100 Subject: [PATCH 089/166] Use simplified package creation workflow --- .github/workflows/conan-package-resources.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 4bad3d2bcb..dbc2558a43 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -25,7 +25,6 @@ jobs: conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: - package_name: cura_resources conan_recipe_root: "./resources/" platform_windows: false platform_mac: false From f807af1b54cb49875a6bd954d30ba334f52ddac5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 28 Nov 2024 10:46:04 +0100 Subject: [PATCH 090/166] Add warning for Conan2 migration --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 37978a30f9..d3fa8f55ce 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@
+# ⚠️ ⚠️ On 03-12-2024, we will start merging branches on all the Cura-related repositories, that contain a migration of our Conan recipes to use Conan 2, and also a huge rework on many GitHub workflows. Unfortunately, we cannot test everything until it is merged, so it is very likely that some existing workflows will stop working. If you are a developer, you may also encounter troubles when updating your branches or updating your Conan dependencies. This message will be removed when the situation is stable enough. After that, please open new issues if you are still in trouble with the new recipes/workflows. Sorry for the inconvenience. ⚠️ ⚠️ + [![Badge Issues]][Issues]    [![Badge PullRequests]][PullRequests]    [![Badge Closed]][Closed] From 0d5d0fe846ac2817c8892ecc89a06c50b6b92946 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 28 Nov 2024 14:32:49 +0100 Subject: [PATCH 091/166] Rename tmp Python file to a more explicit name --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 42fb4c8faf..0bd04d3363 100644 --- a/conanfile.py +++ b/conanfile.py @@ -121,13 +121,13 @@ class CuraConan(ConanFile): self.output.info("Collecting python installs") python_installs = {} - temp_exec = "temp.py" + collect_python_installs = "collect_python_installs.py" code = f"import importlib.metadata; print(';'.join([(package.metadata['Name']+','+ package.metadata['Version']) for package in importlib.metadata.distributions()]))" - save(self, temp_exec, code) + save(self, collect_python_installs, code) buffer = StringIO() - self.run(f"""python {temp_exec}""", env = "virtual_python_env", stdout = buffer) - rm(self, temp_exec, ".") + self.run(f"""python {collect_python_installs}""", env = "virtual_python_env", stdout = buffer) + rm(self, collect_python_installs, ".") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: From 1b83a35236f8f8fc95ea60a185d7e5453c586368 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 28 Nov 2024 15:37:05 +0100 Subject: [PATCH 092/166] Update Mac installer workflow --- .github/workflows/macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ffc9b27b8b..12f58616ae 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -43,8 +43,9 @@ on: - macos-12 jobs: +# FIXME: Use main once merged macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} From 05aecd77aaaea7319f7bd81ef867d2edac90c157 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 28 Nov 2024 15:54:13 +0100 Subject: [PATCH 093/166] Bump pywin32 and pywin32-ctypes --- conandata.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conandata.yml b/conandata.yml index 6bf259357a..b157cce42a 100644 --- a/conandata.yml +++ b/conandata.yml @@ -621,7 +621,7 @@ pip_requirements_core: - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 pywin32: - version: "306" + version: "308" hashes: - sha256:796ff4426437896550d2981b9c2ac0ffd75238ad9ea2d3bfa67a1abd546d262e - sha256:4fc888c59b3c0bef905ce7eb7e2106a07712015ea1c8234b703a088d46110e8e @@ -642,10 +642,10 @@ pip_requirements_core: - sha256:7873ca4dc60ab3287919881a7d4f88baee4a6e639aa6962de25a98ba6b193341 - sha256:71b3322d949b4cc20776436a9c9ba0eeedcbc9c650daa536df63f0ff111bb920 pywin32-ctypes: - version: "0.2.0" + version: "0.2.3" hashes: - - sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 - - sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 + - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 + - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 pip_requirements_dev: any_os: From f59e19f061202f7b346f1845286ff00d0945774f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 09:02:32 +0100 Subject: [PATCH 094/166] Update python version --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 0bd04d3363..497ab88808 100644 --- a/conanfile.py +++ b/conanfile.py @@ -358,7 +358,7 @@ class CuraConan(ConanFile): if self.options.enterprise: for req in self.conan_data["requirements_enterprise"]: self.requires(req) - self.requires("cpython/3.12.2") + self.requires("cpython/3.12.7") def layout(self): self.folders.source = "." From c002ba7afe1b5c8e4dde00cac5ec93acee0e25d2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 09:56:33 +0100 Subject: [PATCH 095/166] Bump dulcificum version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index b157cce42a..786d423e5d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,7 @@ requirements: - "curaengine/5.10.0-alpha.0@ultimaker/cura_11622" - "cura_binary_data/5.10.0-alpha.0@ultimaker/cura_11622" - "fdm_materials/5.10.0-alpha.0@ultimaker/cura_11622" - - "dulcificum/0.2.0-alpha.0@ultimaker/cura_11622" + - "dulcificum/0.2.1-alpha.0@ultimaker/cura_11622" - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" requirements_internal: From 55e2967551017934e2838ee68eb5114872f7dd24 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 10:19:46 +0100 Subject: [PATCH 096/166] Use proper dulcificum version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 786d423e5d..b346282c41 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,7 @@ requirements: - "curaengine/5.10.0-alpha.0@ultimaker/cura_11622" - "cura_binary_data/5.10.0-alpha.0@ultimaker/cura_11622" - "fdm_materials/5.10.0-alpha.0@ultimaker/cura_11622" - - "dulcificum/0.2.1-alpha.0@ultimaker/cura_11622" + - "dulcificum/0.2.1@ultimaker/cura_11622" - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" requirements_internal: From 85c2d2f078a4e90bb64a4bfb7bbfbf8eabe5c9cd Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 11:40:29 +0100 Subject: [PATCH 097/166] Use common script for installers --- .github/workflows/installers.yml | 68 +------------------ .github/workflows/nightly.yml | 43 +++--------- .../release-process_release-candidate.yml | 3 +- 3 files changed, 15 insertions(+), 99 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index e0ed6dbfe7..f19af8a745 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -7,91 +7,29 @@ on: cura_conan_version: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' - required: true type: string conan_args: description: 'Conan args, e.g. --requires' default: '' - required: false type: string enterprise: description: 'Build Cura as an Enterprise edition' default: false - required: true type: boolean staging: description: 'Use staging API' default: false - required: true - type: boolean - - workflow_call: - inputs: - cura_conan_version: - default: 'cura/latest@ultimaker/testing' - required: true - type: string - conan_args: - default: '' - required: false - type: string - enterprise: - default: false - required: false - type: boolean - staging: - default: false - required: false type: boolean jobs: - windows-installer: + installers: # FIXME: Use main once merged - name: Create Windows installer - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 + name: Create installers + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise == 'true' }} staging: ${{ inputs.staging == 'true' }} - operating_system: self-hosted-Windows-X64 - secrets: inherit - -# FIXME: Use main once merged - linux-installer: - name: Create Linux AppImage - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} - operating_system: self-hosted-Ubuntu22-X64 - secrets: inherit - - macos-installer: -# FIXME: Use main once merged - name: Create MacOS-X64 packages - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} - architecture: X64 - operating_system: self-hosted-X64 - secrets: inherit - - macos-arm-installer: -# FIXME: Use main once merged - name: Create MacOS-ARM64 packages - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} - architecture: ARM64 - operating_system: self-hosted-ARM64 secrets: inherit diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d5fd0e98d2..4b7403b7e9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -5,15 +5,12 @@ on: workflow_call: inputs: cura_conan_version: - default: '' required: true type: string release_tag: - default: '' required: true type: string caller_workflow: - default: '' required: true type: string @@ -23,51 +20,31 @@ jobs: name: Create installers id: create-installers # FIXME: Use main once merged - uses: ultimaker/cura/github/workflows/installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 with: cura_conan_version: ${{ inputs.cura_conan_version }} secrets: inherit update-nightly-release: + name: Upload installers runs-on: ubuntu-latest needs: [ create-installers ] steps: + - name: Setup the build environment +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@CURA-11622_conan_v2 + - name: Download installers jobs artifacts uses: actions/download-artifact@v4 with: + pattern: UltiMaker-Cura-* path: installers merge-multiple: true - name: Rename the installers id: rename-installers - shell: python working-directory: installers - run: | - import os - - first_file = True - - for file in os.listdir("."): - if file.startswith("UltiMaker-Cura-"): - # Find the commit tag, and replace it with "nightly" - index_plus = file.index("+") - file_start = file[:index_plus] - file_end = file[index_plus:] - file_end = file_end[file_end.index("-")+1:] - - new_file_name = f"{file_start}-nightly-{file_end}" - os.rename(file, new_file_name) - - if first_file: - first_file = False - - short_version = file_start.split("-")[2] - short_version = ".".join(short_version.split(".")[:2]) - - with open(os.environ["GITHUB_OUTPUT"], "a") as github_output: - github_output.write(f"cura_version={file_start}\n") - github_output.write(f"short_version={file_start}\n") - + run: python ./Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT - name: create the release notes shell: python @@ -92,11 +69,11 @@ jobs: )) - name: Update nightly release description and binaries - if: always() + working-directory: installers run: | gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md - for file in "installers/*"; do + for file in "*"; do gh release upload ${{ inputs.release_tag }} $file --clobber done env: diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index ecd20449f6..caa132c830 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -121,7 +121,8 @@ jobs: create-installers: name: Create installers - uses: ./.github/workflows/installers.yml +# FIXME: Use main once merged + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 needs: [parse-version, create-packages] with: cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable From 1b9f1c55367bc0199cc36ef59e457c2cb3c6dbff Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 29 Nov 2024 11:40:47 +0100 Subject: [PATCH 098/166] Add preference to actually set the flip preference for Y handle --- resources/qml/Preferences/GeneralPage.qml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 4cc87e9644..a686fca8e5 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -109,6 +109,9 @@ UM.PreferencesPage UM.Preferences.resetPreference("general/restore_window_geometry") restoreWindowPositionCheckbox.checked = boolCheck(UM.Preferences.getValue("general/restore_window_geometry")) + UM.Preferences.resetPreference("tool/flip_y_axis_tool_handle") + flipToolhandleYCheckbox.checked = boolcheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle")) + UM.Preferences.resetPreference("general/camera_perspective_mode") //var defaultCameraMode = UM.Preferences.getValue("general/camera_perspective_mode") // /setDefaultCameraMode(defaultCameraMode) @@ -662,6 +665,21 @@ UM.PreferencesPage } } } + UM.TooltipArea + { + width: childrenRect.width + height: childrenRect.height + text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped?") + + UM.CheckBox + { + id: flipToolhandleYCheckbox + text: catalog.i18nc("@option:check", "Flip toolhandle Y axis") + checked: boolCheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle")) + onCheckedChanged: UM.Preferences.setValue("tool/flip_y_axis_tool_handle", checked) + } + } + Item { From a1d59b28ac3ec0672866dc354becc5dc309c429b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 13:43:08 +0100 Subject: [PATCH 099/166] Use proper package name for charon/libcharon --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index b346282c41..5b1980f309 100644 --- a/conandata.yml +++ b/conandata.yml @@ -257,7 +257,7 @@ pycharm_targets: pip_requirements_core: any_os: - libCharon: + charon: url: "git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon" PyQt6-NetworkAuth: version: "6.6.0" From c245b29fc48e392da3dfdaa08efba934a6806f92 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 29 Nov 2024 16:46:56 +0100 Subject: [PATCH 100/166] Add hash for setuptools package --- conandata.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conandata.yml b/conandata.yml index 5b1980f309..e13e116e42 100644 --- a/conandata.yml +++ b/conandata.yml @@ -298,6 +298,11 @@ pip_requirements_core: hashes: - sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 - sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e + setuptools: + version: "75.6.0" + hashes: + - sha256:ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d + - sha256:8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6 sentry-sdk: version: "0.13.5" hashes: From 8d332f5bcc06f602361634c483100f245fe67cea Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 10:31:27 +0100 Subject: [PATCH 101/166] Revert CPython to 3.12.2 Unfortunately, 3.12.7 doesn't build on Windows yet --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 497ab88808..0bd04d3363 100644 --- a/conanfile.py +++ b/conanfile.py @@ -358,7 +358,7 @@ class CuraConan(ConanFile): if self.options.enterprise: for req in self.conan_data["requirements_enterprise"]: self.requires(req) - self.requires("cpython/3.12.7") + self.requires("cpython/3.12.2") def layout(self): self.folders.source = "." From dfbc17a745fcd021276d76b33c7789f166158959 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 14:35:39 +0100 Subject: [PATCH 102/166] Display commands of package creation --- packaging/MacOS/build_macos.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index fc78abf76f..d3e1c1cfd9 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -56,6 +56,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v else: print("CODESIGN_IDENTITY missing. The installer is not being signed") + print(f"Run package build command [{" ".join(pkg_build_arguments)}]") subprocess.run(pkg_build_arguments) # This automatically generates a distribution.xml file that is used to build the installer. @@ -67,6 +68,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v "--package", Path(dist_path, component_filename), # Package that will be inside installer Path(dist_path, "distribution.xml"), # Output location for sythesized distributions file ] + print(f"Run distribution creation command [{" ".join(distribution_creation_arguments)}]") subprocess.run(distribution_creation_arguments) # This creates the distributable package (Installer) @@ -80,6 +82,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v if codesign_identity: installer_creation_arguments.extend(["--sign", codesign_identity]) + print(f"Run installer creation command [{" ".join(installer_creation_arguments)}]") subprocess.run(installer_creation_arguments) From 6aa386bd1e03d9a7ca61c7d3a15cca86059345ee Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 14:45:15 +0100 Subject: [PATCH 103/166] Fix display of executed command --- packaging/MacOS/build_macos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index d3e1c1cfd9..9038063af7 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -56,7 +56,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v else: print("CODESIGN_IDENTITY missing. The installer is not being signed") - print(f"Run package build command [{" ".join(pkg_build_arguments)}]") + print(f"Run package build command [{" ".join([str(arg) for arg in pkg_build_arguments])}]") subprocess.run(pkg_build_arguments) # This automatically generates a distribution.xml file that is used to build the installer. @@ -68,7 +68,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v "--package", Path(dist_path, component_filename), # Package that will be inside installer Path(dist_path, "distribution.xml"), # Output location for sythesized distributions file ] - print(f"Run distribution creation command [{" ".join(distribution_creation_arguments)}]") + print(f"Run distribution creation command [{" ".join([str(arg) for arg in distribution_creation_arguments])}]") subprocess.run(distribution_creation_arguments) # This creates the distributable package (Installer) @@ -82,7 +82,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v if codesign_identity: installer_creation_arguments.extend(["--sign", codesign_identity]) - print(f"Run installer creation command [{" ".join(installer_creation_arguments)}]") + print(f"Run installer creation command [{" ".join([str(arg) for arg in installer_creation_arguments])}]") subprocess.run(installer_creation_arguments) From 68175c2d01134024343ab6737b1aa0346e05b432 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 15:11:56 +0100 Subject: [PATCH 104/166] Display all commands and fail on error --- packaging/MacOS/build_macos.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index 9038063af7..a495a02769 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -25,7 +25,8 @@ def build_dmg(source_path: str, dist_path: str, filename: str, app_name: str) -> f"{dist_path}/{filename}", f"{dist_path}/{app_name}"] - subprocess.run(arguments) + print(f"Run create dmg command [{" ".join([str(arg) for arg in arguments])}]") + subprocess.run(arguments, check=True) def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_version: str, installer_filename: str) -> None: @@ -57,7 +58,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v print("CODESIGN_IDENTITY missing. The installer is not being signed") print(f"Run package build command [{" ".join([str(arg) for arg in pkg_build_arguments])}]") - subprocess.run(pkg_build_arguments) + subprocess.run(pkg_build_arguments, check=True) # This automatically generates a distribution.xml file that is used to build the installer. # If you want to make any changes to how the installer functions, this file should be changed to do that. @@ -69,7 +70,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v Path(dist_path, "distribution.xml"), # Output location for sythesized distributions file ] print(f"Run distribution creation command [{" ".join([str(arg) for arg in distribution_creation_arguments])}]") - subprocess.run(distribution_creation_arguments) + subprocess.run(distribution_creation_arguments, check=True) # This creates the distributable package (Installer) installer_creation_arguments = [ @@ -83,7 +84,7 @@ def build_pkg(dist_path: str, app_filename: str, component_filename: str, cura_v installer_creation_arguments.extend(["--sign", codesign_identity]) print(f"Run installer creation command [{" ".join([str(arg) for arg in installer_creation_arguments])}]") - subprocess.run(installer_creation_arguments) + subprocess.run(installer_creation_arguments, check=True) def notarize_file(dist_path: str, filename: str) -> None: @@ -102,7 +103,8 @@ def notarize_file(dist_path: str, filename: str) -> None: Path(dist_path, filename) ] - subprocess.run(notarize_arguments) + print(f"Run notarize command [{" ".join([str(arg) for arg in notarize_arguments])}]") + subprocess.run(notarize_arguments, check=True) def create_pkg_installer(filename: str, dist_path: str, cura_version: str, app_name: str) -> None: From 80b7babdeac43794a0a9dab0193d3326665efa5f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 2 Dec 2024 15:35:00 +0100 Subject: [PATCH 105/166] Bump pyinstaller version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index e13e116e42..9d4282274a 100644 --- a/conandata.yml +++ b/conandata.yml @@ -661,7 +661,7 @@ pip_requirements_dev: pip_requirements_installer: any_os: - pyinstaller: { version: "6.3.0" } + pyinstaller: { version: "6.11.1" } pyinstaller-hooks-contrib: {} python_translation_source_folders: From 285126e65a6fc64bb686aaba91d8ce6253b50482 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 10:09:10 +0100 Subject: [PATCH 106/166] Remove pywin32 explicit dependency --- conandata.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/conandata.yml b/conandata.yml index 9d4282274a..535a0f41dc 100644 --- a/conandata.yml +++ b/conandata.yml @@ -625,32 +625,6 @@ pip_requirements_core: - sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 - pywin32: - version: "308" - hashes: - - sha256:796ff4426437896550d2981b9c2ac0ffd75238ad9ea2d3bfa67a1abd546d262e - - sha256:4fc888c59b3c0bef905ce7eb7e2106a07712015ea1c8234b703a088d46110e8e - - sha256:a5ab5381813b40f264fa3495b98af850098f814a25a63589a8e9eb12560f450c - - sha256:5d8c8015b24a7d6855b1550d8e660d8daa09983c80e5daf89a273e5c6fb5095a - - sha256:575621b90f0dc2695fec346b2d6302faebd4f0f45c05ea29404cefe35d89442b - - sha256:100a5442b7332070983c4cd03f2e906a5648a5104b8a7f50175f7906efd16bb6 - - sha256:587f3e19696f4bf96fde9d8a57cec74a57021ad5f204c9e627e15c33ff568897 - - sha256:00b3e11ef09ede56c6a43c71f2d31857cf7c54b0ab6e78ac659497abd2834f47 - - sha256:9b4de86c8d909aed15b7011182c8cab38c8850de36e6afb1f0db22b8959e3091 - - sha256:1c44539a37a5b7b21d02ab34e6a4d314e0788f1690d65b48e9b0b89f31abbbed - - sha256:fd380990e792eaf6827fcb7e187b2b4b1cede0585e3d0c9e84201ec27b9905e4 - - sha256:ef313c46d4c18dfb82a2431e3051ac8f112ccee1a34f29c263c583c568db63cd - - sha256:1f696ab352a2ddd63bd07430080dd598e6369152ea13a25ebcdd2f503a38f1ff - - sha256:13dcb914ed4347019fbec6697a01a0aec61019c1046c2b905410d197856326a6 - - sha256:5794e764ebcabf4ff08c555b31bd348c9025929371763b2183172ff4708152f0 - - sha256:3b92622e29d651c6b783e368ba7d6722b1634b8e70bd376fd7610fe1992e19de - - sha256:7873ca4dc60ab3287919881a7d4f88baee4a6e639aa6962de25a98ba6b193341 - - sha256:71b3322d949b4cc20776436a9c9ba0eeedcbc9c650daa536df63f0ff111bb920 - pywin32-ctypes: - version: "0.2.3" - hashes: - - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 - - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 pip_requirements_dev: any_os: From 23edcccfb158bf731b33374ccec0271c0839f916 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 10:25:08 +0100 Subject: [PATCH 107/166] Restore pywin32-ctypes and bump keyring version --- conandata.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 535a0f41dc..e53390c476 100644 --- a/conandata.yml +++ b/conandata.yml @@ -600,7 +600,7 @@ pip_requirements_core: - sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 - sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 keyring: - version: "23.0.1" + version: "25.5.0" hashes: - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 @@ -625,6 +625,11 @@ pip_requirements_core: - sha256:b435857b9efcbfc12f8c326ef0383f26416272260455bbca2cd8d8eca470c546 - sha256:7d972cfa8439bdcb35a7be78b7ef86d73b34b808c74be56dfa785c8a93b851bf - sha256:72068b206ee809c9c596b57b5287259ea41ddb4774d86725b19f35bf56aa32a9 + pywin32-ctypes: + version: "0.2.3" + hashes: + - sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8 + - sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755 pip_requirements_dev: any_os: From 00f599aac24e1a1c1b8cc295b337eb0c03338ddb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 10:37:50 +0100 Subject: [PATCH 108/166] Add hashes for dependencies of keyring --- conandata.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index e53390c476..202eca9f8d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -602,8 +602,28 @@ pip_requirements_core: keyring: version: "25.5.0" hashes: - - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 + - sha256:e67f8ac32b04be4714b42fe84ce7dad9c40985b9ca827c592cc303e7c26d9741 + - sha256:4c753b3ec91717fe713c4edd522d625889d8973a349b0e582622f49766de58e6 + jaraco.classes: + version: "3.4.0" + hashes: + - sha256:f662826b6bed8cace05e7ff873ce0f9283b5c924470fe664fff1c2f00f581790 + - sha256:47a024b51d0239c0dd8c8540c6c7f484be3b8fcf0b2d85c13825780d3b3f3acd + jaraco.functools: + version: "4.1.0" + hashes: + - sha256:ad159f13428bc4acbf5541ad6dec511f91573b90fba04df61dafa2a1231cf649 + - sha256:70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d + jaraco.context: + version: "6.0.1" + hashes: + - sha256:f797fc481b490edb305122c9181830a3a5b76d84ef6d1aef2fb9b47ab956f9e4 + - sha256:9bae4ea555cf0b14938dc0aee7c9f32ed303aa20a3b73e7dc80111628792d1b3 + more_itertools: + version: "10.5.0" + hashes: + - sha256:037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef + - sha256:5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6 charset-normalizer: version: "2.1.0" hashes: From 67924d2e37a0a63594b8c87c344a96d327f5b774 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 12:50:33 +0100 Subject: [PATCH 109/166] Bump dependencies versions --- conandata.yml | 59 +++------------------------------------------------ 1 file changed, 3 insertions(+), 56 deletions(-) diff --git a/conandata.yml b/conandata.yml index 202eca9f8d..4ae5da854c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -531,69 +531,16 @@ pip_requirements_core: hashes: - sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 - sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4 - cffi: - version: "1.15.0" - hashes: - - sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962 - - sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0 - - sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14 - - sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27 - - sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023 - - sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474 - - sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6 - - sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 - - sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e - - sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7 - - sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 - - sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c - - sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962 - - sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382 - - sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55 - - sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0 - - sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e - - sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39 - - sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc - - sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032 - - sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8 - - sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605 - - sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e - - sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc - - sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636 - - sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4 - - sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997 - - sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b - - sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2 - - sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7 - - sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66 - - sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029 - - sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880 - - sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20 - - sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024 - - sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e - - sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728 - - sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6 - - sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c - - sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443 - - sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a - - sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37 - - sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a - - sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e - - sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796 - - sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df - - sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8 - - sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a - - sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139 - - sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 urllib3: version: "2.2.3" hashes: - sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac - sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9 jeepney: - version: "0.7.1" + version: "0.8.0" hashes: - - sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac - - sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f + - sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 + - sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 SecretStorage: version: "3.3.3" hashes: From 3ac81e54c05c9cec4359a8ce5bedf41c1177d9d0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 14:33:14 +0100 Subject: [PATCH 110/166] Require explicit arguments --- packaging/msi/create_windows_msi.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py index 268fc670a2..e44a9a924b 100644 --- a/packaging/msi/create_windows_msi.py +++ b/packaging/msi/create_windows_msi.py @@ -7,6 +7,7 @@ import os import shutil import subprocess import uuid +import semver from datetime import datetime from pathlib import Path @@ -20,11 +21,12 @@ def work_path(filename: Path) -> Path: return filename.parent -def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: str): +def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: str, version: str): source_loc = Path(os.getcwd(), source_path) dist_loc = Path(os.getcwd(), dist_path) work_loc = work_path(filename) work_loc.mkdir(parents=True, exist_ok=True) + parsed_version = semver.Version.parse(version) jinja_template_path = Path(source_loc.joinpath("packaging", "msi", "UltiMaker-Cura.wxs.jinja")) with open(jinja_template_path, "r") as f: @@ -33,10 +35,10 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s wxs_content = template.render( app_name=f"{app_name}", main_app="UltiMaker-Cura.exe", - version=os.getenv('CURA_VERSION_FULL'), - version_major=os.environ.get("CURA_VERSION_MAJOR"), - version_minor=os.environ.get("CURA_VERSION_MINOR"), - version_patch=os.environ.get("CURA_VERSION_PATCH"), + version=version, + version_major=str(parsed_version.major), + version_minor=str(parsed_version.minor), + version_patch=str(parsed_version.patch), company="UltiMaker", web_site="https://ultimaker.com", year=datetime.now().year, @@ -111,12 +113,13 @@ def build(dist_path: Path, filename: Path): if __name__ == "__main__": parser = argparse.ArgumentParser(description="Create Windows msi installer of Cura.") - parser.add_argument("source_path", type=Path, help="Path to Conan install Cura folder.") - parser.add_argument("dist_path", type=Path, help="Path to Pyinstaller dist folder") - parser.add_argument("filename", type=Path, + parser.add_argument("--source_path", type=Path, help="Path to Conan install Cura folder.") + parser.add_argument("--dist_path", type=Path, help="Path to Pyinstaller dist folder") + parser.add_argument("--filename", type=Path, help="Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.msi')") - parser.add_argument("name", type=str, help="App name (e.g. 'UltiMaker Cura')") + parser.add_argument("--name", type=str, help="App name (e.g. 'UltiMaker Cura')") + parser.add_argument("--version", type=str, help="The full cura version, e.g. 5.9.0-beta.1+24132") args = parser.parse_args() - generate_wxs(args.source_path.resolve(), args.dist_path.resolve(), args.filename.resolve(), args.name) + generate_wxs(args.source_path.resolve(), args.dist_path.resolve(), args.filename.resolve(), args.name, args.version) cleanup_artifacts(args.dist_path.resolve()) build(args.dist_path.resolve(), args.filename) From 909efcb32807f385f2695bdd882ad25eeaf911d5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 14:57:17 +0100 Subject: [PATCH 111/166] Require explicit arguments --- packaging/NSIS/create_windows_installer.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py index 5ec31c8e35..3f0f651435 100644 --- a/packaging/NSIS/create_windows_installer.py +++ b/packaging/NSIS/create_windows_installer.py @@ -5,6 +5,7 @@ import os import argparse # Command line arguments parsing and help. import subprocess +import semver import shutil from datetime import datetime @@ -14,11 +15,12 @@ from pathlib import Path from jinja2 import Template -def generate_nsi(source_path: str, dist_path: str, filename: str): +def generate_nsi(source_path: str, dist_path: str, filename: str, version: str): dist_loc = Path(os.getcwd(), dist_path) source_loc = Path(os.getcwd(), source_path) instdir = Path("$INSTDIR") dist_paths = [p.relative_to(dist_loc.joinpath("UltiMaker-Cura")) for p in sorted(dist_loc.joinpath("UltiMaker-Cura").rglob("*")) if p.is_file()] + parsed_version = semver.Version.parse(version) mapped_out_paths = {} for dist_path in dist_paths: if "__pycache__" not in dist_path.parts: @@ -44,10 +46,10 @@ def generate_nsi(source_path: str, dist_path: str, filename: str): nsis_content = template.render( app_name = f"UltiMaker Cura {os.getenv('CURA_VERSION_FULL')}", main_app = "UltiMaker-Cura.exe", - version = os.getenv('CURA_VERSION_FULL'), - version_major = os.environ.get("CURA_VERSION_MAJOR"), - version_minor = os.environ.get("CURA_VERSION_MINOR"), - version_patch = os.environ.get("CURA_VERSION_PATCH"), + version = version, + version_major = str(parsed_version.major), + version_minor = str(parsed_version.minor), + version_patch = str(parsed_version.patch), company = "UltiMaker", web_site = "https://ultimaker.com", year = datetime.now().year, @@ -74,9 +76,10 @@ def build(dist_path: str): if __name__ == "__main__": parser = argparse.ArgumentParser(description = "Create Windows exe installer of Cura.") - parser.add_argument("source_path", type=str, help="Path to Conan install Cura folder.") - parser.add_argument("dist_path", type=str, help="Path to Pyinstaller dist folder") - parser.add_argument("filename", type = str, help = "Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.exe')") + parser.add_argument("--source_path", type=str, help="Path to Conan install Cura folder.") + parser.add_argument("--dist_path", type=str, help="Path to Pyinstaller dist folder") + parser.add_argument("--filename", type = str, help = "Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.exe')") + parser.add_argument("--version", type=str, help="The full cura version, e.g. 5.9.0-beta.1+24132") args = parser.parse_args() - generate_nsi(args.source_path, args.dist_path, args.filename) + generate_nsi(args.source_path, args.dist_path, args.filename, args.version) build(args.dist_path) From cb9a948e9d33ac432e5b8e797cd88cbeee21b4a3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 15:01:43 +0100 Subject: [PATCH 112/166] Fix installer name --- packaging/NSIS/create_windows_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py index 3f0f651435..375ad25b01 100644 --- a/packaging/NSIS/create_windows_installer.py +++ b/packaging/NSIS/create_windows_installer.py @@ -44,7 +44,7 @@ def generate_nsi(source_path: str, dist_path: str, filename: str, version: str): nsis_content = template.render( - app_name = f"UltiMaker Cura {os.getenv('CURA_VERSION_FULL')}", + app_name = f"UltiMaker Cura {version}", main_app = "UltiMaker-Cura.exe", version = version, version_major = str(parsed_version.major), From e2487377cc1b3928c74bf6c89b0412cd2375cfa6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 3 Dec 2024 16:21:12 +0100 Subject: [PATCH 113/166] Remove QtNetwork-Auth unused dependency --- conandata.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/conandata.yml b/conandata.yml index 4ae5da854c..b07b5b1078 100644 --- a/conandata.yml +++ b/conandata.yml @@ -259,20 +259,6 @@ pip_requirements_core: any_os: charon: url: "git+https://github.com/ultimaker/libcharon@master/s-line#egg=charon" - PyQt6-NetworkAuth: - version: "6.6.0" - hashes: - - sha256:7b90b81792fe53105287c8cbb5e4b22bc44a482268ffb7d3e33f852807f86182 - - sha256:f60ff9a62f5129dc2a9d4c495fb47f9a03e4dfb666b50fb7d61f46e89bf7b6a2 - - sha256:c7e2335159aa795e2fe6fb069ccce6308672ab80f26c50fab57caf957371cbb5 - - sha256:cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb - PyQt6-NetworkAuth-Qt6: - version: "6.6.0" - hashes: - - sha256:bcd56bfc892fec961c51eba3c0bf32ba8317a762d9e254d3830569611ed569d6 - - sha256:4cc48fd375730a0ba5fbed9d64abb2914f587377560a78a63aff893f9e276a45 - - sha256:481d9093e1fb1ac6843d8beabcd359cc34b74b9a2cbb3e2b68d96bd3f178d4e0 - - sha256:5006deabf55304d4a3e0b3c954f93e5835546b11e789d14653a2493d12d3a063 certifi: version: "2023.5.7" hashes: From 41526bfe7018865a179d36e719ae67b676e9570f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 4 Dec 2024 15:01:15 +0100 Subject: [PATCH 114/166] Prepare for merge CURA-11622 --- .github/workflows/conan-package-resources.yml | 3 +- .github/workflows/conan-package.yml | 3 +- .github/workflows/installers.yml | 7 ++-- .github/workflows/linux.yml | 3 +- .github/workflows/macos.yml | 3 +- .github/workflows/nightly-stable.yml | 6 ++-- .github/workflows/nightly-testing.yml | 6 ++-- .github/workflows/nightly.yml | 6 ++-- .../notify_on_print_profile_change.yml | 36 ------------------- .github/workflows/printer-linter-format.yml | 16 ++------- .../workflows/printer-linter-pr-diagnose.yml | 18 ++-------- .../release-process_feature-freeze.yml | 3 +- .../release-process_release-candidate.yml | 11 +++--- .github/workflows/unit-test.yml | 3 +- .github/workflows/update-translation.yml | 3 +- .github/workflows/windows.yml | 3 +- conandata.yml | 18 +++++----- resources/conanfile.py | 4 --- 18 files changed, 34 insertions(+), 118 deletions(-) delete mode 100644 .github/workflows/notify_on_print_profile_change.yml diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index dbc2558a43..3a56e61a9c 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -21,9 +21,8 @@ on: - '[0-9].[0-9][0-9]*' jobs: -# FIXME: Use main once merged conan-package: - uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main with: conan_recipe_root: "./resources/" platform_windows: false diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 961052d69f..55123dc374 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -33,7 +33,6 @@ on: - '[0-9].[0-9][0-9]*' jobs: -# FIXME: Use main once merged conan-package: - uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main secrets: inherit diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index f19af8a745..3ce0aec312 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -24,12 +24,11 @@ on: jobs: installers: -# FIXME: Use main once merged name: Create installers - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise == 'true' }} - staging: ${{ inputs.staging == 'true' }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} secrets: inherit diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6d428a8cc9..f4d5052c0d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,9 +34,8 @@ on: - self-hosted-Ubuntu22-X64 jobs: -# FIXME: Use main once merged linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 12f58616ae..ffc9b27b8b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -43,9 +43,8 @@ on: - macos-12 jobs: -# FIXME: Use main once merged macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index d8e1754fcf..02cb71195d 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -8,10 +8,8 @@ on: jobs: build-nightly: -# FIXME: Use main once merged - uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + uses: ./.github/workflows/nightly.yml with: -# FIXME: Use stable channel once merged - cura_conan_version: "cura/[*]@ultimaker/cura_11622" + cura_conan_version: "cura/[*]@ultimaker/stable" release_tag: "nightly" caller_workflow: "nightly-stable.yml" diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index 0d66c17e20..207634d81c 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -8,10 +8,8 @@ on: jobs: build-nightly: -# FIXME: Use main once merged - uses: ultimaker/cura/.github/workflows/nightly.yml@CURA-11622_conan_v2 + uses: ./.github/workflows/nightly.yml with: -# FIXME: Use testing channel once merged - cura_conan_version: "cura/[*]@ultimaker/cura_11622" + cura_conan_version: "cura/[*]@ultimaker/testing" release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4b7403b7e9..933b7210b6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -19,8 +19,7 @@ jobs: create-installers: name: Create installers id: create-installers -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} secrets: inherit @@ -31,8 +30,7 @@ jobs: needs: [ create-installers ] steps: - name: Setup the build environment -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - name: Download installers jobs artifacts uses: actions/download-artifact@v4 diff --git a/.github/workflows/notify_on_print_profile_change.yml b/.github/workflows/notify_on_print_profile_change.yml deleted file mode 100644 index c8747a9828..0000000000 --- a/.github/workflows/notify_on_print_profile_change.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: notify_on_print_profile_change - -on: - push: - branches: [ "main" ] - paths: - - 'resources/definitions/fdmprinter.def.json' - - 'resources/definitions/ultimaker**' - - 'resources/extruders/ultimaker**' - - 'resources/intent/ultimaker**' - - 'resources/quality/ultimaker**' - - 'resources/variants/ultimaker**' - pull_request: - branches: [ "main" ] - paths: - - 'resources/definitions/fdmprinter.def.json' - - 'resources/definitions/ultimaker**' - - 'resources/extruders/ultimaker**' - - 'resources/intent/ultimaker**' - - 'resources/quality/ultimaker**' - - 'resources/variants/ultimaker**' -permissions: {} -jobs: - slackNotification: - name: Slack Notification - runs-on: ubuntu-latest - steps: - - name: Ultimaker Print Profile Changed - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_CHANNEL: profile-changes - SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: '#00FF00' - SLACK_TITLE: Print profiles changed - MSG_MINIMAL: commit - SLACK_WEBHOOK: ${{ secrets.SLACK_CURA_PPM_HOOK }} \ No newline at end of file diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 07ba8bb989..9e208f46a4 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -15,8 +15,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 + - name: Setup the build environment + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - uses: greguintow/get-diff-action@v7 with: @@ -24,18 +24,6 @@ jobs: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg - - name: Setup Python and pip - if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v5 - with: - python-version: 3.11.x - cache: 'pip' - cache-dependency-path: .github/workflows/requirements-printer-linter.txt - - - name: Install Python requirements for runner - if: env.GIT_DIFF && !env.MATCHED_FILES - run: pip install -r .github/workflows/requirements-printer-linter.txt - - name: Format file if: env.GIT_DIFF && !env.MATCHED_FILES run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }} diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index 106c9123e6..8feecdb3ee 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -14,10 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 2 + - name: Setup the build environment + uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - uses: greguintow/get-diff-action@v7 with: @@ -26,18 +24,6 @@ jobs: resources/+(extruders|definitions)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg - - name: Setup Python and pip - if: env.GIT_DIFF && !env.MATCHED_FILES # If nothing happens with python and/or pip after, the clean-up crashes. - uses: actions/setup-python@v5 - with: - python-version: 3.11.x - cache: "pip" - cache-dependency-path: .github/workflows/requirements-printer-linter.txt - - - name: Install Python requirements for runner - if: env.GIT_DIFF && !env.MATCHED_FILES - run: pip install -r .github/workflows/requirements-printer-linter.txt - - name: Create results directory run: mkdir printer-linter-result diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index 07242790ce..de15d5c310 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -25,8 +25,7 @@ jobs: feature-freeze: name: Process feature freeze -# FIXME: Use main once merged - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index caa132c830..b4454d5fef 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -32,8 +32,7 @@ jobs: freeze-packages-versions: name: Freeze packges versions -# FIXME: Use main once merged - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-11622_conan_v2 + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} @@ -103,8 +102,7 @@ jobs: create-packages: name: Create conan packages -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main needs: [parse-version, freeze-packages-versions] strategy: matrix: @@ -114,15 +112,14 @@ jobs: - repository: Cura conan_recipe_root: "resources" with: - repository: Ultimaker/${{ matrix.repository }} + repository: ${{ matrix.repository }} branch: ${{ needs.parse-version.outputs.branch_name }} conan_recipe_root: ${{ matrix.conan_recipe_root }} secrets: inherit create-installers: name: Create installers -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main needs: [parse-version, create-packages] with: cura_conan_version: cura/${{ inputs.cura_version }}@ultimaker/stable diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index fb997464d1..4761a32907 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -40,7 +40,6 @@ on: jobs: testing: name: Run unit tests -# FIXME: use main once merged - uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main with: test_use_pytest: true diff --git a/.github/workflows/update-translation.yml b/.github/workflows/update-translation.yml index aa897e5e2c..189390410b 100644 --- a/.github/workflows/update-translation.yml +++ b/.github/workflows/update-translation.yml @@ -10,7 +10,6 @@ on: jobs: update-translations: -# FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@main with: branch: ${{ inputs.branch }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2ff8dffe91..bdfc92e5ab 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -35,8 +35,7 @@ on: jobs: windows-installer: - # FIXME: Use main once merged - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} diff --git a/conandata.yml b/conandata.yml index b07b5b1078..02f044423f 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,16 +1,16 @@ version: "5.10.0-alpha.0" requirements: - - "cura_resources/5.10.0-alpha.0@ultimaker/cura_11622" - - "uranium/5.10.0-alpha.0@ultimaker/cura_11622" - - "curaengine/5.10.0-alpha.0@ultimaker/cura_11622" - - "cura_binary_data/5.10.0-alpha.0@ultimaker/cura_11622" - - "fdm_materials/5.10.0-alpha.0@ultimaker/cura_11622" - - "dulcificum/0.2.1@ultimaker/cura_11622" - - "pysavitar/5.4.0-alpha.0@ultimaker/cura_11622" - - "pynest2d/5.4.0-alpha.0@ultimaker/cura_11622" + - "cura_resources/5.10.0-alpha.0@ultimaker/testing" + - "uranium/5.10.0-alpha.0@ultimaker/testing" + - "curaengine/5.10.0-alpha.0@ultimaker/testing" + - "cura_binary_data/5.10.0-alpha.0@ultimaker/testing" + - "fdm_materials/5.10.0-alpha.0@ultimaker/testing" + - "dulcificum/0.2.1@ultimaker/stable" + - "pysavitar/5.4.0-alpha.0@ultimaker/stable" + - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - "fdm_materials/5.8.1" - - "cura_private_data/5.10.0-alpha.0@internal/cura_11622" + - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: diff --git a/resources/conanfile.py b/resources/conanfile.py index 4f2e9af467..aea89f4569 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -36,10 +36,6 @@ class CuraResource(ConanFile): copy(self, pattern="*", src=os.path.join(self.recipe_folder, shared_resources), dst=os.path.join(self.export_sources_folder, shared_resources)) - def validate(self): - if Version(self.version) <= Version("4"): - raise ConanInvalidConfiguration("Only versions 5+ are support") - def layout(self): self.cpp.source.resdirs = self._shared_resources self.cpp.package.resdirs = [f"res/{res}" for res in self._shared_resources] From 10633d4ffa05566e63039517ba870dc8dbccfdf2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 4 Dec 2024 15:10:13 +0100 Subject: [PATCH 115/166] Remove now-useless script generation --- conanfile.py | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/conanfile.py b/conanfile.py index 0bd04d3363..5501b189a1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -28,7 +28,7 @@ class CuraConan(ConanFile): tool_requires = "gettext/0.22.5" # FIXME: Remove specific branch once merged to main - python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622" + python_requires = "translationextractor/[>=2.2.0]@ultimaker/stable" options = { "enterprise": [True, False], @@ -455,27 +455,6 @@ class CuraConan(ConanFile): copy(self, "*", uranium.resdirs[1], str(self._share_dir.joinpath("uranium", "plugins")), keep_path = True) copy(self, "*", uranium.libdirs[0], str(self._site_packages.joinpath("UM")), keep_path = True) - # Generate the GitHub Action version info Environment - version = self.conf.get("user.cura:version", default = self.version, check_type = str) - cura_version = Version(version) - env_prefix = "Env:" if self.settings.os == "Windows" else "" - activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV -echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV - """).render(cura_version_major = cura_version.major, - cura_version_minor = cura_version.minor, - cura_version_patch = cura_version.patch, - cura_version_build = cura_version.build if cura_version.build != "" else "0", - cura_version_full = self.version, - cura_app_name = self._app_name, - env_prefix = env_prefix) - - ext = ".sh" if self.settings.os != "Windows" else ".ps1" - save(self, os.path.join(self._script_dir, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) - self._generate_cura_version(os.path.join(self._site_packages, "cura")) self._delete_unwanted_binaries(self._site_packages) From e01f97660594647494249c2d4ec7afb316dd466b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 5 Dec 2024 08:34:19 +0100 Subject: [PATCH 116/166] Fiux nightly workflow 'id' is not a valid attribute for jobs CURA-11622 --- .github/workflows/nightly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 933b7210b6..50932c8702 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,7 +18,6 @@ on: jobs: create-installers: name: Create installers - id: create-installers uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} From 6445cb05462ae13e1f8ea68c977409e94fe0e3c0 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 5 Dec 2024 20:13:17 +0100 Subject: [PATCH 117/166] (Win installer) PyInstaller missed this module, supposedly adding it as a hidden import helps. part of CURA-11622 --- conandata.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conandata.yml b/conandata.yml index 02f044423f..910a7fa0f4 100644 --- a/conandata.yml +++ b/conandata.yml @@ -107,6 +107,7 @@ pyinstaller: - "fcntl" - "stl" - "serial" + - "win32timezone" collect_all: - "cura" - "UM" From e2e46cd75bcc2ce90244fef8e5365173e45bc6ab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 6 Dec 2024 10:22:40 +0100 Subject: [PATCH 118/166] Properly use the new common workflow --- .github/workflows/unit-test-post.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/unit-test-post.yml b/.github/workflows/unit-test-post.yml index a8e9f26b8b..7930765d7c 100644 --- a/.github/workflows/unit-test-post.yml +++ b/.github/workflows/unit-test-post.yml @@ -9,6 +9,5 @@ jobs: publish-test-results: uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@main with: - event: ${{ github.event.workflow_run.event }} - conclusion: ${{ github.event.workflow_run.conclusion }} + workflow_run_json: ${{ toJSON(github.event.workflow_run) }} secrets: inherit From d50237f3922d7556548e17c3e757ef3eddff0c94 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 6 Dec 2024 16:39:59 +0100 Subject: [PATCH 119/166] Pass secrets to common nightly workflow --- .github/workflows/nightly-stable.yml | 1 + .github/workflows/nightly-testing.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index 02cb71195d..f548b81875 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -13,3 +13,4 @@ jobs: cura_conan_version: "cura/[*]@ultimaker/stable" release_tag: "nightly" caller_workflow: "nightly-stable.yml" + secrets: inherit diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index 207634d81c..160ad5c46d 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -13,3 +13,4 @@ jobs: cura_conan_version: "cura/[*]@ultimaker/testing" release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" + secrets: inherit From 30205e1c784bb1a2654d674c810f6e5d9d55f95a Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 7 Dec 2024 16:10:42 +0100 Subject: [PATCH 120/166] Update description Add (restart required) --- resources/qml/Preferences/GeneralPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index a686fca8e5..62cab53a78 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -669,12 +669,12 @@ UM.PreferencesPage { width: childrenRect.width height: childrenRect.height - text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped?") + text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped? This will only affect model's Y coordinate, all other settings such as machine Printhead settings are unaffected and still behave as before.") UM.CheckBox { id: flipToolhandleYCheckbox - text: catalog.i18nc("@option:check", "Flip toolhandle Y axis") + text: catalog.i18nc("@option:check", "Flip model's toolhandle Y axis (restart required)") checked: boolCheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle")) onCheckedChanged: UM.Preferences.setValue("tool/flip_y_axis_tool_handle", checked) } From d8b3e773ab4cdae808352f5f3c734fefa297d6f2 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 08:22:26 +0100 Subject: [PATCH 121/166] update label for clarity Greg's proposal: add details to clarify what the Y min & Y max refer to --- plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index c2238d2205..d40efbee8a 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -214,7 +214,7 @@ Item settingStoreIndex: propertyStoreIndex - labelText: catalog.i18nc("@label", "Y min") + labelText: catalog.i18nc("@label", "Y min ( '-' towards back)") labelFont: base.labelFont labelWidth: base.labelWidth controlWidth: base.controlWidth @@ -254,7 +254,7 @@ Item settingKey: "machine_head_with_fans_polygon" settingStoreIndex: propertyStoreIndex - labelText: catalog.i18nc("@label", "Y max") + labelText: catalog.i18nc("@label", "Y max ( '+' towards front)") labelFont: base.labelFont labelWidth: base.labelWidth controlWidth: base.controlWidth From 4c686afcb6acf1cd0e7dc3879f2027d2211dd1f0 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 08:23:40 +0100 Subject: [PATCH 122/166] Update machine head & fan polygon description Greg's proposal: add details to clarify what the Y min & Y max refer to. Previous description was unclear and referred to front of print head as being a negative value which is not accurate. --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0..de47e3ff86 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -461,7 +461,7 @@ "machine_head_with_fans_polygon": { "label": "Machine Head & Fan Polygon", - "description": "The shape of the print head. These are coordinates relative to the position of the print head, which is usually the position of its first extruder. The dimensions left and in front of the print head must be negative coordinates.", + "description": "The dimensions of the print head used to determine 'Safe Model Distance' when printing 'One at a Time'. These numbers relate to the centerline of the first extruder nozzle. Left of the nozzle is 'X Min' and must be negative. Rear of the nozzle is 'Y Min' and must be negative. X Max (right) and Y Max (front) are positive numbers. Gantry height is the dimension from the build plate to the X gantry beam.", "type": "polygon", "default_value": [ [-20, 10], From d5cf5f66acc2e4d8cf56149f88913d862456f238 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Dec 2024 07:25:19 +0000 Subject: [PATCH 123/166] Applied printer-linter format --- Cura-workflows | 1 + pydir.txt | 1 + 2 files changed, 2 insertions(+) create mode 160000 Cura-workflows create mode 100644 pydir.txt diff --git a/Cura-workflows b/Cura-workflows new file mode 160000 index 0000000000..a38e2d1e10 --- /dev/null +++ b/Cura-workflows @@ -0,0 +1 @@ +Subproject commit a38e2d1e1029e5a350f7ecbee037e7ccabb7044a diff --git a/pydir.txt b/pydir.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/pydir.txt @@ -0,0 +1 @@ + From c6a2ccec1e82b566451fb55e78835a5015adade4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 08:27:11 +0100 Subject: [PATCH 124/166] Remove duplicated keychain entry. part of CURA-11622 --- conandata.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conandata.yml b/conandata.yml index 910a7fa0f4..997bac3365 100644 --- a/conandata.yml +++ b/conandata.yml @@ -275,11 +275,6 @@ pip_requirements_core: hashes: - sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4 - sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6 - keyring: - version: "23.0.1" - hashes: - - sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - - sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 trimesh: version: "3.9.36" hashes: From 23cc0b4d01e1b635c0d2ca87f386067b7f780153 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 08:27:43 +0100 Subject: [PATCH 125/166] Hopefully all of the hidden imports are OK now for keyring. part of CURA-11622 --- conandata.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conandata.yml b/conandata.yml index 997bac3365..7b61e16ac3 100644 --- a/conandata.yml +++ b/conandata.yml @@ -107,7 +107,16 @@ pyinstaller: - "fcntl" - "stl" - "serial" + - "win32cred" - "win32timezone" + - "win32ctypes.core.ctypes" + - "win32ctypes.core.ctypes._common" + - "win32ctypes.core.ctypes._dll" + - "win32ctypes.core.ctypes._resource" + - "win32ctypes.core.ctypes._system_information" + - "win32ctypes.core.ctypes._time" + - "win32ctypes.core.ctypes._authentication" + - "pkgutil" collect_all: - "cura" - "UM" @@ -119,6 +128,7 @@ pyinstaller: - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" + - "keyrings.alt" icon: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" From ef02ab543e998d0544022af076e09ccf3e0152e3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 09:25:49 +0100 Subject: [PATCH 126/166] Try if we can get rid of this workaround. done part of CURA-11622 --- cura/OAuth2/KeyringAttribute.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cura/OAuth2/KeyringAttribute.py b/cura/OAuth2/KeyringAttribute.py index 58b45a67ef..adaa01621c 100644 --- a/cura/OAuth2/KeyringAttribute.py +++ b/cura/OAuth2/KeyringAttribute.py @@ -16,8 +16,6 @@ if TYPE_CHECKING: import sys from UM.Platform import Platform if Platform.isWindows(): - if hasattr(sys, "frozen"): - import win32timezone from keyring.backends.Windows import WinVaultKeyring keyring.set_keyring(WinVaultKeyring()) if Platform.isOSX(): From e2c3dd62ce6b90a92306b293f66943bcd793cb61 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 13:16:29 +0100 Subject: [PATCH 127/166] Try to fix that not all pyqt dynamic libs are in the win-install. part of CURA-11622 --- conandata.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conandata.yml b/conandata.yml index 7b61e16ac3..c125ed5082 100644 --- a/conandata.yml +++ b/conandata.yml @@ -125,6 +125,7 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" + - "PyQt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 89287f829d4c580e407e4a97f06ff46290c9f5fc Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 14:33:16 +0100 Subject: [PATCH 128/166] (win-install) That pulled in too much pyqt, try more fine-grained. part of CURA-11622 --- conandata.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index c125ed5082..c4474fe032 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,6 +100,15 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" + - "PyQt6.QtQml" + - "PyQt6.QtQuick" + - "PyQt6.QtQuick.Widgets" + - "PyQt6.QtQuick.Controls" + - "PyQt6.QtQuick.Dialogs" + - "PyQt6.QtQuick.Layouts" + - "PyQt6.QtWidgets" + - "PyQt6.QtDBus" + - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -125,7 +134,15 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" - - "PyQt6" + - "PyQt6.QtQml" + - "PyQt6.QtQuick" + - "PyQt6.QtQuick.Widgets" + - "PyQt6.QtQuick.Controls" + - "PyQt6.QtQuick.Dialogs" + - "PyQt6.QtQuick.Layouts" + - "PyQt6.QtWidgets" + - "PyQt6.QtDBus" + - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 5e59458893fc46cbdeb64c8a8e4cddb595196759 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 16:35:28 +0100 Subject: [PATCH 129/166] More needed PyQt for Windows? part of CURA-11622 --- conandata.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conandata.yml b/conandata.yml index c4474fe032..4426ffa3bc 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,6 +100,8 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" + - "PyQt6.Qt" + - "PyQt6.Qt6" - "PyQt6.QtQml" - "PyQt6.QtQuick" - "PyQt6.QtQuick.Widgets" @@ -134,6 +136,8 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" + - "PyQt6.Qt" + - "PyQt6.Qt6" - "PyQt6.QtQml" - "PyQt6.QtQuick" - "PyQt6.QtQuick.Widgets" From 55f59b79712d4897bf1d459d68ac4313efc736b1 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 17:30:27 +0100 Subject: [PATCH 130/166] Better rid of 'forbidden modules' and related folders. part of CURA-11622 --- conandata.yml | 2 +- conanfile.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 4426ffa3bc..13bd7a7492 100644 --- a/conandata.yml +++ b/conandata.yml @@ -163,7 +163,7 @@ pyinstaller: - [ "qt", "lab", "animat" ] - [ "qt", "mqtt" ] - [ "qt", "net", "auth" ] - - [ "qt", "quick3d" ] + - [ "quick3d" ] - [ "qt", "timeline" ] - [ "qt", "virt", "key" ] - [ "qt", "wayland", "compos" ] diff --git a/conanfile.py b/conanfile.py index 5501b189a1..fa15577126 100644 --- a/conanfile.py +++ b/conanfile.py @@ -179,6 +179,7 @@ class CuraConan(ConanFile): "qtmqtt", "qtnetworkauth", "qtquick3d", + "quick3d", "qtquick3dphysics", "qtquicktimeline", "qtvirtualkeyboard", @@ -207,7 +208,7 @@ class CuraConan(ConanFile): to_remove_files.append(pathname) for dirname in dir_: for forbidden in prohibited: - if forbidden.lower() == str(dirname).lower(): + if forbidden.lower() in str(dirname).lower(): pathname = os.path.join(root, dirname) to_remove_dirs.append(pathname) break From cc93e8c8664be5b16a581b83105ba3b988c99b1c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 10 Dec 2024 19:58:56 +0100 Subject: [PATCH 131/166] Prune included binaries. Hopefully get rid of Qt Quick 3D (as opposed to Qt Quick). part of CURA-11622 --- conandata.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/conandata.yml b/conandata.yml index 13bd7a7492..832670d43e 100644 --- a/conandata.yml +++ b/conandata.yml @@ -103,14 +103,6 @@ pyinstaller: - "PyQt6.Qt" - "PyQt6.Qt6" - "PyQt6.QtQml" - - "PyQt6.QtQuick" - - "PyQt6.QtQuick.Widgets" - - "PyQt6.QtQuick.Controls" - - "PyQt6.QtQuick.Dialogs" - - "PyQt6.QtQuick.Layouts" - - "PyQt6.QtWidgets" - - "PyQt6.QtDBus" - - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -120,13 +112,6 @@ pyinstaller: - "serial" - "win32cred" - "win32timezone" - - "win32ctypes.core.ctypes" - - "win32ctypes.core.ctypes._common" - - "win32ctypes.core.ctypes._dll" - - "win32ctypes.core.ctypes._resource" - - "win32ctypes.core.ctypes._system_information" - - "win32ctypes.core.ctypes._time" - - "win32ctypes.core.ctypes._authentication" - "pkgutil" collect_all: - "cura" @@ -139,14 +124,6 @@ pyinstaller: - "PyQt6.Qt" - "PyQt6.Qt6" - "PyQt6.QtQml" - - "PyQt6.QtQuick" - - "PyQt6.QtQuick.Widgets" - - "PyQt6.QtQuick.Controls" - - "PyQt6.QtQuick.Dialogs" - - "PyQt6.QtQuick.Layouts" - - "PyQt6.QtWidgets" - - "PyQt6.QtDBus" - - "PyQt6.QtGui" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From 66c1a08478d3bee614613ba56d771facfdff6493 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 09:03:14 +0100 Subject: [PATCH 132/166] Added the additional hooks folder now present in the cura-workflows repo. part of CURA-11622 --- UltiMaker-Cura.spec.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 2dce96282e..d618ca3309 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -28,7 +28,7 @@ a = Analysis( binaries=binaries, datas=datas, hiddenimports=hiddenimports, - hookspath=[], + hookspath=["Cura-workflows/runner_scripts/pyinstaller_hooks"], hooksconfig={}, runtime_hooks=[], excludes=[], From bec87b88dd99f50215591a8b687620dc6d238b86 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 10:20:49 +0100 Subject: [PATCH 133/166] (installer) Unwanted files are in there, try if it can start without. part of CURA-11622 --- conandata.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 832670d43e..8fa90458b1 100644 --- a/conandata.yml +++ b/conandata.yml @@ -102,7 +102,6 @@ pyinstaller: - "PyQt6" - "PyQt6.Qt" - "PyQt6.Qt6" - - "PyQt6.QtQml" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -123,7 +122,6 @@ pyinstaller: - "win32ctypes" - "PyQt6.Qt" - "PyQt6.Qt6" - - "PyQt6.QtQml" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" From cca70d83da6371c1ee9b44071206d07122b53046 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 11 Dec 2024 16:17:18 +0100 Subject: [PATCH 134/166] Install: Fix MacOs; Previous Windows fixes caused Mac build to fail. part of CURA-11622 --- conandata.yml | 10 ++++++---- conanfile.py | 10 ++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/conandata.yml b/conandata.yml index 8fa90458b1..dd81e0dcf5 100644 --- a/conandata.yml +++ b/conandata.yml @@ -100,8 +100,6 @@ pyinstaller: - "pyDulcificum" - "pynest2d" - "PyQt6" - - "PyQt6.Qt" - - "PyQt6.Qt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "logging.handlers" @@ -112,6 +110,9 @@ pyinstaller: - "win32cred" - "win32timezone" - "pkgutil" + hiddenimports_WINDOWS_ONLY: + - "PyQt6.Qt" + - "PyQt6.Qt6" collect_all: - "cura" - "UM" @@ -120,12 +121,13 @@ pyinstaller: - "sqlite3" - "trimesh" - "win32ctypes" - - "PyQt6.Qt" - - "PyQt6.Qt6" - "PyQt6.QtNetwork" - "PyQt6.sip" - "stl" - "keyrings.alt" + collect_all_WINDOWS_ONLY: + - "PyQt6.Qt" + - "PyQt6.Qt6" icon: Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" diff --git a/conanfile.py b/conanfile.py index fa15577126..01e2ffb579 100644 --- a/conanfile.py +++ b/conanfile.py @@ -310,6 +310,12 @@ class CuraConan(ConanFile): except Exception as ex: print(f"WARNING: Attempt to delete binary {unwanted_path} results in: {str(ex)}") + hiddenimports = pyinstaller_metadata["hiddenimports"] + collect_all = pyinstaller_metadata["collect_all"] + if self.settings.os == "Windows": + hiddenimports += pyinstaller_metadata["hiddenimports_WINDOWS_ONLY"] + collect_all += pyinstaller_metadata["collect_all_WINDOWS_ONLY"] + # Write the actual file: with open(os.path.join(location, "UltiMaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( @@ -319,8 +325,8 @@ class CuraConan(ConanFile): datas = datas, binaries = filtered_binaries, venv_script_path = str(self._script_dir), - hiddenimports = pyinstaller_metadata["hiddenimports"], - collect_all = pyinstaller_metadata["collect_all"], + hiddenimports = hiddenimports, + collect_all = collect_all, icon = icon_path, entitlements_file = entitlements_file, osx_bundle_identifier = "'nl.ultimaker.cura'" if self.settings.os == "Macos" else "None", From f54eeede77944586d219aef976fbc36122dee656 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 14:42:32 +0100 Subject: [PATCH 135/166] Fix the rename script call path --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 50932c8702..1f54826893 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -41,7 +41,7 @@ jobs: - name: Rename the installers id: rename-installers working-directory: installers - run: python ./Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT + run: python ../Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT - name: create the release notes shell: python From dd4b9e80c142991a2c9bbb07ea08b00ef1e893ab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 17:11:02 +0100 Subject: [PATCH 136/166] Allow package overrides when building installers --- .github/workflows/installers.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 3ce0aec312..1d9b057f67 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,8 +8,12 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string + package_overrides: + description: 'Space-separated List of specific packages to be used' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' type: string enterprise: @@ -28,6 +32,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From a7ac441d0fd23a0b9c38fd870f5e33be3cc7341a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 10:22:40 +0100 Subject: [PATCH 137/166] Revert "Allow package overrides when building installers" This reverts commit dd4b9e80c142991a2c9bbb07ea08b00ef1e893ab. --- .github/workflows/installers.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 1d9b057f67..3ce0aec312 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,12 +8,8 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string - package_overrides: - description: 'Space-separated List of specific packages to be used' - default: '' - type: string conan_args: - description: 'Conan args' + description: 'Conan args, e.g. --requires' default: '' type: string enterprise: @@ -32,7 +28,6 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} - package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 5d08f8eeefe5e69019fddde7a05bfac7905a0a4c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 12 Dec 2024 17:11:02 +0100 Subject: [PATCH 138/166] Allow package overrides when building installers --- .github/workflows/installers.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 3ce0aec312..1d9b057f67 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -8,8 +8,12 @@ on: description: 'Cura Conan Version' default: 'cura/[*]@ultimaker/testing' type: string + package_overrides: + description: 'Space-separated List of specific packages to be used' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' type: string enterprise: @@ -28,6 +32,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 20b311f12e248ee6b150c467e40a87ac9a70cb0f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 11:14:50 +0100 Subject: [PATCH 139/166] Set proper default version value --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f4d5052c0d..fc749b13c5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ffc9b27b8b..2a9afda211 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bdfc92e5ab..f86815d3a9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@ultimaker/testing' + default: 'cura/[*]@ultimaker/testing' required: true type: string conan_args: From 0b661203e76f1c3d41ba6ebf2b5ae90723552e3a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 11:18:08 +0100 Subject: [PATCH 140/166] Allow specific installers to have package overrides --- .github/workflows/installers.yml | 2 +- .github/workflows/linux.yml | 7 ++++++- .github/workflows/macos.yml | 7 ++++++- .github/workflows/windows.yml | 7 ++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 1d9b057f67..d63ed5bd6b 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -9,7 +9,7 @@ on: default: 'cura/[*]@ultimaker/testing' type: string package_overrides: - description: 'Space-separated List of specific packages to be used' + description: 'List of specific packages to be used (space-separated)' default: '' type: string conan_args: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fc749b13c5..66975ddf15 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args, e.g. --requires' + description: 'Conan args' default: '' required: false type: string @@ -38,6 +42,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2a9afda211..97ea2b25ad 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args: eq.: --require-override' + description: 'Conan args' default: '' required: false type: string @@ -47,6 +51,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f86815d3a9..c17d19fd72 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -9,8 +9,12 @@ on: default: 'cura/[*]@ultimaker/testing' required: true type: string + package_overrides: + description: 'List of specific packages to be used (space-separated)' + default: '' + type: string conan_args: - description: 'Conan args: eq.: --requires' + description: 'Conan args' default: '' required: false type: string @@ -38,6 +42,7 @@ jobs: uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} + package_overrides: ${{ inputs.package_overrides }} conan_args: ${{ inputs.conan_args }} enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} From 50470758b218136560e6a3e3d8ddb32b1df2fae3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 13:33:31 +0100 Subject: [PATCH 141/166] Use proper private materials data --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index dd81e0dcf5..9e4bd1e9c8 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,7 +9,7 @@ requirements: - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - - "fdm_materials/5.8.1" + - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" From 97c89edee9579999ead5f45b55a278dc4cd808e0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 15:34:19 +0100 Subject: [PATCH 142/166] Set empty package version for installers by default --- .github/workflows/installers.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index d63ed5bd6b..6dc2df99eb 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 66975ddf15..e1dd221532 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 97ea2b25ad..b5de83128c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c17d19fd72..af827ba5ea 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/[*]@ultimaker/testing' + default: '' required: true type: string package_overrides: From fb720c3a07f8af300540b21075319c2b1701bc31 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 15:40:15 +0100 Subject: [PATCH 143/166] Set version as not required --- .github/workflows/linux.yml | 1 - .github/workflows/macos.yml | 1 - .github/workflows/windows.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e1dd221532..e4cb523240 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b5de83128c..02be9703ec 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index af827ba5ea..fe96125dc9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -7,7 +7,6 @@ on: cura_conan_version: description: 'Cura Conan Version' default: '' - required: true type: string package_overrides: description: 'List of specific packages to be used (space-separated)' From cd49eb3bffa86cec2fe840ed400b03f6041d4099 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 17:27:05 +0100 Subject: [PATCH 144/166] Use proper user for private data --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 9e4bd1e9c8..56536e1176 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,7 +10,7 @@ requirements: - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - - "cura_private_data/5.10.0-alpha.0@internal/testing" + - "cura_private_data/5.10.0-alpha.0@ultimaker/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: From 86e799e565ee2ae55eb08c389c42731a39107090 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 20:21:17 +0100 Subject: [PATCH 145/166] Use fdm_materials_private when appropriate --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 01e2ffb579..659915b0ba 100644 --- a/conanfile.py +++ b/conanfile.py @@ -412,7 +412,7 @@ class CuraConan(ConanFile): # Copy materials (flat) rmdir(self, str(Path(self.source_folder, "resources", "materials"))) - fdm_materials = self.dependencies["fdm_materials"].cpp_info + fdm_materials = self.dependencies["fdm_materials_private" if self.options.internal else "fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources From ddb5aee0568bf14cd7c2c3790748e3cb49288ffa Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 20:43:19 +0100 Subject: [PATCH 146/166] Use private data from internal conan-user --- conandata.yml | 4 ++-- conanfile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conandata.yml b/conandata.yml index 56536e1176..6bec3ee231 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,8 +9,8 @@ requirements: - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - - "cura_private_data/5.10.0-alpha.0@ultimaker/testing" + - "fdm_materials/5.10.0-alpha.0@internal/testing" + - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: diff --git a/conanfile.py b/conanfile.py index 659915b0ba..01e2ffb579 100644 --- a/conanfile.py +++ b/conanfile.py @@ -412,7 +412,7 @@ class CuraConan(ConanFile): # Copy materials (flat) rmdir(self, str(Path(self.source_folder, "resources", "materials"))) - fdm_materials = self.dependencies["fdm_materials_private" if self.options.internal else "fdm_materials"].cpp_info + fdm_materials = self.dependencies["fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources From 709367419befffdda610850a9905d617d137e082 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 08:44:49 +0100 Subject: [PATCH 147/166] Fix nightly release notes creation --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1f54826893..88352a6452 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -62,7 +62,7 @@ jobs: timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")), caller_workflow=caller_workflow, branch="" if is_main else short_version, - branch_specific="" is_main else f"?branch={short_version}", + branch_specific="" if is_main else f"?branch={short_version}", )) - name: Update nightly release description and binaries From e0689f90628a0383a4f9dd7299a52827ea9bd0cb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 09:26:46 +0100 Subject: [PATCH 148/166] Remove scary warning for conan migration --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d3fa8f55ce..37978a30f9 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@
-# ⚠️ ⚠️ On 03-12-2024, we will start merging branches on all the Cura-related repositories, that contain a migration of our Conan recipes to use Conan 2, and also a huge rework on many GitHub workflows. Unfortunately, we cannot test everything until it is merged, so it is very likely that some existing workflows will stop working. If you are a developer, you may also encounter troubles when updating your branches or updating your Conan dependencies. This message will be removed when the situation is stable enough. After that, please open new issues if you are still in trouble with the new recipes/workflows. Sorry for the inconvenience. ⚠️ ⚠️ - [![Badge Issues]][Issues]    [![Badge PullRequests]][PullRequests]    [![Badge Closed]][Closed] From a8860017c7da7f87dfdb804a4ac94fed001ebdab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 16 Dec 2024 15:43:13 +0100 Subject: [PATCH 149/166] Add setting for inner combing distance to walls CURA-12236 --- resources/definitions/fdmprinter.def.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0..d998554b7a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4412,6 +4412,21 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "retraction_combing_avoid_distance": + { + "label": "Distance to Walls", + "description": "Preferred distance to outer walls when doing an inside combing travel move.", + "unit": "mm", + "type": "float", + "default_value": 0, + "value": "machine_nozzle_size * 1.5", + "minimum_value": "0", + "minimum_value_warning": "machine_nozzle_size * 0.5", + "maximum_value_warning": "machine_nozzle_size * 10", + "enabled": "resolveOrValue('retraction_combing') != 'off'", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "travel_retract_before_outer_wall": { "label": "Retract Before Outer Wall", From 0785e6f055258107785e7bd20df831d486157cc7 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Mon, 16 Dec 2024 14:44:57 +0000 Subject: [PATCH 150/166] Applied printer-linter format --- Cura-workflows | 1 + package_details.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 160000 Cura-workflows create mode 100644 package_details.txt diff --git a/Cura-workflows b/Cura-workflows new file mode 160000 index 0000000000..cabc2d7e3c --- /dev/null +++ b/Cura-workflows @@ -0,0 +1 @@ +Subproject commit cabc2d7e3cb6f5b64475de4947f1e0f68f9adf73 diff --git a/package_details.txt b/package_details.txt new file mode 100644 index 0000000000..e8b13f4250 --- /dev/null +++ b/package_details.txt @@ -0,0 +1,42 @@ +author: UltiMaker +build_policy: missing +default_options: + enterprise: False + staging: False + cloud_api_version: 1 + display_name: UltiMaker Cura + cura_debug_mode: False + internal: False + i18n_extract: False +description: 3D printer / slicing GUI built on top of the Uranium framework +generators: ['VirtualPythonEnv'] +label: +languages: [] +license: LGPL-3.0 +name: cura +options: + cloud_api_version: 1 + cura_debug_mode: False + display_name: UltiMaker Cura + enterprise: False + i18n_extract: False + internal: False + staging: False +options_definitions: + enterprise: ['True', 'False'] + staging: ['True', 'False'] + cloud_api_version: ['ANY'] + display_name: ['ANY'] + cura_debug_mode: ['True', 'False'] + internal: ['True', 'False'] + i18n_extract: ['True', 'False'] +package_type: None +python_requires: + translationextractor/2.3.0@ultimaker/stable#d504876a4742c1b92bcd6e1d5ba7509a: {'remote': 'cura-conan2', 'recipe': 'Downloaded', 'path': '/home/runner/.conan2/p/transe0e29f719efb7/e'} +requires: [{'ref': 'gettext/0.22.5', 'run': True, 'libs': False, 'skip': False, 'test': False, 'force': False, 'direct': True, 'build': True, 'transitive_headers': None, 'transitive_libs': None, 'headers': False, 'package_id_mode': None, 'visible': False}] +revision_mode: hash +settings: ['os', 'compiler', 'build_type', 'arch'] +topics: ['conan', 'python', 'pyqt6', 'qt', 'qml', '3d-printing', 'slicer'] +url: https://github.com/Ultimaker/cura +vendor: False +version: 5.10.0-alpha.0 From 0efa90a2c394765f5eba9167eb34b067829fca6a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 09:58:03 +0100 Subject: [PATCH 151/166] Fix release-notes file path --- .github/workflows/nightly.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 88352a6452..500e82c7db 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -66,11 +66,10 @@ jobs: )) - name: Update nightly release description and binaries - working-directory: installers run: | gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md - for file in "*"; do + for file in "installers/*"; do gh release upload ${{ inputs.release_tag }} $file --clobber done env: From f95d073b1bfc5aef03e095727c7e03cf597fff5b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 16:21:42 +0100 Subject: [PATCH 152/166] Use common linter workflow --- .github/workflows/printer-linter-format.yml | 43 +++++++-------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 9e208f46a4..2b9c592816 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -1,34 +1,19 @@ name: printer-linter-format on: - push: - paths: - - 'resources/definitions/**' - - 'resources/extruders/**' - - 'resources/intent/**' - - 'resources/quality/**' - - 'resources/variants/**' + push: + paths: + - 'resources/definitions/**' + - 'resources/extruders/**' + - 'resources/intent/**' + - 'resources/quality/**' + - 'resources/variants/**' jobs: - printer-linter-format: - name: Printer linter auto format - - runs-on: ubuntu-latest - steps: - - name: Setup the build environment - uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main - - - uses: greguintow/get-diff-action@v7 - with: - PATTERNS: | - resources/+(definitions|extruders)/*.def.json - resources/+(intent|quality|variants)/**/*.inst.cfg - - - name: Format file - if: env.GIT_DIFF && !env.MATCHED_FILES - run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }} - - - uses: stefanzweifel/git-auto-commit-action@v4 - if: env.GIT_DIFF && !env.MATCHED_FILES - with: - commit_message: "Applied printer-linter format" + printer-linter-format: + name: Printer linter auto format + uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main + with: + file_patterns: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg + command: python printer-linter/src/terminal.py --format + commit_message: "Apply printer-linter format" From d1932b5bdb81d49da0231574095250758b9fa8a5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 17 Dec 2024 16:32:24 +0100 Subject: [PATCH 153/166] Fix file patterns syntax, maybe --- .github/workflows/printer-linter-format.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index 2b9c592816..246170c1e4 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -14,6 +14,8 @@ jobs: name: Printer linter auto format uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main with: - file_patterns: resources/+(definitions|extruders)/*.def.json resources/+(intent|quality|variants)/**/*.inst.cfg + file_patterns: | + resources/+(definitions|extruders)/*.def.json + resources/+(intent|quality|variants)/**/*.inst.cfg command: python printer-linter/src/terminal.py --format commit_message: "Apply printer-linter format" From 5ccb96e07bb9d97663f8be48d9a7224e11c82629 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 09:10:56 +0100 Subject: [PATCH 154/166] Adjust nightly builds tags --- .github/workflows/nightly-stable.yml | 2 +- .github/workflows/nightly-testing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml index f548b81875..e166027dd8 100644 --- a/.github/workflows/nightly-stable.yml +++ b/.github/workflows/nightly-stable.yml @@ -11,6 +11,6 @@ jobs: uses: ./.github/workflows/nightly.yml with: cura_conan_version: "cura/[*]@ultimaker/stable" - release_tag: "nightly" + release_tag: "nightly-stable" caller_workflow: "nightly-stable.yml" secrets: inherit diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml index 160ad5c46d..c1ccb67f1c 100644 --- a/.github/workflows/nightly-testing.yml +++ b/.github/workflows/nightly-testing.yml @@ -11,6 +11,6 @@ jobs: uses: ./.github/workflows/nightly.yml with: cura_conan_version: "cura/[*]@ultimaker/testing" - release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever + release_tag: "nightly-testing" # Fixed version, we reuse the same tag forever caller_workflow: "nightly-testing.yml" secrets: inherit From 29cb2b121ccd7e69862a426835a77cdd5444028c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 10:24:29 +0100 Subject: [PATCH 155/166] Polish setting name and description CURA-12236 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d998554b7a..8471c59f82 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4414,8 +4414,8 @@ }, "retraction_combing_avoid_distance": { - "label": "Distance to Walls", - "description": "Preferred distance to outer walls when doing an inside combing travel move.", + "label": "Inside Travel Avoid Distance", + "description": "The distance between the nozzle and already printed outer walls when travelling inside a model.", "unit": "mm", "type": "float", "default_value": 0, From 02ab5dd0bef6098ec844d2e086d9ad174e844981 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Wed, 18 Dec 2024 09:25:46 +0000 Subject: [PATCH 156/166] Applied printer-linter format --- Cura-workflows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cura-workflows b/Cura-workflows index cabc2d7e3c..7ee2e85d41 160000 --- a/Cura-workflows +++ b/Cura-workflows @@ -1 +1 @@ -Subproject commit cabc2d7e3cb6f5b64475de4947f1e0f68f9adf73 +Subproject commit 7ee2e85d4182f8489a2e6bbd25c0823ad1d69101 From 5f81ba3e018463758d1e708f62e0dbeb9dfe931c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Dec 2024 10:42:09 +0100 Subject: [PATCH 157/166] Remove unwanted files --- Cura-workflows | 1 - package_details.txt | 42 ------------------------------------------ 2 files changed, 43 deletions(-) delete mode 160000 Cura-workflows delete mode 100644 package_details.txt diff --git a/Cura-workflows b/Cura-workflows deleted file mode 160000 index 7ee2e85d41..0000000000 --- a/Cura-workflows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ee2e85d4182f8489a2e6bbd25c0823ad1d69101 diff --git a/package_details.txt b/package_details.txt deleted file mode 100644 index e8b13f4250..0000000000 --- a/package_details.txt +++ /dev/null @@ -1,42 +0,0 @@ -author: UltiMaker -build_policy: missing -default_options: - enterprise: False - staging: False - cloud_api_version: 1 - display_name: UltiMaker Cura - cura_debug_mode: False - internal: False - i18n_extract: False -description: 3D printer / slicing GUI built on top of the Uranium framework -generators: ['VirtualPythonEnv'] -label: -languages: [] -license: LGPL-3.0 -name: cura -options: - cloud_api_version: 1 - cura_debug_mode: False - display_name: UltiMaker Cura - enterprise: False - i18n_extract: False - internal: False - staging: False -options_definitions: - enterprise: ['True', 'False'] - staging: ['True', 'False'] - cloud_api_version: ['ANY'] - display_name: ['ANY'] - cura_debug_mode: ['True', 'False'] - internal: ['True', 'False'] - i18n_extract: ['True', 'False'] -package_type: None -python_requires: - translationextractor/2.3.0@ultimaker/stable#d504876a4742c1b92bcd6e1d5ba7509a: {'remote': 'cura-conan2', 'recipe': 'Downloaded', 'path': '/home/runner/.conan2/p/transe0e29f719efb7/e'} -requires: [{'ref': 'gettext/0.22.5', 'run': True, 'libs': False, 'skip': False, 'test': False, 'force': False, 'direct': True, 'build': True, 'transitive_headers': None, 'transitive_libs': None, 'headers': False, 'package_id_mode': None, 'visible': False}] -revision_mode: hash -settings: ['os', 'compiler', 'build_type', 'arch'] -topics: ['conan', 'python', 'pyqt6', 'qt', 'qml', '3d-printing', 'slicer'] -url: https://github.com/Ultimaker/cura -vendor: False -version: 5.10.0-alpha.0 From 2ad64e13db5807ee88f0517c54c3e99ca769ae8a Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 18 Dec 2024 18:21:00 +0100 Subject: [PATCH 158/166] Introduce Cheetah flavor --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c930a624d0..8a933838da 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -384,6 +384,7 @@ "RepRap (RepRap)": "RepRap", "UltiGCode": "Ultimaker 2", "Griffin": "Griffin", + "Cheetah": "Griffin+Cheetah", "Makerbot": "Makerbot", "BFB": "Bits from Bytes", "MACH3": "Mach3", From 2951a6b0f79e247bd9fd943b444844a1ffe06704 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:25:16 +0100 Subject: [PATCH 159/166] Fix nightly release notes syntax --- .github/workflows/nightly_release_notes.md.jinja | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index 62edf16408..a3e7b96362 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -4,8 +4,7 @@ | | | |--------------:|--------------------------------------------------------------------------------------------| -| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }} -?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | +| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | # Unit Test results From 345980026c92e1064d87dc4d7e79a2c5b3f5d7cc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:29:02 +0100 Subject: [PATCH 160/166] Display proper CuraEngine packaging action result --- .github/workflows/nightly_release_notes.md.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index a3e7b96362..ccd807d23d 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -23,7 +23,7 @@ | | | |------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **Cura {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) | -| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml) | +| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) | | **Uranium {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) | | **fdm_materials {{ branch }}** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) | | **cura-binary-data {{ branch }}** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) | From 07880cd590dfee1005927b92d3134b962487ace0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 12:33:41 +0100 Subject: [PATCH 161/166] Always display sub-packages main branch results --- .github/workflows/nightly.yml | 1 - .../workflows/nightly_release_notes.md.jinja | 28 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 500e82c7db..d77cac7990 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -61,7 +61,6 @@ jobs: f.write(release_notes.render( timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")), caller_workflow=caller_workflow, - branch="" if is_main else short_version, branch_specific="" if is_main else f"?branch={short_version}", )) diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja index ccd807d23d..a14c8d76a0 100644 --- a/.github/workflows/nightly_release_notes.md.jinja +++ b/.github/workflows/nightly_release_notes.md.jinja @@ -4,17 +4,17 @@ | | | |--------------:|--------------------------------------------------------------------------------------------| -| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | +| **Nightlies** | [![nightly](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) | # Unit Test results | | | |-------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **Cura {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml) | -| **CuraEngine {{ branch }}** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml) | -| **Uranium {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml) | -| **CuraEngine GradualFlow 0.1** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) | -| **synsepalum-dulcificum 0.1** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml) | +| **Cura** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml) | +| **CuraEngine** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml) | +| **Uranium** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml) | +| **CuraEngine GradualFlow** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) | +| **synsepalum-dulcificum** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml) | | **libSavitar** | [![unit-test](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml) | | **libnest2d** | [![unit-test](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml) | @@ -22,14 +22,14 @@ | | | |------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **Cura {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) | -| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) | -| **Uranium {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) | -| **fdm_materials {{ branch }}** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) | -| **cura-binary-data {{ branch }}** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) | -| **CuraEngine GradualFlow 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) | -| **synsepalum-dulcificum 0.1** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) | -| **CuraEngine gRPC definitions 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml) | +| **Cura** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) | +| **CuraEngine** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) | +| **Uranium** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) | +| **fdm_materials** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) | +| **cura-binary-data** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) | +| **CuraEngine GradualFlow** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) | +| **synsepalum-dulcificum** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) | +| **CuraEngine gRPC definitions** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml) | | **libArcus** | [![conan-package](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml) | | **pyArcus** | [![conan-package](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml) | | **libSavitar** | [![conan-package](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml) | From f17872725ada7803bdf53027d4cf7b6117a06dd6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 14:42:53 +0100 Subject: [PATCH 162/166] Set proper method to define env variables --- resources/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/conanfile.py b/resources/conanfile.py index aea89f4569..cebaea4345 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -46,9 +46,9 @@ class CuraResource(ConanFile): def package_info(self): self.cpp_info.includedirs = [] - self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res")) - self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) - self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) + self.runenv_info.define("CURA_RESOURCES", os.path.join(self.package_folder, "res")) + self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) + self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) def package_id(self): self.info.clear() From 382b98e8b0c910fdf8b1509557ae8afab38f1817 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 20 Dec 2024 15:19:24 +0100 Subject: [PATCH 163/166] Fix wrong setting version on profiles --- resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg | 2 +- resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg | 2 +- .../quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg | 2 +- 120 files changed, 120 insertions(+), 120 deletions(-) diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg index d89894647c..9819984b71 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg index e3d0252d49..05d0a504e9 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg index ab3e3e17ea..e1111c1026 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg index b9e9565c3c..b4e2f49779 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg index 991ac5d101..10f80e4785 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg index e148d1c4b6..c84b36660b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg index 9b9a0ffee9..c6eb62e1b6 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg index d134c72fdb..f2e5706e31 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg index e7b6b714fb..9324b9ba0e 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg index a93e0bd832..862586934e 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg index ee2404bc08..ee753c59cf 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg index 6931141a6f..3505479774 100644 --- a/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.25mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg index 895ff9daf4..dcf9a6fe45 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg index f10be46a98..b79bb0e096 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg index 2b7356f1a5..0d85a07e9c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg index 542b8d2986..734e32367c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg index 2ce1651a4c..97c131f56b 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg index cac8e008e9..3da38499ee 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg index 616a9537c8..aaa65f6439 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg index 75ed433d4c..cd98f31944 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg index 217caf5659..c8bfbf11a3 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_extrafine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg index bd067c1827..e14363b52d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg index 05000e8e19..c476909acf 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg index a934707451..376ddc9f11 100644 --- a/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.30mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg index 49bdf430a3..dbac6990bf 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg index 531dcb8b39..990496f4d9 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg index 656d982e01..3a58e94bc1 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg index 3b0eb953ba..13b1d6c2f0 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg index 51128170f4..21843a75c9 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg index 00ba1c8267..9b982421ed 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg index 57751118f9..633abd8caa 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg index 4016f5584e..fe16e614b0 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg index b7474b0cbd..bb5a5abf6c 100644 --- a/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.35mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg index de76119db3..8820ff968c 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg index 4819149590..917e90cf7f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg index 777d39748c..1cb5221228 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg index 294d9c66b8..3a18c9f8c1 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg index 53497d7923..b8865a8af8 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg index 43a0ffa1ad..983addb707 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg index 8c737fbf04..80328cf24f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg index 2d4595f38e..a0e8fa9446 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg index 7b8ecd4957..27dccc84ed 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg index cc323328b3..6b6e07d252 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg index fcdc58c5d0..1a9e191377 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg index 63d675bb68..e467bdc3d3 100644 --- a/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.40mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg index e948b334da..90e70de319 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg index 5b11b8a69a..b4a86e68d8 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg index ebb14aab78..4e97f5035e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg index 0fc5fbe8d5..465abff92e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg index efcf6f0246..872f7a3313 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg index 670e236a79..0e252d6c8d 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg index 878507ce99..29a9a6dcfc 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg index f4f6b4dfff..9f25c84c7c 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg index 7fa652d855..a331f526c6 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg index 898a271b49..a6a095226f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg index b7aaa1f7a2..a5e7c74186 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg index f05f652783..08fee402c5 100644 --- a/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.50mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg index 4bb9372a9b..67368a8f18 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg index fbb74fb9ca..d62d2bf669 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg index 3e8e8195bc..573dd89ea5 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg index 66b0fd971c..ac210cfdc1 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg index 26bdebd1b2..1a0a40ba8a 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg index 4e5662790b..aab8ba5499 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg index 5e053d8bc4..7438b747db 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg index d2b06a4d31..9da50270b2 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg index b6a752f140..7dec53da68 100644 --- a/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.60mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg index 51da4e343b..186d2ad149 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg index 77aebb66d9..81d541a38b 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg index 9b99c0eef3..78628ebbc4 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg index a6b11d0f45..af96ecd40d 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg index 6b74da6994..1bb40fb822 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg index 431ecc57e9..34c27750dc 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg index 94fa58ec41..74e38683e2 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg index ed6e3bbd96..8da78abc98 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg index 49e348299b..3620d1c44c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = V6 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg index 2d1e463704..8593ee439e 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg index 4a61f16bb9..b5220d0a37 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg index 3906f5a5a3..7fd15f3ffb 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ASA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg index 6316562eec..f1446254a2 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg index 51f85f9d60..dd518500b3 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg index def6946bf1..94def9aa8f 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PVA_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg index 13df7a17fe..4ba5c656f2 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg index f7f4de0b25..ed1a9d44e8 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg index 0f7fdf0238..c24f054304 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_TPU_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.40mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg index d41c155234..62e5ac1d1e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg index 9c69b07258..f74b615074 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg index 5b35eec0b7..ac5377a9fa 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg index 470729ca7c..78c4f59752 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg index e2b949208e..97cc5bd288 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg index e630937656..98f7f15cb3 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg index a026d13755..bbc2b959f0 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg index 2551c5085d..211c9317fe 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg index 03d7a5de60..776d93e857 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.60mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg index bc372dae4b..2ffba84452 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg index 41af7ad552..500999a45f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg index 990bb0d518..9bd3bc46a3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg index 8a739087b3..cad3c1ae88 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg index 7fae42c017..ee3accfaba 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg index 81f7a4affd..a326841ab0 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg index f8382a17f7..7e9fd11c83 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_extrafast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = extrafast -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg index a9c02df5d2..29df645cce 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg index f3920f61e8..a064df9b4b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 0.80mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg index 3be4231e8b..daeb14d863 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg index 7ac9945261..214ebfcaa1 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg index 79e3d1d86a..e4fb8078cb 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ASA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg index b48aadb0e4..421af6a4b1 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg index cabb3d9020..7b7d35e6b7 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg index 30d016cf2c..455b0031c4 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PVA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg index 57ddcf68f4..5422b31737 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg index 5de4dff512..c74b5ec7f9 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg index 0fdf7be51c..b37f33ef17 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.00mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg index 374535d12f..1b364cc93c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg index 9790b61217..0ccc19d779 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg index a395749b1d..ec266f9e8a 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ASA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg index d5ca080c10..34cfd8d758 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg index 212b8b9ba5..8503117126 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg index 441cbb9d4f..800f262b7c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PVA_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pva quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg index d431a471c7..fc11f58931 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_sprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = sprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg index e611c83dd9..9fc17ac4d6 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_supersprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = supersprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm diff --git a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg index 041a037ed0..b8b4cb618d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_TPU_ultrasprint.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = ultrasprint -setting_version = 23 +setting_version = 24 type = quality variant = Volcano 1.20mm From 73519a3cdc6569c9e8e5bf011514bb0c1cb369d9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 21 Jan 2025 10:08:01 +0100 Subject: [PATCH 164/166] Remove + character from bundle identifier CURA-12313 This character is not allowed and will make an invalid package, see https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleidentifier --- packaging/MacOS/build_macos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py index a495a02769..a7063f688d 100644 --- a/packaging/MacOS/build_macos.py +++ b/packaging/MacOS/build_macos.py @@ -154,7 +154,7 @@ if __name__ == "__main__": parser.add_argument("--app_name", required = True, type = str, help = "Filename of the .app that will be contained within the dmg/pkg") args = parser.parse_args() - cura_version = args.cura_conan_version.split("/")[-1] + cura_version = args.cura_conan_version.replace("+","-") # + is not allowed for bundle identifier app_name = f"{args.app_name}.app" From a13726bba129afcb1f01eafdf2e2bcc9ba0b2521 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 22 Jan 2025 09:54:20 +0100 Subject: [PATCH 165/166] Move interlocking settings out of experimental CURA-12247 Also set interlocking_enable to basic settings because it is quite important and just enabling it doesn't require advanced knowledge/skills. --- resources/definitions/fdmprinter.def.json | 164 +++++++++++----------- resources/setting_visibility/advanced.cfg | 2 +- resources/setting_visibility/basic.cfg | 1 + resources/setting_visibility/expert.cfg | 12 +- 4 files changed, 90 insertions(+), 89 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8471c59f82..9ce93cd4eb 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7500,6 +7500,88 @@ "enabled": "retraction_enable and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": true + }, + "interlocking_enable": + { + "label": "Generate Interlocking Structure", + "description": "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials.", + "type": "bool", + "enabled": "extruders_enabled_count > 1", + "default_value": false, + "resolve": "(extruders_enabled_count > 1) and any(extruderValues('interlocking_enable'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_beam_width": + { + "label": "Interlocking Beam Width", + "description": "The width of the interlocking structure beams.", + "type": "float", + "unit": "mm", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 0.8, + "value": "2 * wall_line_width_0", + "minimum_value": "min_odd_wall_line_width", + "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)", + "maximum_value_warning": "max(extruderValues('wall_line_width_0')) * 6", + "settable_per_mesh": true, + "settable_per_extruder": true + }, + "interlocking_orientation": + { + "label": "Interlocking Structure Orientation", + "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", + "unit": "\u00b0", + "type": "float", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 22.5, + "minimum_value": "0", + "maximum_value": "360", + "resolve": "min(extruderValues('interlocking_orientation'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_beam_layer_count": + { + "label": "Interlocking Beam Layer Count", + "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "1", + "maximum_value_warning": "50", + "resolve": "max(extruderValues('interlocking_beam_layer_count'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_depth": + { + "label": "Interlocking Depth", + "description": "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "1", + "maximum_value": "10", + "maximum_value_warning": "5", + "resolve": "max(extruderValues('interlocking_depth'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "interlocking_boundary_avoidance": + { + "label": "Interlocking Boundary Avoidance", + "description": "The distance from the outside of a model where interlocking structures will not be generated, measured in cells.", + "type": "int", + "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", + "default_value": 2, + "minimum_value": "0", + "minimum_value_warning": "resolveOrValue('interlocking_depth')", + "maximum_value": "10", + "maximum_value_warning": "5", + "resolve": "max(extruderValues('interlocking_boundary_avoidance'))", + "settable_per_mesh": false, + "settable_per_extruder": false } } }, @@ -7922,88 +8004,6 @@ "settable_per_mesh": true, "settable_per_extruder": false }, - "interlocking_enable": - { - "label": "Generate Interlocking Structure", - "description": "At the locations where models touch, generate an interlocking beam structure. This improves the adhesion between models, especially models printed in different materials.", - "type": "bool", - "enabled": "extruders_enabled_count > 1", - "default_value": false, - "resolve": "(extruders_enabled_count > 1) and any(extruderValues('interlocking_enable'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_beam_width": - { - "label": "Interlocking Beam Width", - "description": "The width of the interlocking structure beams.", - "type": "float", - "unit": "mm", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 0.8, - "value": "2 * wall_line_width_0", - "minimum_value": "min_odd_wall_line_width", - "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)", - "maximum_value_warning": "max(extruderValues('wall_line_width_0')) * 6", - "settable_per_mesh": true, - "settable_per_extruder": true - }, - "interlocking_orientation": - { - "label": "Interlocking Structure Orientation", - "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", - "unit": "\u00b0", - "type": "float", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 22.5, - "minimum_value": "0", - "maximum_value": "360", - "resolve": "min(extruderValues('interlocking_orientation'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_beam_layer_count": - { - "label": "Interlocking Beam Layer Count", - "description": "The height of the beams of the interlocking structure, measured in number of layers. Less layers is stronger, but more prone to defects.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "1", - "maximum_value_warning": "50", - "resolve": "max(extruderValues('interlocking_beam_layer_count'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_depth": - { - "label": "Interlocking Depth", - "description": "The distance from the boundary between models to generate interlocking structure, measured in cells. Too few cells will result in poor adhesion.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "1", - "maximum_value": "10", - "maximum_value_warning": "5", - "resolve": "max(extruderValues('interlocking_depth'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "interlocking_boundary_avoidance": - { - "label": "Interlocking Boundary Avoidance", - "description": "The distance from the outside of a model where interlocking structures will not be generated, measured in cells.", - "type": "int", - "enabled": "extruders_enabled_count > 1 and resolveOrValue('interlocking_enable')", - "default_value": 2, - "minimum_value": "0", - "minimum_value_warning": "resolveOrValue('interlocking_depth')", - "maximum_value": "10", - "maximum_value_warning": "5", - "resolve": "max(extruderValues('interlocking_boundary_avoidance'))", - "settable_per_mesh": false, - "settable_per_extruder": false - }, "support_skip_some_zags": { "label": "Break Up Support In Chunks", diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 93c3dc91ef..8585a05eec 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -133,6 +133,7 @@ prime_tower_mode prime_tower_position_x prime_tower_position_y prime_tower_brim_enable +interlocking_enable [meshfix] @@ -144,7 +145,6 @@ magic_spiralize smooth_spiralized_contours [experimental] -interlocking_enable conical_overhang_enabled support_conical_enabled adaptive_layer_height_enabled diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 0193eb26ba..6c6124ab67 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -56,6 +56,7 @@ adhesion_extruder_nr prime_tower_enable prime_tower_position_x prime_tower_position_y +interlocking_enable [meshfix] diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index b13618e5c1..6c78e40503 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -378,6 +378,12 @@ prime_tower_min_shell_thickness ooze_shield_enabled ooze_shield_angle ooze_shield_dist +interlocking_enable +interlocking_beam_width +interlocking_orientation +interlocking_beam_layer_count +interlocking_dept +interlocking_boundary_avoidance [meshfix] meshfix_union_all @@ -428,12 +434,6 @@ roofing_monotonic roofing_angles infill_enable_travel_optimization material_flow_temp_graph -interlocking_enable -interlocking_beam_width -interlocking_orientation -interlocking_beam_layer_count -interlocking_dept -interlocking_boundary_avoidance support_skip_some_zags support_skip_zag_per_mm support_zag_skip_count From 4a30660a5cc78a131d3b4afbbee2c01ee545d85e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 23 Jan 2025 10:19:57 +0100 Subject: [PATCH 166/166] Remove pydir and workflow folder --- Cura-workflows | 1 - pydir.txt | 1 - 2 files changed, 2 deletions(-) delete mode 160000 Cura-workflows delete mode 100644 pydir.txt diff --git a/Cura-workflows b/Cura-workflows deleted file mode 160000 index a38e2d1e10..0000000000 --- a/Cura-workflows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a38e2d1e1029e5a350f7ecbee037e7ccabb7044a diff --git a/pydir.txt b/pydir.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/pydir.txt +++ /dev/null @@ -1 +0,0 @@ -