From 26c51ee465bb6be1daa47b17cc8067dde93141e1 Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Thu, 17 Dec 2020 16:57:55 +0800 Subject: [PATCH 01/74] add goofoo,renkforce printf --- resources/definitions/goofoo_base.def.json | 144 ++++++++++++++++++ resources/definitions/goofoo_e-one.def.json | 16 ++ resources/definitions/goofoo_far.def.json | 10 ++ resources/definitions/goofoo_gemini.def.json | 22 +++ resources/definitions/goofoo_giant.def.json | 16 ++ resources/definitions/goofoo_max.def.json | 24 +++ resources/definitions/goofoo_mido.def.json | 16 ++ resources/definitions/goofoo_miniadd.def.json | 16 ++ resources/definitions/goofoo_near.def.json | 10 ++ resources/definitions/goofoo_nova.def.json | 16 ++ resources/definitions/goofoo_plus.def.json | 16 ++ resources/definitions/goofoo_t-one.def.json | 22 +++ resources/definitions/goofoo_tiny.def.json | 18 +++ resources/definitions/goofoo_tinyadd.def.json | 17 +++ .../definitions/renkforce_basic3.def.json | 17 +++ resources/definitions/renkforce_pro3.def.json | 17 +++ .../extruders/goofoo_base_extruder.def.json | 16 ++ .../extruders/goofoo_gemini_1st.def.json | 19 +++ .../extruders/goofoo_gemini_2st.def.json | 19 +++ resources/extruders/goofoo_tone_1st.def.json | 19 +++ resources/extruders/goofoo_tone_2st.def.json | 19 +++ .../abs/goofoo_far_0.40_abs_fine.inst.cfg | 17 +++ .../abs/goofoo_far_0.40_abs_standard.inst.cfg | 17 +++ .../abs/goofoo_near_0.40_abs_fine.inst.cfg | 17 +++ .../goofoo_near_0.40_abs_standard.inst.cfg | 17 +++ .../asa/goofoo_far_0.40_asa_fine.inst.cfg | 17 +++ .../asa/goofoo_far_0.40_asa_standard.inst.cfg | 17 +++ .../asa/goofoo_near_0.40_asa_fine.inst.cfg | 17 +++ .../goofoo_near_0.40_asa_standard.inst.cfg | 17 +++ .../goofoo_far_global_0.15_fine.inst.cfg | 19 +++ .../goofoo_far_global_0.1_efine.inst.cfg | 19 +++ .../goofoo_far_global_0.20_standard.inst.cfg | 19 +++ .../goofoo_far_global_0.3_draft.inst.cfg | 20 +++ .../goofoo_near_global_0.15_fine.inst.cfg | 19 +++ .../goofoo_near_global_0.1_efine.inst.cfg | 19 +++ .../goofoo_near_global_0.20_standard.inst.cfg | 19 +++ .../goofoo_near_global_0.3_draft.inst.cfg | 20 +++ .../hips/goofoo_far_0.40_hips_draft.inst.cfg | 16 ++ .../hips/goofoo_far_0.40_hips_efine.inst.cfg | 16 ++ .../hips/goofoo_far_0.40_hips_fine.inst.cfg | 16 ++ .../goofoo_far_0.40_hips_standard.inst.cfg | 16 ++ .../hips/goofoo_near_0.40_hips_draft.inst.cfg | 16 ++ .../hips/goofoo_near_0.40_hips_efine.inst.cfg | 16 ++ .../hips/goofoo_near_0.40_hips_fine.inst.cfg | 16 ++ .../goofoo_near_0.40_hips_standard.inst.cfg | 16 ++ .../pa/goofoo_far_0.40_pa_fine.inst.cfg | 16 ++ .../pa/goofoo_far_0.40_pa_standard.inst.cfg | 16 ++ .../pa/goofoo_near_0.40_pa_fine.inst.cfg | 16 ++ .../pa/goofoo_near_0.40_pa_standard.inst.cfg | 16 ++ .../pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg | 16 ++ .../goofoo_far_0.40_pa_cf_standard.inst.cfg | 16 ++ .../goofoo_near_0.40_pa_cf_fine.inst.cfg | 16 ++ .../goofoo_near_0.40_pa_cf_standard.inst.cfg | 16 ++ .../pc/goofoo_far_0.40_pc_draft.inst.cfg | 16 ++ .../pc/goofoo_far_0.40_pc_efine.inst.cfg | 16 ++ .../pc/goofoo_far_0.40_pc_fine.inst.cfg | 16 ++ .../pc/goofoo_far_0.40_pc_standard.inst.cfg | 16 ++ .../pc/goofoo_near_0.40_pc_draft.inst.cfg | 16 ++ .../pc/goofoo_near_0.40_pc_efine.inst.cfg | 16 ++ .../pc/goofoo_near_0.40_pc_fine.inst.cfg | 16 ++ .../pc/goofoo_near_0.40_pc_standard.inst.cfg | 16 ++ .../peek/goofoo_far_0.40_peek_draft.inst.cfg | 17 +++ .../peek/goofoo_far_0.40_peek_efine.inst.cfg | 17 +++ .../peek/goofoo_far_0.40_peek_fine.inst.cfg | 17 +++ .../goofoo_far_0.40_peek_standard.inst.cfg | 17 +++ .../peek/goofoo_near_0.40_peek_draft.inst.cfg | 17 +++ .../peek/goofoo_near_0.40_peek_efine.inst.cfg | 17 +++ .../peek/goofoo_near_0.40_peek_fine.inst.cfg | 17 +++ .../goofoo_near_0.40_peek_standard.inst.cfg | 17 +++ .../petg/goofoo_far_0.40_petg_fine.inst.cfg | 17 +++ .../goofoo_far_0.40_petg_standard.inst.cfg | 17 +++ .../petg/goofoo_near_0.40_petg_fine.inst.cfg | 17 +++ .../goofoo_near_0.40_petg_standard.inst.cfg | 17 +++ .../pla/goofoo_far_0.40_pla_draft.inst.cfg | 16 ++ .../pla/goofoo_far_0.40_pla_efine.inst.cfg | 16 ++ .../pla/goofoo_far_0.40_pla_fine.inst.cfg | 16 ++ .../pla/goofoo_far_0.40_pla_standard.inst.cfg | 16 ++ .../goofoo_far_bronze_0.40_pla_draft.inst.cfg | 17 +++ .../goofoo_far_bronze_0.40_pla_efine.inst.cfg | 17 +++ .../goofoo_far_bronze_0.40_pla_fine.inst.cfg | 17 +++ ...ofoo_far_bronze_0.40_pla_standard.inst.cfg | 17 +++ ...goofoo_far_emarble_0.40_pla_draft.inst.cfg | 16 ++ ...goofoo_far_emarble_0.40_pla_efine.inst.cfg | 16 ++ .../goofoo_far_emarble_0.40_pla_fine.inst.cfg | 16 ++ ...foo_far_emarble_0.40_pla_standard.inst.cfg | 16 ++ .../goofoo_far_esilk_0.40_pla_draft.inst.cfg | 16 ++ .../goofoo_far_esilk_0.40_pla_efine.inst.cfg | 16 ++ .../goofoo_far_esilk_0.40_pla_fine.inst.cfg | 16 ++ ...oofoo_far_esilk_0.40_pla_standard.inst.cfg | 16 ++ ...goofoo_far_generic_0.40_pla_draft.inst.cfg | 16 ++ ...goofoo_far_generic_0.40_pla_efine.inst.cfg | 16 ++ .../goofoo_far_generic_0.40_pla_fine.inst.cfg | 16 ++ ...foo_far_generic_0.40_pla_standard.inst.cfg | 16 ++ .../goofoo_far_wood_0.40_pla_draft.inst.cfg | 16 ++ .../goofoo_far_wood_0.40_pla_efine.inst.cfg | 16 ++ .../goofoo_far_wood_0.40_pla_fine.inst.cfg | 16 ++ ...goofoo_far_wood_0.40_pla_standard.inst.cfg | 16 ++ .../pla/goofoo_near_0.40_pla_draft.inst.cfg | 16 ++ .../pla/goofoo_near_0.40_pla_efine.inst.cfg | 16 ++ .../pla/goofoo_near_0.40_pla_fine.inst.cfg | 16 ++ .../goofoo_near_0.40_pla_standard.inst.cfg | 16 ++ ...goofoo_near_bronze_0.40_pla_draft.inst.cfg | 17 +++ ...goofoo_near_bronze_0.40_pla_efine.inst.cfg | 17 +++ .../goofoo_near_bronze_0.40_pla_fine.inst.cfg | 17 +++ ...foo_near_bronze_0.40_pla_standard.inst.cfg | 17 +++ ...oofoo_near_emarble_0.40_pla_draft.inst.cfg | 16 ++ ...oofoo_near_emarble_0.40_pla_efine.inst.cfg | 16 ++ ...goofoo_near_emarble_0.40_pla_fine.inst.cfg | 16 ++ ...oo_near_emarble_0.40_pla_standard.inst.cfg | 16 ++ .../goofoo_near_esilk_0.40_pla_draft.inst.cfg | 16 ++ .../goofoo_near_esilk_0.40_pla_efine.inst.cfg | 16 ++ .../goofoo_near_esilk_0.40_pla_fine.inst.cfg | 16 ++ ...ofoo_near_esilk_0.40_pla_standard.inst.cfg | 16 ++ ...oofoo_near_generic_0.40_pla_draft.inst.cfg | 16 ++ ...oofoo_near_generic_0.40_pla_efine.inst.cfg | 16 ++ ...goofoo_near_generic_0.40_pla_fine.inst.cfg | 16 ++ ...oo_near_generic_0.40_pla_standard.inst.cfg | 16 ++ .../goofoo_near_wood_0.40_pla_draft.inst.cfg | 16 ++ .../goofoo_near_wood_0.40_pla_efine.inst.cfg | 16 ++ .../goofoo_near_wood_0.40_pla_fine.inst.cfg | 16 ++ ...oofoo_near_wood_0.40_pla_standard.inst.cfg | 16 ++ .../pva/goofoo_far_0.40_pva_draft.inst.cfg | 16 ++ .../pva/goofoo_far_0.40_pva_efine.inst.cfg | 16 ++ .../pva/goofoo_far_0.40_pva_fine.inst.cfg | 16 ++ .../pva/goofoo_far_0.40_pva_standard.inst.cfg | 16 ++ .../pva/goofoo_near_0.40_pva_draft.inst.cfg | 16 ++ .../pva/goofoo_near_0.40_pva_efine.inst.cfg | 16 ++ .../pva/goofoo_near_0.40_pva_fine.inst.cfg | 16 ++ .../goofoo_near_0.40_pva_standard.inst.cfg | 16 ++ .../tpe/goofoo_far_0.40_tpe_draft.inst.cfg | 18 +++ .../tpe/goofoo_far_0.40_tpe_efine.inst.cfg | 18 +++ .../tpe/goofoo_far_0.40_tpe_fine.inst.cfg | 18 +++ .../tpe/goofoo_far_0.40_tpe_standard.inst.cfg | 18 +++ .../tpe/goofoo_near_0.40_tpe_draft.inst.cfg | 18 +++ .../tpe/goofoo_near_0.40_tpe_efine.inst.cfg | 18 +++ .../tpe/goofoo_near_0.40_tpe_fine.inst.cfg | 18 +++ .../goofoo_near_0.40_tpe_standard.inst.cfg | 18 +++ .../goofoo_far_0.40_tpu_87a_draft.inst.cfg | 17 +++ .../tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg | 17 +++ .../goofoo_far_0.40_tpu_87a_standard.inst.cfg | 17 +++ .../goofoo_far_0.40_tpu_95a_draft.inst.cfg | 17 +++ .../goofoo_far_0.40_tpu_95a_efine.inst.cfg | 17 +++ .../tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg | 17 +++ .../goofoo_far_0.40_tpu_95a_standard.inst.cfg | 17 +++ .../goofoo_near_0.40_tpu_87a_draft.inst.cfg | 17 +++ .../goofoo_near_0.40_tpu_87a_fine.inst.cfg | 17 +++ ...goofoo_near_0.40_tpu_87a_standard.inst.cfg | 17 +++ .../goofoo_near_0.40_tpu_95a_draft.inst.cfg | 17 +++ .../goofoo_near_0.40_tpu_95a_efine.inst.cfg | 17 +++ .../goofoo_near_0.40_tpu_95a_fine.inst.cfg | 17 +++ ...goofoo_near_0.40_tpu_95a_standard.inst.cfg | 17 +++ resources/variants/goofoo_base_0.4.inst.cfg | 12 ++ resources/variants/goofoo_e-one_0.4.inst.cfg | 12 ++ resources/variants/goofoo_gemini_0.4.inst.cfg | 12 ++ resources/variants/goofoo_giant_0.4.inst.cfg | 12 ++ resources/variants/goofoo_max_0.4.inst.cfg | 12 ++ resources/variants/goofoo_mido_0.4.inst.cfg | 12 ++ .../variants/goofoo_miniadd_0.4.inst.cfg | 12 ++ resources/variants/goofoo_nova_0.4.inst.cfg | 12 ++ resources/variants/goofoo_plus_0.4.inst.cfg | 12 ++ resources/variants/goofoo_t-one_0.4.inst.cfg | 12 ++ resources/variants/goofoo_tiny_0.4.inst.cfg | 12 ++ .../variants/goofoo_tinyadd_0.4.inst.cfg | 12 ++ 163 files changed, 2797 insertions(+) create mode 100644 resources/definitions/goofoo_base.def.json create mode 100644 resources/definitions/goofoo_e-one.def.json create mode 100644 resources/definitions/goofoo_far.def.json create mode 100644 resources/definitions/goofoo_gemini.def.json create mode 100644 resources/definitions/goofoo_giant.def.json create mode 100644 resources/definitions/goofoo_max.def.json create mode 100644 resources/definitions/goofoo_mido.def.json create mode 100644 resources/definitions/goofoo_miniadd.def.json create mode 100644 resources/definitions/goofoo_near.def.json create mode 100644 resources/definitions/goofoo_nova.def.json create mode 100644 resources/definitions/goofoo_plus.def.json create mode 100644 resources/definitions/goofoo_t-one.def.json create mode 100644 resources/definitions/goofoo_tiny.def.json create mode 100644 resources/definitions/goofoo_tinyadd.def.json create mode 100644 resources/definitions/renkforce_basic3.def.json create mode 100644 resources/definitions/renkforce_pro3.def.json create mode 100644 resources/extruders/goofoo_base_extruder.def.json create mode 100644 resources/extruders/goofoo_gemini_1st.def.json create mode 100644 resources/extruders/goofoo_gemini_2st.def.json create mode 100644 resources/extruders/goofoo_tone_1st.def.json create mode 100644 resources/extruders/goofoo_tone_2st.def.json create mode 100644 resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg create mode 100644 resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg create mode 100644 resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg create mode 100644 resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg create mode 100644 resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg create mode 100644 resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg create mode 100644 resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg create mode 100644 resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg create mode 100644 resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg create mode 100644 resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg create mode 100644 resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg create mode 100644 resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg create mode 100644 resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg create mode 100644 resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg create mode 100644 resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg create mode 100644 resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg create mode 100644 resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg create mode 100644 resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg create mode 100644 resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg create mode 100644 resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg create mode 100644 resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg create mode 100644 resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg create mode 100644 resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg create mode 100644 resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg create mode 100644 resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg create mode 100644 resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg create mode 100644 resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg create mode 100644 resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg create mode 100644 resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg create mode 100644 resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg create mode 100644 resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg create mode 100644 resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg create mode 100644 resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg create mode 100644 resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg create mode 100644 resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg create mode 100644 resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg create mode 100644 resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg create mode 100644 resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg create mode 100644 resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg create mode 100644 resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg create mode 100644 resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg create mode 100644 resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg create mode 100644 resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg create mode 100644 resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg create mode 100644 resources/variants/goofoo_base_0.4.inst.cfg create mode 100644 resources/variants/goofoo_e-one_0.4.inst.cfg create mode 100644 resources/variants/goofoo_gemini_0.4.inst.cfg create mode 100644 resources/variants/goofoo_giant_0.4.inst.cfg create mode 100644 resources/variants/goofoo_max_0.4.inst.cfg create mode 100644 resources/variants/goofoo_mido_0.4.inst.cfg create mode 100644 resources/variants/goofoo_miniadd_0.4.inst.cfg create mode 100644 resources/variants/goofoo_nova_0.4.inst.cfg create mode 100644 resources/variants/goofoo_plus_0.4.inst.cfg create mode 100644 resources/variants/goofoo_t-one_0.4.inst.cfg create mode 100644 resources/variants/goofoo_tiny_0.4.inst.cfg create mode 100644 resources/variants/goofoo_tinyadd_0.4.inst.cfg diff --git a/resources/definitions/goofoo_base.def.json b/resources/definitions/goofoo_base.def.json new file mode 100644 index 0000000000..ac397a44e6 --- /dev/null +++ b/resources/definitions/goofoo_base.def.json @@ -0,0 +1,144 @@ +{ + "name": "Goofoo Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "goofoo3d.com", + "manufacturer": "GooFoo", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + + "machine_extruder_trains": { + "0": "goofoo_base_extruder" + }, + + "has_materials": true, + "preferred_material": "goofoo_pla", + + "has_variants": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "0.4mm Nozzle", + + "has_machine_quality": true, + "preferred_quality_type": "normal" + + }, + "overrides": { + "machine_name": { "default_value": "Goofoo Base Printer" }, + + + + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 50 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + + "speed_print": { "value": 40.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": "80" }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "60" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, + + "z_seam_type": { "value": "'back'" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + + "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "fill_perimeter_gaps": { "value": "'everywhere'" }, + "fill_outline_gaps": { "value": false }, + "filter_out_tiny_gaps": { "value": false }, + + "retraction_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_retract_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_prime_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + + "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "3 * layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + + + + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" } + + } +} diff --git a/resources/definitions/goofoo_e-one.def.json b/resources/definitions/goofoo_e-one.def.json new file mode 100644 index 0000000000..dcde72e2bf --- /dev/null +++ b/resources/definitions/goofoo_e-one.def.json @@ -0,0 +1,16 @@ +{ + "name": "goofoo_E-one", + "version": 2, + "inherits": "goofoo_base", + "overrides": { + "machine_name": { "default_value": "e-one" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 380 } + }, + "metadata": { + "author": "goofoo", + "quality_definition": "goofoo_far", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_far.def.json b/resources/definitions/goofoo_far.def.json new file mode 100644 index 0000000000..a287819ee1 --- /dev/null +++ b/resources/definitions/goofoo_far.def.json @@ -0,0 +1,10 @@ +{ + "name": "goofoo_far", + "version": 2, + "inherits": "goofoo_base", + "metadata": { + "author": "goofoo", + "quality_definition": "goofoo_far", + "visible": false + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_gemini.def.json b/resources/definitions/goofoo_gemini.def.json new file mode 100644 index 0000000000..99ae3f1875 --- /dev/null +++ b/resources/definitions/goofoo_gemini.def.json @@ -0,0 +1,22 @@ +{ + "name": "goofoo_Gemini", + "version": 2, + "inherits": "goofoo_far", + "overrides": { + "machine_name": { "default_value": "gemini" }, + "machine_width": { "default_value": 360 }, + "machine_depth": { "default_value": 250 }, + "machine_height": { "default_value": 200 }, + "machine_extruder_count": { + "default_value": 2 + } + }, + "metadata": { + "author": "goofoo", + "machine_extruder_trains": { + "0": "goofoo_gemini_1st", + "1": "goofoo_gemini_2st" + }, + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_giant.def.json b/resources/definitions/goofoo_giant.def.json new file mode 100644 index 0000000000..6668fb76c4 --- /dev/null +++ b/resources/definitions/goofoo_giant.def.json @@ -0,0 +1,16 @@ +{ + "name": "goofoo_Giant", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "giant" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 1000 } + + }, + "metadata": { + "author": "goofoo", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_max.def.json b/resources/definitions/goofoo_max.def.json new file mode 100644 index 0000000000..a499dc1dae --- /dev/null +++ b/resources/definitions/goofoo_max.def.json @@ -0,0 +1,24 @@ +{ + "name": "goofoo_Max", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "max" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 580 }, + "machine_height": { "default_value": 700 }, + "machine_head_with_fans_polygon": { "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] + }, + + "gantry_height": { "value": 0 } + + }, + "metadata": { + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_mido.def.json b/resources/definitions/goofoo_mido.def.json new file mode 100644 index 0000000000..073c4242f1 --- /dev/null +++ b/resources/definitions/goofoo_mido.def.json @@ -0,0 +1,16 @@ +{ + "name": "goofoo_Mido", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "mido" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 200 } + + }, + "metadata": { + "author": "goofoo", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_miniadd.def.json b/resources/definitions/goofoo_miniadd.def.json new file mode 100644 index 0000000000..60db68895f --- /dev/null +++ b/resources/definitions/goofoo_miniadd.def.json @@ -0,0 +1,16 @@ +{ + "name": "goofoo_Mini+", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "miniadd" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 150 } + + }, + "metadata": { + "author": "goofoo", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_near.def.json b/resources/definitions/goofoo_near.def.json new file mode 100644 index 0000000000..b1d7f4f088 --- /dev/null +++ b/resources/definitions/goofoo_near.def.json @@ -0,0 +1,10 @@ +{ + "name": "goofoo_near", + "version": 2, + "inherits": "goofoo_base", + "metadata": { + "author": "goofoo", + "quality_definition": "goofoo_near", + "visible": false + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_nova.def.json b/resources/definitions/goofoo_nova.def.json new file mode 100644 index 0000000000..09c3369932 --- /dev/null +++ b/resources/definitions/goofoo_nova.def.json @@ -0,0 +1,16 @@ +{ + "name": "goofoo_Nova", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "nova" }, + "machine_width": { "default_value": 280 }, + "machine_depth": { "default_value": 280 }, + "machine_height": { "default_value": 300 } + + }, + "metadata": { + "author": "goofoo", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_plus.def.json b/resources/definitions/goofoo_plus.def.json new file mode 100644 index 0000000000..1f1b0190e9 --- /dev/null +++ b/resources/definitions/goofoo_plus.def.json @@ -0,0 +1,16 @@ +{ + "name": "goofoo_Plus", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "plus" }, + "machine_width": { "default_value": 360 }, + "machine_depth": { "default_value": 360 }, + "machine_height": { "default_value": 400 } + + }, + "metadata": { + "author": "goofoo", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_t-one.def.json b/resources/definitions/goofoo_t-one.def.json new file mode 100644 index 0000000000..366b855af2 --- /dev/null +++ b/resources/definitions/goofoo_t-one.def.json @@ -0,0 +1,22 @@ +{ + "name": "goofoo_T-one", + "version": 2, + "inherits": "goofoo_far", + "overrides": { + "machine_name": { "default_value": "t-one" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 150 }, + "machine_extruder_count": { + "default_value": 2 + } + }, + "metadata": { + "author": "goofoo", + "machine_extruder_trains": { + "0": "goofoo_tone_1st", + "1": "goofoo_tone_2st" + }, + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_tiny.def.json b/resources/definitions/goofoo_tiny.def.json new file mode 100644 index 0000000000..23baec29c7 --- /dev/null +++ b/resources/definitions/goofoo_tiny.def.json @@ -0,0 +1,18 @@ +{ + "name": "goofoo_Tiny", + "version": 2, + "inherits": "goofoo_far", + "overrides": { + "machine_name": { "default_value": "tiny" }, + "machine_width": { "default_value": 100 }, + "machine_depth": { "default_value": 100 }, + "machine_height": { "default_value": 100 }, + "machine_heated_bed": { "default_value": false }, + "raft_margin": { "default_value": 5 } + }, + "metadata": { + "author": "goofoo", + + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_tinyadd.def.json b/resources/definitions/goofoo_tinyadd.def.json new file mode 100644 index 0000000000..1222558eb9 --- /dev/null +++ b/resources/definitions/goofoo_tinyadd.def.json @@ -0,0 +1,17 @@ +{ + "name": "goofoo_Tiny+", + "version": 2, + "inherits": "goofoo_far", + "overrides": { + "machine_name": { "default_value": "tinyadd" }, + "machine_width": { "default_value": 120 }, + "machine_depth": { "default_value": 120 }, + "machine_height": { "default_value": 180 }, + "raft_margin": { "default_value": 5 }, + "machine_heated_bed": { "default_value": false } + }, + "metadata": { + "author": "goofoo", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/renkforce_basic3.def.json b/resources/definitions/renkforce_basic3.def.json new file mode 100644 index 0000000000..339d398d3c --- /dev/null +++ b/resources/definitions/renkforce_basic3.def.json @@ -0,0 +1,17 @@ +{ + "name": "Renkforce Basic 3", + "version": 2, + "inherits": "goofoo_far", + "overrides": { + "machine_name": { "default_value": "Basic 3" }, + "machine_width": { "default_value": 120 }, + "machine_depth": { "default_value": 120 }, + "machine_height": { "default_value": 180 }, + "machine_heated_bed": { "default_value": false } + }, + "metadata": { + "author": "goofoo", + "manufacturer": "Renkforce", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/renkforce_pro3.def.json b/resources/definitions/renkforce_pro3.def.json new file mode 100644 index 0000000000..b710a00ee5 --- /dev/null +++ b/resources/definitions/renkforce_pro3.def.json @@ -0,0 +1,17 @@ +{ + "name": "Renkforce Pro 3", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "Pro 3" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 150 } + + }, + "metadata": { + "author": "goofoo", + "manufacturer": "Renkforce", + "visible": true + } +} \ No newline at end of file diff --git a/resources/extruders/goofoo_base_extruder.def.json b/resources/extruders/goofoo_base_extruder.def.json new file mode 100644 index 0000000000..453989e961 --- /dev/null +++ b/resources/extruders/goofoo_base_extruder.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "goofoo_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/goofoo_gemini_1st.def.json b/resources/extruders/goofoo_gemini_1st.def.json new file mode 100644 index 0000000000..7eefc49579 --- /dev/null +++ b/resources/extruders/goofoo_gemini_1st.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "goofoo_gemini", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/goofoo_gemini_2st.def.json b/resources/extruders/goofoo_gemini_2st.def.json new file mode 100644 index 0000000000..35bc765526 --- /dev/null +++ b/resources/extruders/goofoo_gemini_2st.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "goofoo_gemini", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/goofoo_tone_1st.def.json b/resources/extruders/goofoo_tone_1st.def.json new file mode 100644 index 0000000000..e4594301a8 --- /dev/null +++ b/resources/extruders/goofoo_tone_1st.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "goofoo_t-one", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/goofoo_tone_2st.def.json b/resources/extruders/goofoo_tone_2st.def.json new file mode 100644 index 0000000000..3f07ac5d33 --- /dev/null +++ b/resources/extruders/goofoo_tone_2st.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "goofoo_t-one", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg new file mode 100644 index 0000000000..d065b46f4f --- /dev/null +++ b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +cool_fan_enabled = False +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg new file mode 100644 index 0000000000..2fedfd3b0e --- /dev/null +++ b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +cool_fan_enabled = False +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg new file mode 100644 index 0000000000..1053a33fd2 --- /dev/null +++ b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +cool_fan_enabled = False +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg new file mode 100644 index 0000000000..d9e811fe74 --- /dev/null +++ b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +cool_fan_enabled = False +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg new file mode 100644 index 0000000000..a637710cae --- /dev/null +++ b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_asa +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +cool_fan_enabled = False +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg new file mode 100644 index 0000000000..9763f062f4 --- /dev/null +++ b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_asa +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +cool_fan_enabled = False +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg new file mode 100644 index 0000000000..bcf1576586 --- /dev/null +++ b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_asa +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +cool_fan_enabled = False +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg new file mode 100644 index 0000000000..b35bc3a726 --- /dev/null +++ b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_asa +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +cool_fan_enabled = False +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg new file mode 100644 index 0000000000..8227fceaab --- /dev/null +++ b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +weight = -1 +global_quality = True + +[values] +layer_height = 0.15 +layer_height_0 = 0.25 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*6 +support_interface_height = =layer_height*8 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg new file mode 100644 index 0000000000..bd2c89f6ce --- /dev/null +++ b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 +layer_height_0 = 0.15 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*6 +support_interface_height = =layer_height*12 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg new file mode 100644 index 0000000000..093c4d567c --- /dev/null +++ b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -3 +global_quality = True + +[values] +layer_height = 0.20 +layer_height_0 = 0.3 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*4 +support_interface_height = =layer_height*5 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg new file mode 100644 index 0000000000..1f67e7a86b --- /dev/null +++ b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.3 +layer_height_0 = 0.3 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*5 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg new file mode 100644 index 0000000000..b1792099c4 --- /dev/null +++ b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +weight = -1 +global_quality = True + +[values] +layer_height = 0.15 +layer_height_0 = 0.25 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*6 +support_interface_height = =layer_height*8 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg new file mode 100644 index 0000000000..135ade7dee --- /dev/null +++ b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 +layer_height_0 = 0.15 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*6 +support_interface_height = =layer_height*12 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg new file mode 100644 index 0000000000..676c01bc2c --- /dev/null +++ b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -3 +global_quality = True + +[values] +layer_height = 0.20 +layer_height_0 = 0.3 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*4 +support_interface_height = =layer_height*5 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg new file mode 100644 index 0000000000..5b1f5ddc3d --- /dev/null +++ b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.3 +layer_height_0 = 0.3 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*5 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg new file mode 100644 index 0000000000..327cd0ded6 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg new file mode 100644 index 0000000000..6d2c273daf --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg new file mode 100644 index 0000000000..1f7b10771f --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg new file mode 100644 index 0000000000..b40449b254 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg new file mode 100644 index 0000000000..6e8f4722a2 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg new file mode 100644 index 0000000000..de7dc266e0 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg new file mode 100644 index 0000000000..f06519662c --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg new file mode 100644 index 0000000000..4e5466d692 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg new file mode 100644 index 0000000000..3003a3a1d2 --- /dev/null +++ b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pa +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +retraction_amount = 6 diff --git a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg new file mode 100644 index 0000000000..ee8122c422 --- /dev/null +++ b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pa +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg new file mode 100644 index 0000000000..842be04698 --- /dev/null +++ b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pa +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +retraction_amount = 4.5 diff --git a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg new file mode 100644 index 0000000000..7939d4d68c --- /dev/null +++ b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pa +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg new file mode 100644 index 0000000000..afd5ad5d23 --- /dev/null +++ b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pa_cf +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg new file mode 100644 index 0000000000..3f794f58df --- /dev/null +++ b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pa_cf +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg new file mode 100644 index 0000000000..67270c1dc0 --- /dev/null +++ b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pa_cf +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg new file mode 100644 index 0000000000..732e98fb97 --- /dev/null +++ b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pa_cf +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg new file mode 100644 index 0000000000..69e7f4e9f0 --- /dev/null +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg new file mode 100644 index 0000000000..61eabecd27 --- /dev/null +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg new file mode 100644 index 0000000000..a545fd22f5 --- /dev/null +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg new file mode 100644 index 0000000000..2fb81d7490 --- /dev/null +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg new file mode 100644 index 0000000000..0e11ddb6ae --- /dev/null +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg new file mode 100644 index 0000000000..216c903a01 --- /dev/null +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg new file mode 100644 index 0000000000..dccf3a60f4 --- /dev/null +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg new file mode 100644 index 0000000000..e0094d2cfa --- /dev/null +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg new file mode 100644 index 0000000000..06e07cf60e --- /dev/null +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_peek +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +cool_fan_enabled = False +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg new file mode 100644 index 0000000000..b2ec0182b3 --- /dev/null +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_peek +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +cool_fan_enabled = False +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg new file mode 100644 index 0000000000..9a50e7b4ee --- /dev/null +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_peek +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +cool_fan_enabled = False +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg new file mode 100644 index 0000000000..cc50caf5c1 --- /dev/null +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_peek +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +cool_fan_enabled = False +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg new file mode 100644 index 0000000000..2b191e9f23 --- /dev/null +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_peek +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +cool_fan_enabled = False +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg new file mode 100644 index 0000000000..7ff0e0f43a --- /dev/null +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_peek +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +cool_fan_enabled = False +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg new file mode 100644 index 0000000000..5ee8660df1 --- /dev/null +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_peek +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +cool_fan_enabled = False +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg new file mode 100644 index 0000000000..571326aec3 --- /dev/null +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_peek +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +cool_fan_enabled = False +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg new file mode 100644 index 0000000000..1a7fc8ae5e --- /dev/null +++ b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg new file mode 100644 index 0000000000..b1dfc8e896 --- /dev/null +++ b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg new file mode 100644 index 0000000000..f119084ff9 --- /dev/null +++ b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg new file mode 100644 index 0000000000..fff9b74c6a --- /dev/null +++ b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..e625bd68d7 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..1db0510435 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..863b3fb7bb --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..02060f935c --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..443769bb6c --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_bronze_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 1 +retraction_speed = 10 diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..a3c3a99d9b --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_bronze_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 1 +retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..d22e8730f7 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_bronze_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 1 +retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..507af9a733 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_bronze_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 1 +retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..1e186205d3 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..0de27836bd --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..ae430302f8 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..aa10ef838c --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..d9866732a4 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_eslik_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..59cfd580b6 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_eslik_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..2c8440fab3 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_eslik_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..301345d940 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_eslik_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..9380a10f14 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..e70cd62743 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = generic_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..b853fe0483 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = generic_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..00aded6b29 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = generic_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..3f938c511a --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..99aaed5cf6 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..5a8a704e21 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..8062d4c76f --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..80b286e81c --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..cf20e99bd2 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..4b2905f8f2 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..8f1630279a --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..869bfaf98e --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_bronze_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 1 +retraction_speed = 10 diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..e58630a57f --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_bronze_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 1 +retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..559f942077 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_bronze_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 1 +retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..ed230fe741 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_bronze_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 1 +retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..bcb3ecabc8 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..8f223e4b48 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..6e02292287 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..f3f73fb1ff --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..8b3eb36e51 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_eslik_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..57bb001c76 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_eslik_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..3346596400 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_eslik_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..973353a922 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_eslik_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..e0327fb4bc --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..f1668a72cc --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = generic_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..e3b03d792a --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = generic_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..f6c697e5cc --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = generic_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..ddd56b6bdd --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..dcd7e7b78a --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..d415baae95 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..ec5a61266e --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg new file mode 100644 index 0000000000..21249e7c1c --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg new file mode 100644 index 0000000000..0712198402 --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg new file mode 100644 index 0000000000..3ed00059f6 --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg new file mode 100644 index 0000000000..a5a013e4e2 --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg new file mode 100644 index 0000000000..9c75862a90 --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg new file mode 100644 index 0000000000..a7f166b20b --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg new file mode 100644 index 0000000000..ece298a822 --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg new file mode 100644 index 0000000000..37aebbb5dc --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg new file mode 100644 index 0000000000..f7b1bb6e16 --- /dev/null +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_tpe_83a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg new file mode 100644 index 0000000000..ca7371dfff --- /dev/null +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_tpe_83a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft +retraction_amount = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg new file mode 100644 index 0000000000..3344cf4458 --- /dev/null +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_tpe_83a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft +retraction_amount = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg new file mode 100644 index 0000000000..492b94231c --- /dev/null +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_tpe_83a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft +retraction_amount = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg new file mode 100644 index 0000000000..be6ccf7ed3 --- /dev/null +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_tpe_83a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft +retraction_amount = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg new file mode 100644 index 0000000000..5e3ea7d11b --- /dev/null +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_tpe_83a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft +retraction_amount = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg new file mode 100644 index 0000000000..298781adb0 --- /dev/null +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_tpe_83a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft +retraction_amount = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg new file mode 100644 index 0000000000..acf6b41e7d --- /dev/null +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_near + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_tpe_83a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft +retraction_amount = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg new file mode 100644 index 0000000000..ca21813303 --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_tpu_87a +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg new file mode 100644 index 0000000000..aa7d9afbfd --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_tpu_87a +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg new file mode 100644 index 0000000000..78ce65b986 --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_tpu_87a +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg new file mode 100644 index 0000000000..4848f545da --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_tpu_95a +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg new file mode 100644 index 0000000000..2ae20f3d58 --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_tpu_95a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg new file mode 100644 index 0000000000..fb15b635eb --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_tpu_95a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg new file mode 100644 index 0000000000..5a10921e33 --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_tpu_95a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg new file mode 100644 index 0000000000..ca21813303 --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_tpu_87a +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg new file mode 100644 index 0000000000..aa7d9afbfd --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_tpu_87a +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg new file mode 100644 index 0000000000..78ce65b986 --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_tpu_87a +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg new file mode 100644 index 0000000000..4848f545da --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_tpu_95a +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg new file mode 100644 index 0000000000..2ae20f3d58 --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_tpu_95a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg new file mode 100644 index 0000000000..fb15b635eb --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_tpu_95a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg new file mode 100644 index 0000000000..5a10921e33 --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_far + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_tpu_95a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = raft \ No newline at end of file diff --git a/resources/variants/goofoo_base_0.4.inst.cfg b/resources/variants/goofoo_base_0.4.inst.cfg new file mode 100644 index 0000000000..7450306b2b --- /dev/null +++ b/resources/variants/goofoo_base_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_base + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_e-one_0.4.inst.cfg b/resources/variants/goofoo_e-one_0.4.inst.cfg new file mode 100644 index 0000000000..d4d409a508 --- /dev/null +++ b/resources/variants/goofoo_e-one_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_e-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_gemini_0.4.inst.cfg b/resources/variants/goofoo_gemini_0.4.inst.cfg new file mode 100644 index 0000000000..27e0b16c56 --- /dev/null +++ b/resources/variants/goofoo_gemini_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_gemini + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_giant_0.4.inst.cfg b/resources/variants/goofoo_giant_0.4.inst.cfg new file mode 100644 index 0000000000..ee9f47e6e0 --- /dev/null +++ b/resources/variants/goofoo_giant_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_giant + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_max_0.4.inst.cfg b/resources/variants/goofoo_max_0.4.inst.cfg new file mode 100644 index 0000000000..5a101e21c0 --- /dev/null +++ b/resources/variants/goofoo_max_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_max + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_mido_0.4.inst.cfg b/resources/variants/goofoo_mido_0.4.inst.cfg new file mode 100644 index 0000000000..ec92e5d322 --- /dev/null +++ b/resources/variants/goofoo_mido_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_mido + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_miniadd_0.4.inst.cfg b/resources/variants/goofoo_miniadd_0.4.inst.cfg new file mode 100644 index 0000000000..feaf84040d --- /dev/null +++ b/resources/variants/goofoo_miniadd_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_miniadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_nova_0.4.inst.cfg b/resources/variants/goofoo_nova_0.4.inst.cfg new file mode 100644 index 0000000000..7a7924aa47 --- /dev/null +++ b/resources/variants/goofoo_nova_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_nova + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_plus_0.4.inst.cfg b/resources/variants/goofoo_plus_0.4.inst.cfg new file mode 100644 index 0000000000..d67687de09 --- /dev/null +++ b/resources/variants/goofoo_plus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_t-one_0.4.inst.cfg b/resources/variants/goofoo_t-one_0.4.inst.cfg new file mode 100644 index 0000000000..fe02d710d3 --- /dev/null +++ b/resources/variants/goofoo_t-one_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_t-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_tiny_0.4.inst.cfg b/resources/variants/goofoo_tiny_0.4.inst.cfg new file mode 100644 index 0000000000..da4439cd55 --- /dev/null +++ b/resources/variants/goofoo_tiny_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_tiny + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_tinyadd_0.4.inst.cfg b/resources/variants/goofoo_tinyadd_0.4.inst.cfg new file mode 100644 index 0000000000..7e2bbe1c1e --- /dev/null +++ b/resources/variants/goofoo_tinyadd_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_tinyadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 From 11f8e19bc4509ca35181bb7d0b69954bf21560ad Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Sat, 19 Dec 2020 10:58:05 +0800 Subject: [PATCH 02/74] =?UTF-8?q?=E4=BC=98=E5=8C=96PVA=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg | 10 +++++++++- .../goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg | 10 +++++++++- .../goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg | 10 +++++++++- .../goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg | 10 +++++++++- .../goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg | 10 +++++++++- .../goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg | 10 +++++++++- .../goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg | 10 +++++++++- .../goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg | 10 +++++++++- 8 files changed, 72 insertions(+), 8 deletions(-) diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg index 21249e7c1c..e8c18b8c6f 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg @@ -13,4 +13,12 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -retraction_amount = 6 \ No newline at end of file +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +retraction_enable = False +retraction_amount = 1 +retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg index 0712198402..a05b9056c8 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg @@ -13,4 +13,12 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -retraction_amount = 6 \ No newline at end of file +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +retraction_enable = False +retraction_amount = 1 +retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg index 3ed00059f6..7c785dc3d5 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg @@ -13,4 +13,12 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -retraction_amount = 6 \ No newline at end of file +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +retraction_enable = False +retraction_amount = 1 +retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg index a5a013e4e2..cc336d36da 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg @@ -13,4 +13,12 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -retraction_amount = 6 \ No newline at end of file +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +retraction_enable = False +retraction_amount = 1 +retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg index 9c75862a90..61917cabc2 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg @@ -13,4 +13,12 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -retraction_amount = 4.5 \ No newline at end of file +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +retraction_enable = False +retraction_amount = 1 +retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg index a7f166b20b..e2a67b4786 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg @@ -13,4 +13,12 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -retraction_amount = 4.5 \ No newline at end of file +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +retraction_enable = False +retraction_amount = 1 +retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg index ece298a822..3e49fd1bce 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg @@ -13,4 +13,12 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -retraction_amount = 4.5 \ No newline at end of file +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +retraction_enable = False +retraction_amount = 1 +retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg index 37aebbb5dc..2e74066a5e 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg @@ -13,4 +13,12 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -retraction_amount = 4.5 \ No newline at end of file +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +retraction_enable = False +retraction_amount = 1 +retraction_speed = 1 \ No newline at end of file From 3ff95582a57b1d17a71128c4fc5aa205c697f833 Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Tue, 22 Dec 2020 13:35:37 +0800 Subject: [PATCH 03/74] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=8C=E5=96=B7?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=8D=E8=83=BD=E9=87=8D=E5=8F=A0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/definitions/goofoo_gemini.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/goofoo_gemini.def.json b/resources/definitions/goofoo_gemini.def.json index 99ae3f1875..ce98d759db 100644 --- a/resources/definitions/goofoo_gemini.def.json +++ b/resources/definitions/goofoo_gemini.def.json @@ -7,6 +7,7 @@ "machine_width": { "default_value": 360 }, "machine_depth": { "default_value": 250 }, "machine_height": { "default_value": 200 }, + "machine_head_with_fans_polygon":{"default_value":[[0, 0], [0, 0], [0, 0], [0, 0]]}, "machine_extruder_count": { "default_value": 2 } From 95010849f4c75578ae2759eb1c9f52e5d4781135 Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Fri, 25 Dec 2020 13:55:49 +0800 Subject: [PATCH 04/74] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/definitions/renkforce_basic3.def.json | 4 ++-- resources/definitions/renkforce_pro3.def.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/renkforce_basic3.def.json b/resources/definitions/renkforce_basic3.def.json index 339d398d3c..1cc7c2deb2 100644 --- a/resources/definitions/renkforce_basic3.def.json +++ b/resources/definitions/renkforce_basic3.def.json @@ -1,7 +1,7 @@ { "name": "Renkforce Basic 3", "version": 2, - "inherits": "goofoo_far", + "inherits": "goofoo_small", "overrides": { "machine_name": { "default_value": "Basic 3" }, "machine_width": { "default_value": 120 }, @@ -10,7 +10,7 @@ "machine_heated_bed": { "default_value": false } }, "metadata": { - "author": "goofoo", + "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", "manufacturer": "Renkforce", "visible": true } diff --git a/resources/definitions/renkforce_pro3.def.json b/resources/definitions/renkforce_pro3.def.json index b710a00ee5..e047b1caa4 100644 --- a/resources/definitions/renkforce_pro3.def.json +++ b/resources/definitions/renkforce_pro3.def.json @@ -10,7 +10,7 @@ }, "metadata": { - "author": "goofoo", + "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", "manufacturer": "Renkforce", "visible": true } From e741ab13b9b7c0c4b9ac5c77671bd6a0553f910c Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Fri, 25 Dec 2020 14:00:52 +0800 Subject: [PATCH 05/74] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E5=9E=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/definitions/goofoo_small.def.json | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/definitions/goofoo_small.def.json diff --git a/resources/definitions/goofoo_small.def.json b/resources/definitions/goofoo_small.def.json new file mode 100644 index 0000000000..e5fab757fc --- /dev/null +++ b/resources/definitions/goofoo_small.def.json @@ -0,0 +1,25 @@ +{ + "注释":"用于tiny,tiny+", + "name": "goofoo_small", + "version": 2, + "inherits": "goofoo_base", + "metadata": { + "author": "goofoo", + "quality_definition": "goofoo_small", + "visible": false, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_peek", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_pa_cf", + "goofoo_pc", + "goofoo_pa", + "goofoo_asa", + "goofoo_abs", + "goofoo_pva", + "goofoo_hips" + ] + } +} \ No newline at end of file From 6a5b97f0320a82b78040478cf8d9958852f53258 Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Sat, 9 Jan 2021 09:27:00 +0800 Subject: [PATCH 06/74] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20goofoo=202-1?= =?UTF-8?q?=E6=B7=B7=E8=89=B2=E8=84=9A=E6=9C=AC=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scripts/ColorMix_goofoo.py | 282 ++++++++++++++++++ resources/definitions/goofoo_e-one.def.json | 20 +- resources/definitions/goofoo_far.def.json | 8 +- resources/definitions/goofoo_open.def.json | 22 ++ resources/definitions/goofoo_t-one.def.json | 15 + resources/definitions/goofoo_tiny.def.json | 2 +- resources/definitions/goofoo_tinyadd.def.json | 2 +- .../goofoo_open_global_0.15_fine.inst.cfg | 19 ++ .../goofoo_open_global_0.1_efine.inst.cfg | 19 ++ .../goofoo_open_global_0.20_standard.inst.cfg | 19 ++ .../goofoo_open_global_0.3_draft.inst.cfg | 20 ++ .../goofoo_small_global_0.15_fine.inst.cfg | 19 ++ .../goofoo_small_global_0.1_efine.inst.cfg | 19 ++ ...goofoo_small_global_0.20_standard.inst.cfg | 19 ++ .../goofoo_small_global_0.3_draft.inst.cfg | 20 ++ .../hips/goofoo_far_0.40_hips_draft.inst.cfg | 2 +- .../hips/goofoo_far_0.40_hips_efine.inst.cfg | 2 +- .../hips/goofoo_far_0.40_hips_fine.inst.cfg | 2 +- .../goofoo_far_0.40_hips_standard.inst.cfg | 2 +- .../hips/goofoo_near_0.40_hips_draft.inst.cfg | 2 +- .../hips/goofoo_near_0.40_hips_efine.inst.cfg | 2 +- .../hips/goofoo_near_0.40_hips_fine.inst.cfg | 2 +- .../goofoo_near_0.40_hips_standard.inst.cfg | 2 +- .../hips/goofoo_open_0.40_hips_draft.inst.cfg | 16 + .../hips/goofoo_open_0.40_hips_efine.inst.cfg | 16 + .../hips/goofoo_open_0.40_hips_fine.inst.cfg | 16 + .../goofoo_open_0.40_hips_standard.inst.cfg | 16 + .../pc/goofoo_far_0.40_pc_draft.inst.cfg | 2 +- .../pc/goofoo_far_0.40_pc_efine.inst.cfg | 2 +- .../pc/goofoo_far_0.40_pc_fine.inst.cfg | 2 +- .../pc/goofoo_far_0.40_pc_standard.inst.cfg | 2 +- .../pc/goofoo_near_0.40_pc_draft.inst.cfg | 2 +- .../pc/goofoo_near_0.40_pc_efine.inst.cfg | 2 +- .../pc/goofoo_near_0.40_pc_fine.inst.cfg | 2 +- .../pc/goofoo_near_0.40_pc_standard.inst.cfg | 2 +- .../peek/goofoo_far_0.40_peek_draft.inst.cfg | 2 +- .../peek/goofoo_far_0.40_peek_efine.inst.cfg | 2 +- .../peek/goofoo_far_0.40_peek_fine.inst.cfg | 2 +- .../goofoo_far_0.40_peek_standard.inst.cfg | 2 +- .../peek/goofoo_near_0.40_peek_draft.inst.cfg | 2 +- .../peek/goofoo_near_0.40_peek_efine.inst.cfg | 2 +- .../peek/goofoo_near_0.40_peek_fine.inst.cfg | 2 +- .../goofoo_near_0.40_peek_standard.inst.cfg | 2 +- .../petg/goofoo_far_0.40_petg_fine.inst.cfg | 2 +- .../goofoo_far_0.40_petg_standard.inst.cfg | 2 +- .../petg/goofoo_near_0.40_petg_fine.inst.cfg | 2 +- .../goofoo_near_0.40_petg_standard.inst.cfg | 2 +- .../petg/goofoo_open_0.40_petg_fine.inst.cfg | 18 ++ .../goofoo_open_0.40_petg_standard.inst.cfg | 18 ++ .../petg/goofoo_small_0.40_petg_fine.inst.cfg | 17 ++ .../goofoo_small_0.40_petg_standard.inst.cfg | 17 ++ .../pla/goofoo_far_0.40_pla_draft.inst.cfg | 2 +- .../pla/goofoo_far_0.40_pla_efine.inst.cfg | 2 +- .../pla/goofoo_far_0.40_pla_fine.inst.cfg | 2 +- .../pla/goofoo_far_0.40_pla_standard.inst.cfg | 2 +- ...goofoo_far_emarble_0.40_pla_draft.inst.cfg | 2 +- ...goofoo_far_emarble_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_far_emarble_0.40_pla_fine.inst.cfg | 2 +- ...foo_far_emarble_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_far_esilk_0.40_pla_draft.inst.cfg | 4 +- .../goofoo_far_esilk_0.40_pla_efine.inst.cfg | 4 +- .../goofoo_far_esilk_0.40_pla_fine.inst.cfg | 4 +- ...oofoo_far_esilk_0.40_pla_standard.inst.cfg | 4 +- .../goofoo_far_wood_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_far_wood_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_far_wood_0.40_pla_fine.inst.cfg | 2 +- ...goofoo_far_wood_0.40_pla_standard.inst.cfg | 2 +- .../pla/goofoo_near_0.40_pla_draft.inst.cfg | 2 +- .../pla/goofoo_near_0.40_pla_efine.inst.cfg | 2 +- .../pla/goofoo_near_0.40_pla_fine.inst.cfg | 2 +- .../goofoo_near_0.40_pla_standard.inst.cfg | 2 +- ...goofoo_near_bronze_0.40_pla_draft.inst.cfg | 2 +- ...goofoo_near_bronze_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_near_bronze_0.40_pla_fine.inst.cfg | 2 +- ...foo_near_bronze_0.40_pla_standard.inst.cfg | 2 +- ...oofoo_near_emarble_0.40_pla_draft.inst.cfg | 2 +- ...oofoo_near_emarble_0.40_pla_efine.inst.cfg | 2 +- ...goofoo_near_emarble_0.40_pla_fine.inst.cfg | 2 +- ...oo_near_emarble_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_near_esilk_0.40_pla_draft.inst.cfg | 4 +- .../goofoo_near_esilk_0.40_pla_efine.inst.cfg | 4 +- .../goofoo_near_esilk_0.40_pla_fine.inst.cfg | 4 +- ...ofoo_near_esilk_0.40_pla_standard.inst.cfg | 4 +- .../goofoo_near_wood_0.40_pla_draft.inst.cfg | 4 +- .../goofoo_near_wood_0.40_pla_efine.inst.cfg | 4 +- .../goofoo_near_wood_0.40_pla_fine.inst.cfg | 4 +- ...oofoo_near_wood_0.40_pla_standard.inst.cfg | 4 +- .../pla/goofoo_open_0.40_pla_draft.inst.cfg | 17 ++ .../pla/goofoo_open_0.40_pla_efine.inst.cfg | 17 ++ .../pla/goofoo_open_0.40_pla_fine.inst.cfg | 17 ++ .../goofoo_open_0.40_pla_standard.inst.cfg | 17 ++ ...oofoo_open_emarble_0.40_pla_draft.inst.cfg | 17 ++ ...oofoo_open_emarble_0.40_pla_efine.inst.cfg | 17 ++ ...goofoo_open_emarble_0.40_pla_fine.inst.cfg | 17 ++ ...oo_open_emarble_0.40_pla_standard.inst.cfg | 17 ++ .../goofoo_open_esilk_0.40_pla_draft.inst.cfg | 17 ++ .../goofoo_open_esilk_0.40_pla_efine.inst.cfg | 17 ++ .../goofoo_open_esilk_0.40_pla_fine.inst.cfg | 17 ++ ...ofoo_open_esilk_0.40_pla_standard.inst.cfg | 17 ++ .../goofoo_open_wood_0.40_pla_draft.inst.cfg | 17 ++ .../goofoo_open_wood_0.40_pla_efine.inst.cfg | 17 ++ .../goofoo_open_wood_0.40_pla_fine.inst.cfg | 17 ++ ...oofoo_open_wood_0.40_pla_standard.inst.cfg | 17 ++ .../pla/goofoo_small_0.40_pla_draft.inst.cfg | 16 + .../pla/goofoo_small_0.40_pla_efine.inst.cfg | 16 + .../pla/goofoo_small_0.40_pla_fine.inst.cfg | 16 + .../goofoo_small_0.40_pla_standard.inst.cfg | 16 + ...ofoo_small_emarble_0.40_pla_draft.inst.cfg | 16 + ...ofoo_small_emarble_0.40_pla_efine.inst.cfg | 16 + ...oofoo_small_emarble_0.40_pla_fine.inst.cfg | 16 + ...o_small_emarble_0.40_pla_standard.inst.cfg | 16 + ...goofoo_small_esilk_0.40_pla_draft.inst.cfg | 16 + ...goofoo_small_esilk_0.40_pla_efine.inst.cfg | 16 + .../goofoo_small_esilk_0.40_pla_fine.inst.cfg | 16 + ...foo_small_esilk_0.40_pla_standard.inst.cfg | 16 + .../goofoo_small_wood_0.40_pla_draft.inst.cfg | 16 + .../goofoo_small_wood_0.40_pla_efine.inst.cfg | 16 + .../goofoo_small_wood_0.40_pla_fine.inst.cfg | 16 + ...ofoo_small_wood_0.40_pla_standard.inst.cfg | 16 + .../pva/goofoo_far_0.40_pva_draft.inst.cfg | 6 +- .../pva/goofoo_far_0.40_pva_efine.inst.cfg | 6 +- .../pva/goofoo_far_0.40_pva_fine.inst.cfg | 6 +- .../pva/goofoo_far_0.40_pva_standard.inst.cfg | 6 +- .../pva/goofoo_near_0.40_pva_draft.inst.cfg | 6 +- .../pva/goofoo_near_0.40_pva_efine.inst.cfg | 6 +- .../pva/goofoo_near_0.40_pva_fine.inst.cfg | 6 +- .../goofoo_near_0.40_pva_standard.inst.cfg | 6 +- .../pva/goofoo_open_0.40_pva_draft.inst.cfg | 25 ++ .../pva/goofoo_open_0.40_pva_efine.inst.cfg | 25 ++ .../pva/goofoo_open_0.40_pva_fine.inst.cfg | 25 ++ .../goofoo_open_0.40_pva_standard.inst.cfg | 25 ++ .../tpe/goofoo_far_0.40_tpe_draft.inst.cfg | 3 +- .../tpe/goofoo_far_0.40_tpe_efine.inst.cfg | 3 +- .../tpe/goofoo_far_0.40_tpe_fine.inst.cfg | 3 +- .../tpe/goofoo_far_0.40_tpe_standard.inst.cfg | 3 +- .../tpe/goofoo_near_0.40_tpe_draft.inst.cfg | 3 +- .../tpe/goofoo_near_0.40_tpe_efine.inst.cfg | 3 +- .../tpe/goofoo_near_0.40_tpe_fine.inst.cfg | 3 +- .../goofoo_near_0.40_tpe_standard.inst.cfg | 3 +- .../goofoo_far_0.40_tpu_87a_draft.inst.cfg | 2 +- .../tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg | 2 +- .../goofoo_far_0.40_tpu_87a_standard.inst.cfg | 2 +- .../goofoo_far_0.40_tpu_95a_draft.inst.cfg | 2 +- .../goofoo_far_0.40_tpu_95a_efine.inst.cfg | 2 +- .../tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg | 2 +- .../goofoo_far_0.40_tpu_95a_standard.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_87a_draft.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_87a_fine.inst.cfg | 2 +- ...goofoo_near_0.40_tpu_87a_standard.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_95a_draft.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_95a_efine.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_95a_fine.inst.cfg | 2 +- ...goofoo_near_0.40_tpu_95a_standard.inst.cfg | 2 +- ...goofoo_open_0.40_tpu_95a_standard.inst.cfg | 17 ++ 154 files changed, 1400 insertions(+), 136 deletions(-) create mode 100644 plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py create mode 100644 resources/definitions/goofoo_open.def.json create mode 100644 resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg create mode 100644 resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg create mode 100644 resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg create mode 100644 resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg create mode 100644 resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg create mode 100644 resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg create mode 100644 resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg create mode 100644 resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg create mode 100644 resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg create mode 100644 resources/quality/goofoo/tpu/goofoo_open_0.40_tpu_95a_standard.inst.cfg diff --git a/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py b/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py new file mode 100644 index 0000000000..d83880a194 --- /dev/null +++ b/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py @@ -0,0 +1,282 @@ +# ColorMix_goofoo extruder color mix and blending +# This script is specific for the goofoo dual extruder. +# -*- coding: UTF-8 -*- + +import re #To perform the search and replace. +from ..Script import Script + +class ColorMix_goofoo(Script): + def __init__(self): + super().__init__() + + def getSettingDataString(self): + return """{ + "name":"ColorMix 2-1 goofoo", + "key":"ColorMix_goofoo", + "metadata": {}, + "version": 2, + "settings": + { + "units_of_measurement": + { + "label": "Units", + "description": "Input value as mm or layer number.", + "type": "enum", + "options": {"mm":"mm","layer":"Layer"}, + "default_value": "layer" + }, + "start_height": + { + "label": "Start Height", + "description": "Value to start at (mm or layer)", + "type": "float", + "default_value": 0, + "minimum_value": "0" + }, + "behavior": + { + "label": "Fixed or blend", + "description": "Select Fixed (set new mixture) or Blend mode (dynamic mix)", + "type": "enum", + "options": {"fixed_value":"Fixed","blend_value":"Blend"}, + "default_value": "fixed_value" + }, + "mix_radio": + { + "label": "mix ratio", + "description": "First extruder percentage 0-100", + "type": "int", + "default_value": 100, + "minimum_value": "0", + "minimum_value_warning": "0", + "maximum_value_warning": "100" + } + } + }""" + def getValue(self, line, key, default = None): #replace default getvalue due to comment-reading feature + if not key in line: + return default + subPart = line[line.find(key) + len(key):] #allows for string lengths larger than 1 + if ";ChangeAtZ" in key: + m = re.search("^[0-4]", subPart) + elif ";LAYER:" in key: + m = re.search("^[+-]?[0-9]*", subPart) + elif ";LAYER_COUNT:" in key: + m = re.search("[0-9]*", subPart) + else: + #the minus at the beginning allows for negative values, e.g. for delta printers + m = re.search("^[-]?[0-9]*\.?[0-9]*", subPart) + if m == None: + return default + try: + return float(m.group(0)) + except: + return default + def analyData(self,data,layerObjs,setObj): + for active_layer in data: + lines = active_layer.split("\n") + for line in lines:#;GOOFOO_2-1:sRatio:5 fixed:1 layer 5 + if ";GOOFOO_2-1:" in line:#checks for state change comment + layerObjs.append({'sRatio':int(self.getValue(line,"sRatio",0)),'fixed':int(self.getValue(line,"fixed",1)),'layer':int(self.getValue(line,"layer",0)),'isUse':0}) + def findItem(self,layerObjs,idx): + if None == layerObjs: + return None + arrCount = len(layerObjs) + if arrCount <= 0: + return None + itemObj = None + for i in range(arrCount): + itemObj = layerObjs[i] + if int(idx) == int(itemObj['layer']): + return itemObj + return None + def getSetObj(self,setObj,data,layerObjs): + sHei = self.getSettingValueByKey("start_height") + sMix = int(self.getSettingValueByKey("mix_radio")) + sMix = 100 - sMix + setObj['sRatio'] = sMix + isFixed = 0 + if "fixed_value" == self.getSettingValueByKey("behavior"): + isFixed = 1 + setObj['fixed'] = isFixed + + isMMType = 0 + if "mm" == self.getSettingValueByKey("units_of_measurement"): + isMMType = 1 + + layerHeight = 0 + for active_layer in data: + lines = active_layer.split("\n") + for line in lines: + if ";Layer height: " in line: + layerHeight = self.getValue(line,";Layer height: ",layerHeight) + break + if layerHeight != 0: + break + if 0 == layerHeight: + layerHeight = .2 + setObj['layerHeight'] = layerHeight + layerCount = 0 + for active_layer in data: + lines = active_layer.split("\n") + for line in lines: + if ";LAYER_COUNT:" in line: + layerCount = int(self.getValue(line,";LAYER_COUNT:",layerCount)) + break + if layerCount != 0: + break + if 0 == layerCount: + layerCount = 1 + setObj['layerCount'] = int(layerCount) + + if isMMType: + sHei = round(sHei / layerHeight) + if sHei < 0: + sHei = 1 + startLayer = int(sHei) + if startLayer > layerCount: + startLayer = layerCount + setObj['isSetEnd'] = 1 + setObj['layer'] = startLayer + + itemObj = None + itemObj = self.findItem(layerObjs,startLayer) + if None == itemObj: + layerObjs.append({'sRatio':sMix,'incRation':0.0,'fixed':isFixed,'layer':startLayer,'isUse':0}) + else: + itemObj['sRatio'] = sMix + itemObj['incRation'] = 0.0 + itemObj['fixed'] = isFixed + itemObj['isUse'] = 0 + def sortLayer(self,layerObjs,setObj): + itemObj = None + itemObj = self.findItem(layerObjs,0) + if None == itemObj: + layerObjs.append({'sRatio':100,'fixed':1,'layer':0}) + itemObj = self.findItem(layerObjs,int(setObj['layerCount'])) + if None == itemObj: + layerObjs.append({'sRatio':0,'fixed':1,'layer':int(setObj['layerCount'])}) + else: + setObj['isSetEnd'] = 1 + def analyIncRatio(self,layerObjs,setObj): + if None == layerObjs: + return None + layerCount = len(layerObjs) + if 0 >= layerCount: + return None + for i in range(layerCount-1): + itemObj = layerObjs[i] + nextObj = layerObjs[i+1] + if None != itemObj and None != nextObj: + # or setObj['isSetEnd'] == 1 + # if 5 > int(itemObj['sRatio']): + # itemObj['sRatio'] = 5 + # if 95 < int(itemObj['sRatio']): + # itemObj['sRatio'] = 95 + # if 5 > int(nextObj['sRatio']): + # nextObj['sRatio'] = 5 + # if 95 < int(nextObj['sRatio']): + # nextObj['sRatio'] = 95 + if 0 == itemObj['fixed']: + itemObj['incRation'] = float((nextObj['sRatio']-itemObj['sRatio'])/(nextObj['layer']-itemObj['layer'])) + else: + itemObj['incRation'] = 0.0 + else: + itemObj['incRation'] = 0.0 + layerObjs[layerCount-1]['incRation'] = 0.0 + def findLayerInfo(self,layer,layerObjs): + if int(layer) < 0: + return None + if None == layerObjs: + return None + layerCount = len(layerObjs) + if layerCount <= 1: + return None + itemObj = None + for i in range(layerCount-1): + itemObj = layerObjs[i] + nextObj = layerObjs[i+1] + if int(layer) >= int(itemObj['layer']) and int(layer) <= int(nextObj['layer']) and itemObj['isUse'] == 0: + if(itemObj['fixed'] == 1): + itemObj['isUse'] = 1 + return itemObj + return None + def createCommand(self,data,layerObjs,setObj): + index = 0 + layer = -1 + itemObj = None + isInitMaxHei = 0 + nextLine = "" + findCount = 0 + curLayer = 0 + start = 0 + for active_layer in data: + modified_gcode = "" + lineIndex = 0 + lines = active_layer.split("\n") + for line in lines: + #dont leave blanks + if ";MAX_Z_HEIGHT:" in line: + isInitMaxHei = 1 + if isInitMaxHei == 0: + isInitMaxHei = 1 + modified_gcode = ";MAX_Z_HEIGHT:{0:f}\n".format(float(setObj['layerHeight'] * setObj['layerCount'])) + + if start == 0 and ";LAYER_COUNT" in line: + start = 1 + if start == 1: + if itemObj != None and "G1" in line or "G0" in line and "E" in line: + modified_gcode += "M6050 S{0:2f} P{1:2f} Z{2:f}\n".format(float(firstExtruderValue/100.0),0.0,float(curHeight)) + if ("G1" in line or "G0" in line) and "Z" in line: + itemObj = self.findLayerInfo(int(curLayer),layerObjs) + if None != itemObj: + firstExtruderValue = int(((curLayer - itemObj['layer']) * itemObj['incRation']) + itemObj['sRatio']) + curHeight = self.getValue(line,"Z",0.0) + modified_gcode += "M6050 S{0:2f} P{1:2f} Z{2:f}\n".format(float(firstExtruderValue/100.0),float(itemObj['incRation']/100),float(curHeight)) + curLayer+=1 + if line != "": + modified_gcode += line + "\n" + lineIndex += 1 #for deleting index + data[index] = modified_gcode + index += 1 + def delFlag(self,data,layerObjs): + index = 0 + for active_layer in data: + # lineIndex = 0 + modified_gcode = "" + lines = active_layer.split("\n") + for line in lines: + if ";GOOFOO_2-1:" not in line and "M6050" not in line and "T0" not in line: + modified_gcode += line + "\n" + data[index] = modified_gcode + index += 1 + isInitFlag = 0 + index = 0 + for active_layer in data: + modified_gcode = "" + lines = active_layer.split("\n") + for line in lines: + if line != "": + modified_gcode += line + "\n" + if ";GOOFOO_2-1:" in line: + isInitFlag = 1 + if isInitFlag == 0: + isInitFlag = 1 + layerCount = len(layerObjs) + itemObj = None + for i in range(layerCount): + itemObj = layerObjs[i] + modified_gcode += ";GOOFOO_2-1:sRatio{0:d} fixed{1:d} layer{2:d}\n".format(itemObj['sRatio'],itemObj['fixed'],itemObj['layer']) + data[index] = modified_gcode + index += 1 + def execute(self, data): + setObj = {'sRatio':100,'incRation':0,'fixed':1,'layer':0,'layerCount':1,'layerHeight':.2,'isSetEnd':0,"endlayer":1,'eRatio':100,'isUseSet':0} + layerObjs = [] + self.getSetObj(setObj,data,layerObjs) + self.analyData(data,layerObjs,setObj) + self.sortLayer(layerObjs,setObj) + layerObjs = sorted(layerObjs,key=lambda e:e['layer']) + self.delFlag(data,layerObjs) + self.analyIncRatio(layerObjs,setObj) + self.createCommand(data,layerObjs,setObj) + return data \ No newline at end of file diff --git a/resources/definitions/goofoo_e-one.def.json b/resources/definitions/goofoo_e-one.def.json index dcde72e2bf..cda033a559 100644 --- a/resources/definitions/goofoo_e-one.def.json +++ b/resources/definitions/goofoo_e-one.def.json @@ -1,7 +1,7 @@ { "name": "goofoo_E-one", "version": 2, - "inherits": "goofoo_base", + "inherits": "goofoo_open", "overrides": { "machine_name": { "default_value": "e-one" }, "machine_width": { "default_value": 300 }, @@ -10,7 +10,21 @@ }, "metadata": { "author": "goofoo", - "quality_definition": "goofoo_far", - "visible": true + "visible": true, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_peek", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_pa_cf", + "goofoo_pc", + "goofoo_pa", + "goofoo_asa", + "goofoo_abs", + "goofoo_pva", + "goofoo_hips", + "goofoo_pva" + ] } } \ No newline at end of file diff --git a/resources/definitions/goofoo_far.def.json b/resources/definitions/goofoo_far.def.json index a287819ee1..139e1af675 100644 --- a/resources/definitions/goofoo_far.def.json +++ b/resources/definitions/goofoo_far.def.json @@ -5,6 +5,12 @@ "metadata": { "author": "goofoo", "quality_definition": "goofoo_far", - "visible": false + "visible": false, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a" + ] } } \ No newline at end of file diff --git a/resources/definitions/goofoo_open.def.json b/resources/definitions/goofoo_open.def.json new file mode 100644 index 0000000000..e8313b6704 --- /dev/null +++ b/resources/definitions/goofoo_open.def.json @@ -0,0 +1,22 @@ +{ + "name": "goofoo_open", + "version": 2, + "inherits": "goofoo_base", + "metadata": { + "author": "goofoo", + "quality_definition": "goofoo_open", + "visible": false, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_peek", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_pa_cf", + "goofoo_pc", + "goofoo_pa", + "goofoo_asa", + "goofoo_abs" + ] + } +} \ No newline at end of file diff --git a/resources/definitions/goofoo_t-one.def.json b/resources/definitions/goofoo_t-one.def.json index 366b855af2..e30424e589 100644 --- a/resources/definitions/goofoo_t-one.def.json +++ b/resources/definitions/goofoo_t-one.def.json @@ -17,6 +17,21 @@ "0": "goofoo_tone_1st", "1": "goofoo_tone_2st" }, + "exclude_materials": [ + "goofoo_bronze_pla", + "goofoo_peek", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_pa_cf", + "goofoo_pc", + "goofoo_pa", + "goofoo_asa", + "goofoo_abs", + "goofoo_pva", + "goofoo_hips", + "goofoo_pva" + ], "visible": true } } \ No newline at end of file diff --git a/resources/definitions/goofoo_tiny.def.json b/resources/definitions/goofoo_tiny.def.json index 23baec29c7..2878227c7c 100644 --- a/resources/definitions/goofoo_tiny.def.json +++ b/resources/definitions/goofoo_tiny.def.json @@ -1,7 +1,7 @@ { "name": "goofoo_Tiny", "version": 2, - "inherits": "goofoo_far", + "inherits": "goofoo_small", "overrides": { "machine_name": { "default_value": "tiny" }, "machine_width": { "default_value": 100 }, diff --git a/resources/definitions/goofoo_tinyadd.def.json b/resources/definitions/goofoo_tinyadd.def.json index 1222558eb9..67c2f2e271 100644 --- a/resources/definitions/goofoo_tinyadd.def.json +++ b/resources/definitions/goofoo_tinyadd.def.json @@ -1,7 +1,7 @@ { "name": "goofoo_Tiny+", "version": 2, - "inherits": "goofoo_far", + "inherits": "goofoo_small", "overrides": { "machine_name": { "default_value": "tinyadd" }, "machine_width": { "default_value": 120 }, diff --git a/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg new file mode 100644 index 0000000000..b465497b74 --- /dev/null +++ b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +weight = -1 +global_quality = True + +[values] +layer_height = 0.15 +layer_height_0 = 0.25 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*6 +support_interface_height = =layer_height*8 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg new file mode 100644 index 0000000000..1bc438a1f8 --- /dev/null +++ b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 +layer_height_0 = 0.15 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*6 +support_interface_height = =layer_height*12 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg new file mode 100644 index 0000000000..78551773d0 --- /dev/null +++ b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -3 +global_quality = True + +[values] +layer_height = 0.20 +layer_height_0 = 0.3 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*4 +support_interface_height = =layer_height*5 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg new file mode 100644 index 0000000000..94841370c9 --- /dev/null +++ b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.3 +layer_height_0 = 0.3 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*5 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg new file mode 100644 index 0000000000..08f6cb050d --- /dev/null +++ b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +weight = -1 +global_quality = True + +[values] +layer_height = 0.15 +layer_height_0 = 0.25 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*6 +support_interface_height = =layer_height*8 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg new file mode 100644 index 0000000000..0e77435150 --- /dev/null +++ b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 +layer_height_0 = 0.15 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*6 +support_interface_height = =layer_height*12 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg new file mode 100644 index 0000000000..68cd9d45ff --- /dev/null +++ b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -3 +global_quality = True + +[values] +layer_height = 0.20 +layer_height_0 = 0.3 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*4 +support_interface_height = =layer_height*5 +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg new file mode 100644 index 0000000000..deab999c97 --- /dev/null +++ b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.3 +layer_height_0 = 0.3 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*5 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true +retraction_speed = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg index 327cd0ded6..44833e05ac 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg index 6d2c273daf..e385fd688a 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg index 1f7b10771f..955d2bfa46 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg index b40449b254..b3a51798dd 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg index 6e8f4722a2..d77f8bab31 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg index de7dc266e0..556d28cf77 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg index f06519662c..04fd52c833 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg index 4e5466d692..bd3f0dc709 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg new file mode 100644 index 0000000000..6bc0c1e2c3 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = skirt +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg new file mode 100644 index 0000000000..889486deb1 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = skirt +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg new file mode 100644 index 0000000000..5eb3b31753 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = skirt +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg new file mode 100644 index 0000000000..79bcaf0ba7 --- /dev/null +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_hips +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = skirt +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg index 69e7f4e9f0..2f338461b8 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg index 61eabecd27..95205bca7e 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg index a545fd22f5..d04e5f07f9 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg index 2fb81d7490..1be78e7e63 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg index 0e11ddb6ae..5cd7402bf2 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg index 216c903a01..19e15e5660 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg index dccf3a60f4..fcfa389bb4 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg index e0094d2cfa..7ac0387c38 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg index 06e07cf60e..6ae0ff122e 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt cool_fan_enabled = False retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg index b2ec0182b3..574f1233bc 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt cool_fan_enabled = False retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg index 9a50e7b4ee..26e225eb53 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt cool_fan_enabled = False retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg index cc50caf5c1..65de74bdf2 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt cool_fan_enabled = False retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg index 2b191e9f23..4c0a5f6b89 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt cool_fan_enabled = False retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg index 7ff0e0f43a..75e9d17fff 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt cool_fan_enabled = False retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg index 5ee8660df1..c077d5d547 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt cool_fan_enabled = False retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg index 571326aec3..1748b91482 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt cool_fan_enabled = False retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg index 1a7fc8ae5e..4c950a2ef5 100644 --- a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg @@ -13,5 +13,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 speed_layer_0 = 15 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg index b1dfc8e896..4e174e97ab 100644 --- a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg @@ -13,5 +13,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 speed_layer_0 = 15 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg index f119084ff9..eb858d0ed7 100644 --- a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg @@ -13,5 +13,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 speed_layer_0 = 15 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg index fff9b74c6a..9d570cbbd8 100644 --- a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg @@ -13,5 +13,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 speed_layer_0 = 15 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg new file mode 100644 index 0000000000..9b546f2918 --- /dev/null +++ b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg new file mode 100644 index 0000000000..04976769d3 --- /dev/null +++ b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg new file mode 100644 index 0000000000..171717be12 --- /dev/null +++ b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg new file mode 100644 index 0000000000..91e205d618 --- /dev/null +++ b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg index e625bd68d7..c0081a8a59 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg index 1db0510435..ec8a0cbf93 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg index 863b3fb7bb..7e4c20295e 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg index 02060f935c..5df3cf7e4f 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg index 1e186205d3..40bd5ac541 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg index 0de27836bd..0dde515a6c 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg index ae430302f8..99f6dc067e 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg index aa10ef838c..e23d6d705c 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg index d9866732a4..32c51f5b22 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg @@ -7,10 +7,10 @@ definition = goofoo_far setting_version = 16 type = quality quality_type = draft -material = goofoo_eslik_pla +material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg index 59cfd580b6..7194809bd2 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg @@ -7,10 +7,10 @@ definition = goofoo_far setting_version = 16 type = quality quality_type = efine -material = goofoo_eslik_pla +material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg index 2c8440fab3..4af50479bb 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg @@ -7,10 +7,10 @@ definition = goofoo_far setting_version = 16 type = quality quality_type = fine -material = goofoo_eslik_pla +material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg index 301345d940..abb02d1309 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg @@ -7,10 +7,10 @@ definition = goofoo_far setting_version = 16 type = quality quality_type = normal -material = goofoo_eslik_pla +material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg index 3f938c511a..5af1490ef6 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg index 99aaed5cf6..3c9a05cc46 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg index 5a8a704e21..177fac2704 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg index 8062d4c76f..57b67a1e5b 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg index 80b286e81c..4cf85bb476 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg index cf20e99bd2..abecf3387f 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg index 4b2905f8f2..467f27cb01 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg index 8f1630279a..96339821e5 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg index 869bfaf98e..a6cdb979a8 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 1 retraction_speed = 10 diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg index e58630a57f..bd0aca4a35 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 1 retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg index 559f942077..0ec08a0302 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 1 retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg index ed230fe741..ee19e99bff 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 1 retraction_speed = 10 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg index bcb3ecabc8..89639cd0d2 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg index 8f223e4b48..d70959603c 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg index 6e02292287..82c2c637b5 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg index f3f73fb1ff..582f8d5f92 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg index 8b3eb36e51..3ad8614d3d 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg @@ -7,10 +7,10 @@ definition = goofoo_near setting_version = 16 type = quality quality_type = draft -material = goofoo_eslik_pla +material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg index 57bb001c76..8f815f53e7 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg @@ -7,10 +7,10 @@ definition = goofoo_near setting_version = 16 type = quality quality_type = efine -material = goofoo_eslik_pla +material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg index 3346596400..8f7ce1c255 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg @@ -7,10 +7,10 @@ definition = goofoo_near setting_version = 16 type = quality quality_type = fine -material = goofoo_eslik_pla +material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg index 973353a922..246b8f4c3a 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg @@ -7,10 +7,10 @@ definition = goofoo_near setting_version = 16 type = quality quality_type = normal -material = goofoo_eslik_pla +material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft +adhesion_type = skirt retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg index ddd56b6bdd..79a53f1a13 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 4.5 \ No newline at end of file +adhesion_type = skirt +retraction_amount = 5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg index dcd7e7b78a..045ea98479 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 4.5 \ No newline at end of file +adhesion_type = skirt +retraction_amount = 5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg index d415baae95..4875bf00a5 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 4.5 \ No newline at end of file +adhesion_type = skirt +retraction_amount = 5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg index ec5a61266e..210914aae8 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg @@ -12,5 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 4.5 \ No newline at end of file +adhesion_type = skirt +retraction_amount = 5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..1e1542cc17 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..bf945a246a --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..3424c910f0 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..6add5af306 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..8dd7f014ea --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..b595151cf4 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..f1b13439d5 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..65a02f975e --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..8e3f9075c4 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_esilk_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..c169caccbc --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_esilk_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..f2f6cd6f87 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_esilk_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..dcc03f51fa --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_esilk_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..7b7f1c0bc7 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..c585b34a79 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..d84ea1328f --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..0f7a4ca35a --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = skirt +retraction_amount = 6 +material_bed_temperature = 60 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..1d12aba008 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..17a992dd7f --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..283cc02caa --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..8d4985067c --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..51acfa53d3 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..11b15f1dfa --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..d46edcda38 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..2717fb8559 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_emarble_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..a1ff7bd15d --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_esilk_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..c581134df7 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_esilk_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..92190ed2a7 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_esilk_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..d087fbe425 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_esilk_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..de37196c95 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg new file mode 100644 index 0000000000..a5375d3039 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg new file mode 100644 index 0000000000..f24118d370 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..bd1f683513 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_small + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_wood_pla +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = raft +retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg index e8c18b8c6f..f7adf78359 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg @@ -19,6 +19,6 @@ support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -retraction_enable = False -retraction_amount = 1 -retraction_speed = 1 \ No newline at end of file +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg index a05b9056c8..25ec633618 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg @@ -19,6 +19,6 @@ support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -retraction_enable = False -retraction_amount = 1 -retraction_speed = 1 \ No newline at end of file +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg index 7c785dc3d5..a12b187791 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg @@ -19,6 +19,6 @@ support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -retraction_enable = False -retraction_amount = 1 -retraction_speed = 1 \ No newline at end of file +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg index cc336d36da..2b1c2ec43a 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg @@ -19,6 +19,6 @@ support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -retraction_enable = False -retraction_amount = 1 -retraction_speed = 1 \ No newline at end of file +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg index 61917cabc2..9b013295e9 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg @@ -19,6 +19,6 @@ support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -retraction_enable = False -retraction_amount = 1 -retraction_speed = 1 \ No newline at end of file +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg index e2a67b4786..66fa3739c1 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg @@ -19,6 +19,6 @@ support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -retraction_enable = False -retraction_amount = 1 -retraction_speed = 1 \ No newline at end of file +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg index 3e49fd1bce..d739edd985 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg @@ -19,6 +19,6 @@ support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -retraction_enable = False -retraction_amount = 1 -retraction_speed = 1 \ No newline at end of file +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg index 2e74066a5e..28cc3a4887 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg @@ -19,6 +19,6 @@ support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -retraction_enable = False -retraction_amount = 1 -retraction_speed = 1 \ No newline at end of file +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg new file mode 100644 index 0000000000..f737ee7684 --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Draft Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg new file mode 100644 index 0000000000..91149647f6 --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Extra Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = efine +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg new file mode 100644 index 0000000000..0622fe6e2c --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Fine Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = fine +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg new file mode 100644 index 0000000000..d788fc672d --- /dev/null +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = none +support_pattern = everywhere +support_pattern = grid +support_infill_rate = 50 +support_brim_enable = True +support_interface_enable = True +support_enable = True +# retraction_enable = False +# retraction_amount = 1 +# retraction_speed = 1 +material_bed_temperature = 70 \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg index f7b1bb6e16..2f8b797264 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg @@ -14,5 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg index ca7371dfff..6083e22787 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg @@ -14,5 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft -retraction_amount = 1 \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg index 3344cf4458..00f3525ea0 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg @@ -14,5 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft -retraction_amount = 1 \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg index 492b94231c..81d2456508 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg @@ -14,5 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft -retraction_amount = 1 \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg index be6ccf7ed3..8578fa38d6 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg @@ -14,5 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft -retraction_amount = 1 \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg index 5e3ea7d11b..91f8d6c519 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg @@ -14,5 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft -retraction_amount = 1 \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg index 298781adb0..e74720b95a 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg @@ -14,5 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft -retraction_amount = 1 \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg index acf6b41e7d..35cbf44e8b 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg @@ -14,5 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft -retraction_amount = 1 \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg index ca21813303..2afa0b0e60 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg @@ -14,4 +14,4 @@ variant = 0.5mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg index aa7d9afbfd..8422fcd770 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg @@ -14,4 +14,4 @@ variant = 0.6mm Nozzle wall_thickness = =line_width*3 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg index 78ce65b986..018d73bdab 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg @@ -14,4 +14,4 @@ variant = 0.5mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg index 4848f545da..5a186fef6e 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg @@ -14,4 +14,4 @@ variant = 0.6mm Nozzle wall_thickness = =line_width*3 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg index 2ae20f3d58..c506773578 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg @@ -14,4 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg index fb15b635eb..21565b87dd 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg @@ -14,4 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg index 5a10921e33..2ffc779628 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg @@ -14,4 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg index ca21813303..2afa0b0e60 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg @@ -14,4 +14,4 @@ variant = 0.5mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg index aa7d9afbfd..8422fcd770 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg @@ -14,4 +14,4 @@ variant = 0.6mm Nozzle wall_thickness = =line_width*3 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg index 78ce65b986..018d73bdab 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg @@ -14,4 +14,4 @@ variant = 0.5mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg index 4848f545da..5a186fef6e 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg @@ -14,4 +14,4 @@ variant = 0.6mm Nozzle wall_thickness = =line_width*3 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg index 2ae20f3d58..c506773578 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg @@ -14,4 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg index fb15b635eb..21565b87dd 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg @@ -14,4 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg index 5a10921e33..2ffc779628 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg @@ -14,4 +14,4 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = raft \ No newline at end of file +adhesion_type = skirt \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_open_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_open_0.40_tpu_95a_standard.inst.cfg new file mode 100644 index 0000000000..b3d9368fcf --- /dev/null +++ b/resources/quality/goofoo/tpu/goofoo_open_0.40_tpu_95a_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_open + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +material = goofoo_tpu_95a +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 +adhesion_type = skirt \ No newline at end of file From 385e09e861bd96c338138d75272699da94fcdbdd Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Sat, 9 Jan 2021 09:43:12 +0800 Subject: [PATCH 07/74] =?UTF-8?q?=E4=BC=98=E5=8C=96goofoo=202-1=E6=B7=B7?= =?UTF-8?q?=E8=89=B2=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scripts/ColorMix_goofoo.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py b/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py index d83880a194..cc1085baca 100644 --- a/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py +++ b/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py @@ -44,12 +44,12 @@ class ColorMix_goofoo(Script): "mix_radio": { "label": "mix ratio", - "description": "First extruder percentage 0-100", + "description": "First extruder percentage 5-95", "type": "int", - "default_value": 100, - "minimum_value": "0", - "minimum_value_warning": "0", - "maximum_value_warning": "100" + "default_value": 95, + "minimum_value": "5", + "minimum_value_warning": "5", + "maximum_value_warning": "95" } } }""" @@ -169,14 +169,14 @@ class ColorMix_goofoo(Script): nextObj = layerObjs[i+1] if None != itemObj and None != nextObj: # or setObj['isSetEnd'] == 1 - # if 5 > int(itemObj['sRatio']): - # itemObj['sRatio'] = 5 - # if 95 < int(itemObj['sRatio']): - # itemObj['sRatio'] = 95 - # if 5 > int(nextObj['sRatio']): - # nextObj['sRatio'] = 5 - # if 95 < int(nextObj['sRatio']): - # nextObj['sRatio'] = 95 + if 5 > int(itemObj['sRatio']): + itemObj['sRatio'] = 5 + if 95 < int(itemObj['sRatio']): + itemObj['sRatio'] = 95 + if 5 > int(nextObj['sRatio']): + nextObj['sRatio'] = 5 + if 95 < int(nextObj['sRatio']): + nextObj['sRatio'] = 95 if 0 == itemObj['fixed']: itemObj['incRation'] = float((nextObj['sRatio']-itemObj['sRatio'])/(nextObj['layer']-itemObj['layer'])) else: @@ -225,14 +225,14 @@ class ColorMix_goofoo(Script): if start == 0 and ";LAYER_COUNT" in line: start = 1 if start == 1: - if itemObj != None and "G1" in line or "G0" in line and "E" in line: - modified_gcode += "M6050 S{0:2f} P{1:2f} Z{2:f}\n".format(float(firstExtruderValue/100.0),0.0,float(curHeight)) + # if itemObj != None and "G1" in line or "G0" in line and "E" in line: + # modified_gcode += "M6050 S{0:2f} P{1:2f} Z{2:f}\n".format(float(firstExtruderValue/100.0),0.0,float(curHeight)) if ("G1" in line or "G0" in line) and "Z" in line: itemObj = self.findLayerInfo(int(curLayer),layerObjs) if None != itemObj: firstExtruderValue = int(((curLayer - itemObj['layer']) * itemObj['incRation']) + itemObj['sRatio']) curHeight = self.getValue(line,"Z",0.0) - modified_gcode += "M6050 S{0:2f} P{1:2f} Z{2:f}\n".format(float(firstExtruderValue/100.0),float(itemObj['incRation']/100),float(curHeight)) + modified_gcode += "M6050 S{0:2f} P{1:2f} Z{2:f}\n".format(float(firstExtruderValue/100.0),0.0,float(curHeight)) curLayer+=1 if line != "": modified_gcode += line + "\n" From 2cfcfb91cee17e1e260a2b86d5e5ccd5eb4db687 Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Mon, 11 Jan 2021 15:32:50 +0800 Subject: [PATCH 08/74] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E6=9C=BA?= =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goofoo_far_generic_0.40_pla_draft.inst.cfg | 16 ---------------- .../goofoo_far_generic_0.40_pla_efine.inst.cfg | 16 ---------------- .../goofoo_far_generic_0.40_pla_fine.inst.cfg | 16 ---------------- ...oofoo_far_generic_0.40_pla_standard.inst.cfg | 16 ---------------- .../goofoo_near_generic_0.40_pla_draft.inst.cfg | 16 ---------------- .../goofoo_near_generic_0.40_pla_efine.inst.cfg | 16 ---------------- .../goofoo_near_generic_0.40_pla_fine.inst.cfg | 16 ---------------- ...ofoo_near_generic_0.40_pla_standard.inst.cfg | 16 ---------------- .../tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg | 2 +- .../tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_87a_standard.inst.cfg | 2 +- .../tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg | 2 +- .../tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg | 2 +- .../tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_95a_standard.inst.cfg | 2 +- .../goofoo_open_0.40_tpu_95a_standard.inst.cfg | 17 ----------------- 16 files changed, 7 insertions(+), 152 deletions(-) delete mode 100644 resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_draft.inst.cfg delete mode 100644 resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_efine.inst.cfg delete mode 100644 resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_fine.inst.cfg delete mode 100644 resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_standard.inst.cfg delete mode 100644 resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_draft.inst.cfg delete mode 100644 resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_efine.inst.cfg delete mode 100644 resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_fine.inst.cfg delete mode 100644 resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_standard.inst.cfg delete mode 100644 resources/quality/goofoo/tpu/goofoo_open_0.40_tpu_95a_standard.inst.cfg diff --git a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_draft.inst.cfg deleted file mode 100644 index 9380a10f14..0000000000 --- a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_draft.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Draft Quality -definition = goofoo_far - -[metadata] -setting_version = 16 -type = quality -quality_type = draft -material = generic_pla -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_efine.inst.cfg deleted file mode 100644 index e70cd62743..0000000000 --- a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_efine.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Extra Fine Quality -definition = goofoo_far - -[metadata] -setting_version = 16 -type = quality -quality_type = efine -material = generic_pla -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_fine.inst.cfg deleted file mode 100644 index b853fe0483..0000000000 --- a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_fine.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Fine Quality -definition = goofoo_far - -[metadata] -setting_version = 16 -type = quality -quality_type = fine -material = generic_pla -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_standard.inst.cfg deleted file mode 100644 index 00aded6b29..0000000000 --- a/resources/quality/goofoo/pla/goofoo_far_generic_0.40_pla_standard.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Standard Quality -definition = goofoo_far - -[metadata] -setting_version = 16 -type = quality -quality_type = normal -material = generic_pla -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 6 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_draft.inst.cfg deleted file mode 100644 index e0327fb4bc..0000000000 --- a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_draft.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Draft Quality -definition = goofoo_near - -[metadata] -setting_version = 16 -type = quality -quality_type = draft -material = generic_pla -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_efine.inst.cfg deleted file mode 100644 index f1668a72cc..0000000000 --- a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_efine.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Extra Fine Quality -definition = goofoo_near - -[metadata] -setting_version = 16 -type = quality -quality_type = efine -material = generic_pla -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_fine.inst.cfg deleted file mode 100644 index e3b03d792a..0000000000 --- a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_fine.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Fine Quality -definition = goofoo_near - -[metadata] -setting_version = 16 -type = quality -quality_type = fine -material = generic_pla -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_standard.inst.cfg deleted file mode 100644 index f6c697e5cc..0000000000 --- a/resources/quality/goofoo/pla/goofoo_near_generic_0.40_pla_standard.inst.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[general] -version = 4 -name = Standard Quality -definition = goofoo_near - -[metadata] -setting_version = 16 -type = quality -quality_type = normal -material = generic_pla -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*2 -adhesion_type = raft -retraction_amount = 4.5 \ No newline at end of file diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg index 2afa0b0e60..86b51757f2 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = goofoo_far +definition = goofoo_near [metadata] setting_version = 16 diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg index 8422fcd770..3fde3ebb4e 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Fine Quality -definition = goofoo_far +definition = goofoo_near [metadata] setting_version = 16 diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg index 018d73bdab..2371757541 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = goofoo_far +definition = goofoo_near [metadata] setting_version = 16 diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg index 5a186fef6e..8f1270d331 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Draft Quality -definition = goofoo_far +definition = goofoo_near [metadata] setting_version = 16 diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg index c506773578..fe9aac6f06 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Extra Fine Quality -definition = goofoo_far +definition = goofoo_near [metadata] setting_version = 16 diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg index 21565b87dd..8784132714 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Fine Quality -definition = goofoo_far +definition = goofoo_near [metadata] setting_version = 16 diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg index 2ffc779628..f46cb3c910 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg @@ -1,7 +1,7 @@ [general] version = 4 name = Standard Quality -definition = goofoo_far +definition = goofoo_near [metadata] setting_version = 16 diff --git a/resources/quality/goofoo/tpu/goofoo_open_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_open_0.40_tpu_95a_standard.inst.cfg deleted file mode 100644 index b3d9368fcf..0000000000 --- a/resources/quality/goofoo/tpu/goofoo_open_0.40_tpu_95a_standard.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -version = 4 -name = Standard Quality -definition = goofoo_open - -[metadata] -setting_version = 16 -type = quality -quality_type = normal -material = goofoo_tpu_95a -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*4 -speed_print = 20 -speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file From 965f3928d758b9ef81c14860007a5ff447394442 Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Tue, 2 Feb 2021 09:07:02 +0800 Subject: [PATCH 09/74] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E5=8F=A3=E5=BE=84=E5=96=B7=E5=98=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/variants/goofoo_e-one_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_e-one_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_e-one_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_e-one_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_gemini_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_gemini_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_gemini_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_gemini_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_giant_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_giant_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_giant_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_giant_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_max_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_max_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_max_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_max_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_mido_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_mido_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_mido_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_mido_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_miniadd_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_miniadd_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_miniadd_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_miniadd_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_nova_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_nova_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_nova_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_nova_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_plus_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_plus_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_plus_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_plus_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_t-one_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_t-one_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_t-one_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_t-one_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tiny_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tiny_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tiny_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tiny_1.0.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tinyadd_0.2.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tinyadd_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tinyadd_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tinyadd_1.0.inst.cfg | 12 ++++++++++++ 44 files changed, 528 insertions(+) create mode 100644 resources/variants/goofoo_e-one_0.2.inst.cfg create mode 100644 resources/variants/goofoo_e-one_0.6.inst.cfg create mode 100644 resources/variants/goofoo_e-one_0.8.inst.cfg create mode 100644 resources/variants/goofoo_e-one_1.0.inst.cfg create mode 100644 resources/variants/goofoo_gemini_0.2.inst.cfg create mode 100644 resources/variants/goofoo_gemini_0.6.inst.cfg create mode 100644 resources/variants/goofoo_gemini_0.8.inst.cfg create mode 100644 resources/variants/goofoo_gemini_1.0.inst.cfg create mode 100644 resources/variants/goofoo_giant_0.2.inst.cfg create mode 100644 resources/variants/goofoo_giant_0.6.inst.cfg create mode 100644 resources/variants/goofoo_giant_0.8.inst.cfg create mode 100644 resources/variants/goofoo_giant_1.0.inst.cfg create mode 100644 resources/variants/goofoo_max_0.2.inst.cfg create mode 100644 resources/variants/goofoo_max_0.6.inst.cfg create mode 100644 resources/variants/goofoo_max_0.8.inst.cfg create mode 100644 resources/variants/goofoo_max_1.0.inst.cfg create mode 100644 resources/variants/goofoo_mido_0.2.inst.cfg create mode 100644 resources/variants/goofoo_mido_0.6.inst.cfg create mode 100644 resources/variants/goofoo_mido_0.8.inst.cfg create mode 100644 resources/variants/goofoo_mido_1.0.inst.cfg create mode 100644 resources/variants/goofoo_miniadd_0.2.inst.cfg create mode 100644 resources/variants/goofoo_miniadd_0.6.inst.cfg create mode 100644 resources/variants/goofoo_miniadd_0.8.inst.cfg create mode 100644 resources/variants/goofoo_miniadd_1.0.inst.cfg create mode 100644 resources/variants/goofoo_nova_0.2.inst.cfg create mode 100644 resources/variants/goofoo_nova_0.6.inst.cfg create mode 100644 resources/variants/goofoo_nova_0.8.inst.cfg create mode 100644 resources/variants/goofoo_nova_1.0.inst.cfg create mode 100644 resources/variants/goofoo_plus_0.2.inst.cfg create mode 100644 resources/variants/goofoo_plus_0.6.inst.cfg create mode 100644 resources/variants/goofoo_plus_0.8.inst.cfg create mode 100644 resources/variants/goofoo_plus_1.0.inst.cfg create mode 100644 resources/variants/goofoo_t-one_0.2.inst.cfg create mode 100644 resources/variants/goofoo_t-one_0.6.inst.cfg create mode 100644 resources/variants/goofoo_t-one_0.8.inst.cfg create mode 100644 resources/variants/goofoo_t-one_1.0.inst.cfg create mode 100644 resources/variants/goofoo_tiny_0.2.inst.cfg create mode 100644 resources/variants/goofoo_tiny_0.6.inst.cfg create mode 100644 resources/variants/goofoo_tiny_0.8.inst.cfg create mode 100644 resources/variants/goofoo_tiny_1.0.inst.cfg create mode 100644 resources/variants/goofoo_tinyadd_0.2.inst.cfg create mode 100644 resources/variants/goofoo_tinyadd_0.6.inst.cfg create mode 100644 resources/variants/goofoo_tinyadd_0.8.inst.cfg create mode 100644 resources/variants/goofoo_tinyadd_1.0.inst.cfg diff --git a/resources/variants/goofoo_e-one_0.2.inst.cfg b/resources/variants/goofoo_e-one_0.2.inst.cfg new file mode 100644 index 0000000000..425dd815e7 --- /dev/null +++ b/resources/variants/goofoo_e-one_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_e-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_e-one_0.6.inst.cfg b/resources/variants/goofoo_e-one_0.6.inst.cfg new file mode 100644 index 0000000000..3782f5619d --- /dev/null +++ b/resources/variants/goofoo_e-one_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_e-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_e-one_0.8.inst.cfg b/resources/variants/goofoo_e-one_0.8.inst.cfg new file mode 100644 index 0000000000..ea103f9763 --- /dev/null +++ b/resources/variants/goofoo_e-one_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_e-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_e-one_1.0.inst.cfg b/resources/variants/goofoo_e-one_1.0.inst.cfg new file mode 100644 index 0000000000..2435fb08d9 --- /dev/null +++ b/resources/variants/goofoo_e-one_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_e-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_gemini_0.2.inst.cfg b/resources/variants/goofoo_gemini_0.2.inst.cfg new file mode 100644 index 0000000000..0d2141cfbe --- /dev/null +++ b/resources/variants/goofoo_gemini_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_gemini + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_gemini_0.6.inst.cfg b/resources/variants/goofoo_gemini_0.6.inst.cfg new file mode 100644 index 0000000000..af3bbcd421 --- /dev/null +++ b/resources/variants/goofoo_gemini_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_gemini + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_gemini_0.8.inst.cfg b/resources/variants/goofoo_gemini_0.8.inst.cfg new file mode 100644 index 0000000000..d0065a6f82 --- /dev/null +++ b/resources/variants/goofoo_gemini_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_gemini + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_gemini_1.0.inst.cfg b/resources/variants/goofoo_gemini_1.0.inst.cfg new file mode 100644 index 0000000000..f267c9c894 --- /dev/null +++ b/resources/variants/goofoo_gemini_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_gemini + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_giant_0.2.inst.cfg b/resources/variants/goofoo_giant_0.2.inst.cfg new file mode 100644 index 0000000000..62b6b5a310 --- /dev/null +++ b/resources/variants/goofoo_giant_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_giant + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_giant_0.6.inst.cfg b/resources/variants/goofoo_giant_0.6.inst.cfg new file mode 100644 index 0000000000..f5d3b32188 --- /dev/null +++ b/resources/variants/goofoo_giant_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_giant + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_giant_0.8.inst.cfg b/resources/variants/goofoo_giant_0.8.inst.cfg new file mode 100644 index 0000000000..6eff703b7a --- /dev/null +++ b/resources/variants/goofoo_giant_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_giant + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_giant_1.0.inst.cfg b/resources/variants/goofoo_giant_1.0.inst.cfg new file mode 100644 index 0000000000..0bfa850100 --- /dev/null +++ b/resources/variants/goofoo_giant_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_giant + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_max_0.2.inst.cfg b/resources/variants/goofoo_max_0.2.inst.cfg new file mode 100644 index 0000000000..3ec313e5cf --- /dev/null +++ b/resources/variants/goofoo_max_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_max + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_max_0.6.inst.cfg b/resources/variants/goofoo_max_0.6.inst.cfg new file mode 100644 index 0000000000..3b9b7d46d7 --- /dev/null +++ b/resources/variants/goofoo_max_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_max + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_max_0.8.inst.cfg b/resources/variants/goofoo_max_0.8.inst.cfg new file mode 100644 index 0000000000..ab1628f7d9 --- /dev/null +++ b/resources/variants/goofoo_max_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_max + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_max_1.0.inst.cfg b/resources/variants/goofoo_max_1.0.inst.cfg new file mode 100644 index 0000000000..58f897805b --- /dev/null +++ b/resources/variants/goofoo_max_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_max + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_mido_0.2.inst.cfg b/resources/variants/goofoo_mido_0.2.inst.cfg new file mode 100644 index 0000000000..7a491e91da --- /dev/null +++ b/resources/variants/goofoo_mido_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_mido + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_mido_0.6.inst.cfg b/resources/variants/goofoo_mido_0.6.inst.cfg new file mode 100644 index 0000000000..98f9916130 --- /dev/null +++ b/resources/variants/goofoo_mido_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_mido + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_mido_0.8.inst.cfg b/resources/variants/goofoo_mido_0.8.inst.cfg new file mode 100644 index 0000000000..7a22c95692 --- /dev/null +++ b/resources/variants/goofoo_mido_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_mido + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_mido_1.0.inst.cfg b/resources/variants/goofoo_mido_1.0.inst.cfg new file mode 100644 index 0000000000..19095ddf7c --- /dev/null +++ b/resources/variants/goofoo_mido_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_mido + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_miniadd_0.2.inst.cfg b/resources/variants/goofoo_miniadd_0.2.inst.cfg new file mode 100644 index 0000000000..f58ec334b3 --- /dev/null +++ b/resources/variants/goofoo_miniadd_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_miniadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_miniadd_0.6.inst.cfg b/resources/variants/goofoo_miniadd_0.6.inst.cfg new file mode 100644 index 0000000000..6455e5655e --- /dev/null +++ b/resources/variants/goofoo_miniadd_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_miniadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_miniadd_0.8.inst.cfg b/resources/variants/goofoo_miniadd_0.8.inst.cfg new file mode 100644 index 0000000000..44e1542927 --- /dev/null +++ b/resources/variants/goofoo_miniadd_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_miniadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_miniadd_1.0.inst.cfg b/resources/variants/goofoo_miniadd_1.0.inst.cfg new file mode 100644 index 0000000000..693a0cb2ba --- /dev/null +++ b/resources/variants/goofoo_miniadd_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_miniadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_nova_0.2.inst.cfg b/resources/variants/goofoo_nova_0.2.inst.cfg new file mode 100644 index 0000000000..032031b373 --- /dev/null +++ b/resources/variants/goofoo_nova_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_nova + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_nova_0.6.inst.cfg b/resources/variants/goofoo_nova_0.6.inst.cfg new file mode 100644 index 0000000000..78915082fc --- /dev/null +++ b/resources/variants/goofoo_nova_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_nova + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_nova_0.8.inst.cfg b/resources/variants/goofoo_nova_0.8.inst.cfg new file mode 100644 index 0000000000..b1b80cf9c0 --- /dev/null +++ b/resources/variants/goofoo_nova_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_nova + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_nova_1.0.inst.cfg b/resources/variants/goofoo_nova_1.0.inst.cfg new file mode 100644 index 0000000000..efc8206e24 --- /dev/null +++ b/resources/variants/goofoo_nova_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_nova + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_plus_0.2.inst.cfg b/resources/variants/goofoo_plus_0.2.inst.cfg new file mode 100644 index 0000000000..5cd3fd687e --- /dev/null +++ b/resources/variants/goofoo_plus_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_plus_0.6.inst.cfg b/resources/variants/goofoo_plus_0.6.inst.cfg new file mode 100644 index 0000000000..358e01bd11 --- /dev/null +++ b/resources/variants/goofoo_plus_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_plus_0.8.inst.cfg b/resources/variants/goofoo_plus_0.8.inst.cfg new file mode 100644 index 0000000000..5300fa8c2b --- /dev/null +++ b/resources/variants/goofoo_plus_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_plus_1.0.inst.cfg b/resources/variants/goofoo_plus_1.0.inst.cfg new file mode 100644 index 0000000000..989f9721ca --- /dev/null +++ b/resources/variants/goofoo_plus_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_plus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_t-one_0.2.inst.cfg b/resources/variants/goofoo_t-one_0.2.inst.cfg new file mode 100644 index 0000000000..a7e2650ccb --- /dev/null +++ b/resources/variants/goofoo_t-one_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_t-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_t-one_0.6.inst.cfg b/resources/variants/goofoo_t-one_0.6.inst.cfg new file mode 100644 index 0000000000..ffc82782eb --- /dev/null +++ b/resources/variants/goofoo_t-one_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_t-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_t-one_0.8.inst.cfg b/resources/variants/goofoo_t-one_0.8.inst.cfg new file mode 100644 index 0000000000..0b7c09f744 --- /dev/null +++ b/resources/variants/goofoo_t-one_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_t-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_t-one_1.0.inst.cfg b/resources/variants/goofoo_t-one_1.0.inst.cfg new file mode 100644 index 0000000000..caf0efacc2 --- /dev/null +++ b/resources/variants/goofoo_t-one_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_t-one + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_tiny_0.2.inst.cfg b/resources/variants/goofoo_tiny_0.2.inst.cfg new file mode 100644 index 0000000000..f58ec321b9 --- /dev/null +++ b/resources/variants/goofoo_tiny_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_tiny + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_tiny_0.6.inst.cfg b/resources/variants/goofoo_tiny_0.6.inst.cfg new file mode 100644 index 0000000000..32b2153320 --- /dev/null +++ b/resources/variants/goofoo_tiny_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_tiny + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_tiny_0.8.inst.cfg b/resources/variants/goofoo_tiny_0.8.inst.cfg new file mode 100644 index 0000000000..b57813593c --- /dev/null +++ b/resources/variants/goofoo_tiny_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_tiny + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_tiny_1.0.inst.cfg b/resources/variants/goofoo_tiny_1.0.inst.cfg new file mode 100644 index 0000000000..d6da2eaee6 --- /dev/null +++ b/resources/variants/goofoo_tiny_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_tiny + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/goofoo_tinyadd_0.2.inst.cfg b/resources/variants/goofoo_tinyadd_0.2.inst.cfg new file mode 100644 index 0000000000..8737c15bfd --- /dev/null +++ b/resources/variants/goofoo_tinyadd_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = goofoo_tinyadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_tinyadd_0.6.inst.cfg b/resources/variants/goofoo_tinyadd_0.6.inst.cfg new file mode 100644 index 0000000000..eb08046858 --- /dev/null +++ b/resources/variants/goofoo_tinyadd_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_tinyadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_tinyadd_0.8.inst.cfg b/resources/variants/goofoo_tinyadd_0.8.inst.cfg new file mode 100644 index 0000000000..bc12f12563 --- /dev/null +++ b/resources/variants/goofoo_tinyadd_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_tinyadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_tinyadd_1.0.inst.cfg b/resources/variants/goofoo_tinyadd_1.0.inst.cfg new file mode 100644 index 0000000000..3b0d6fede5 --- /dev/null +++ b/resources/variants/goofoo_tinyadd_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_tinyadd + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 From e8567ae9e206eaf130161d857bf5a5366430fb26 Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Tue, 2 Feb 2021 09:09:10 +0800 Subject: [PATCH 10/74] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=96=B7=E5=98=B4?= =?UTF-8?q?=E5=8F=A3=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/variants/renkforce_basic3_0.2.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_basic3_0.4.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_basic3_0.6.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_basic3_0.8.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_basic3_1.0.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_pro3_0.2.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_pro3_0.4.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_pro3_0.6.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_pro3_0.8.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_pro3_1.0.inst.cfg | 12 ++++++++++++ 10 files changed, 120 insertions(+) create mode 100644 resources/variants/renkforce_basic3_0.2.inst.cfg create mode 100644 resources/variants/renkforce_basic3_0.4.inst.cfg create mode 100644 resources/variants/renkforce_basic3_0.6.inst.cfg create mode 100644 resources/variants/renkforce_basic3_0.8.inst.cfg create mode 100644 resources/variants/renkforce_basic3_1.0.inst.cfg create mode 100644 resources/variants/renkforce_pro3_0.2.inst.cfg create mode 100644 resources/variants/renkforce_pro3_0.4.inst.cfg create mode 100644 resources/variants/renkforce_pro3_0.6.inst.cfg create mode 100644 resources/variants/renkforce_pro3_0.8.inst.cfg create mode 100644 resources/variants/renkforce_pro3_1.0.inst.cfg diff --git a/resources/variants/renkforce_basic3_0.2.inst.cfg b/resources/variants/renkforce_basic3_0.2.inst.cfg new file mode 100644 index 0000000000..bbc0e23ff4 --- /dev/null +++ b/resources/variants/renkforce_basic3_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = renkforce_basic3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/renkforce_basic3_0.4.inst.cfg b/resources/variants/renkforce_basic3_0.4.inst.cfg new file mode 100644 index 0000000000..3fea108732 --- /dev/null +++ b/resources/variants/renkforce_basic3_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = renkforce_basic3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/renkforce_basic3_0.6.inst.cfg b/resources/variants/renkforce_basic3_0.6.inst.cfg new file mode 100644 index 0000000000..9bee130c57 --- /dev/null +++ b/resources/variants/renkforce_basic3_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = renkforce_basic3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/renkforce_basic3_0.8.inst.cfg b/resources/variants/renkforce_basic3_0.8.inst.cfg new file mode 100644 index 0000000000..70eae41aca --- /dev/null +++ b/resources/variants/renkforce_basic3_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = renkforce_basic3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/renkforce_basic3_1.0.inst.cfg b/resources/variants/renkforce_basic3_1.0.inst.cfg new file mode 100644 index 0000000000..4cf2efa122 --- /dev/null +++ b/resources/variants/renkforce_basic3_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = renkforce_basic3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/renkforce_pro3_0.2.inst.cfg b/resources/variants/renkforce_pro3_0.2.inst.cfg new file mode 100644 index 0000000000..3aa576e1d3 --- /dev/null +++ b/resources/variants/renkforce_pro3_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = renkforce_pro3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/renkforce_pro3_0.4.inst.cfg b/resources/variants/renkforce_pro3_0.4.inst.cfg new file mode 100644 index 0000000000..19e6ebbdfc --- /dev/null +++ b/resources/variants/renkforce_pro3_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = renkforce_pro3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/renkforce_pro3_0.6.inst.cfg b/resources/variants/renkforce_pro3_0.6.inst.cfg new file mode 100644 index 0000000000..fc5f92443d --- /dev/null +++ b/resources/variants/renkforce_pro3_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = renkforce_pro3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/renkforce_pro3_0.8.inst.cfg b/resources/variants/renkforce_pro3_0.8.inst.cfg new file mode 100644 index 0000000000..c2078dbdc4 --- /dev/null +++ b/resources/variants/renkforce_pro3_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = renkforce_pro3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/renkforce_pro3_1.0.inst.cfg b/resources/variants/renkforce_pro3_1.0.inst.cfg new file mode 100644 index 0000000000..45d79bbe14 --- /dev/null +++ b/resources/variants/renkforce_pro3_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = renkforce_pro3 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 From 77a2666744246710f3e4ae368fab6990688792eb Mon Sep 17 00:00:00 2001 From: laiqiqi Date: Thu, 13 May 2021 14:25:35 +0800 Subject: [PATCH 11/74] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/definitions/goofoo_base.def.json | 3 --- resources/definitions/goofoo_e-one.def.json | 5 ++--- resources/definitions/goofoo_far.def.json | 3 +-- resources/definitions/goofoo_gemini.def.json | 5 ++--- resources/definitions/goofoo_giant.def.json | 5 ++--- resources/definitions/goofoo_max.def.json | 4 ++-- resources/definitions/goofoo_mido.def.json | 5 ++--- ...iniadd.def.json => goofoo_miniplus.def.json} | 5 ++--- resources/definitions/goofoo_near.def.json | 3 +-- resources/definitions/goofoo_nova.def.json | 4 ++-- resources/definitions/goofoo_open.def.json | 3 +-- resources/definitions/goofoo_plus.def.json | 5 ++--- resources/definitions/goofoo_small.def.json | 4 +--- resources/definitions/goofoo_t-one.def.json | 5 ++--- resources/definitions/goofoo_tiny.def.json | 6 ++---- ...inyadd.def.json => goofoo_tinyplus.def.json} | 5 ++--- resources/definitions/renkforce_basic3.def.json | 2 +- resources/definitions/renkforce_pro3.def.json | 2 +- resources/definitions/renkforce_pro6.def.json | 17 +++++++++++++++++ .../goofoo/goofoo_far_global_0.15_fine.inst.cfg | 3 ++- .../goofoo/goofoo_far_global_0.1_efine.inst.cfg | 3 ++- .../goofoo_far_global_0.20_standard.inst.cfg | 3 ++- .../goofoo/goofoo_far_global_0.3_draft.inst.cfg | 3 ++- .../goofoo_near_global_0.15_fine.inst.cfg | 3 ++- .../goofoo_near_global_0.1_efine.inst.cfg | 3 ++- .../goofoo_near_global_0.20_standard.inst.cfg | 3 ++- .../goofoo_near_global_0.3_draft.inst.cfg | 3 ++- .../goofoo_open_global_0.15_fine.inst.cfg | 3 ++- .../goofoo_open_global_0.1_efine.inst.cfg | 3 ++- .../goofoo_open_global_0.20_standard.inst.cfg | 3 ++- .../goofoo_open_global_0.3_draft.inst.cfg | 3 ++- .../goofoo_small_global_0.15_fine.inst.cfg | 3 ++- .../goofoo_small_global_0.1_efine.inst.cfg | 3 ++- .../goofoo_small_global_0.20_standard.inst.cfg | 3 ++- .../goofoo_small_global_0.3_draft.inst.cfg | 3 ++- ....2.inst.cfg => goofoo_miniplus_0.2.inst.cfg} | 2 +- ....4.inst.cfg => goofoo_miniplus_0.4.inst.cfg} | 2 +- ....6.inst.cfg => goofoo_miniplus_0.6.inst.cfg} | 2 +- ....8.inst.cfg => goofoo_miniplus_0.8.inst.cfg} | 2 +- ....0.inst.cfg => goofoo_miniplus_1.0.inst.cfg} | 2 +- ....2.inst.cfg => goofoo_tinyplus_0.2.inst.cfg} | 2 +- resources/variants/goofoo_tinyplus_0.4.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tinyplus_0.6.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tinyplus_0.8.inst.cfg | 12 ++++++++++++ resources/variants/goofoo_tinyplus_1.0.inst.cfg | 12 ++++++++++++ resources/variants/renkforce_pro6_0.2.inst.cfg | 12 ++++++++++++ ...0.4.inst.cfg => renkforce_pro6_0.4.inst.cfg} | 2 +- ...0.6.inst.cfg => renkforce_pro6_0.6.inst.cfg} | 2 +- ...0.8.inst.cfg => renkforce_pro6_0.8.inst.cfg} | 2 +- ...1.0.inst.cfg => renkforce_pro6_1.0.inst.cfg} | 2 +- 50 files changed, 147 insertions(+), 72 deletions(-) rename resources/definitions/{goofoo_miniadd.def.json => goofoo_miniplus.def.json} (71%) rename resources/definitions/{goofoo_tinyadd.def.json => goofoo_tinyplus.def.json} (77%) create mode 100644 resources/definitions/renkforce_pro6.def.json rename resources/variants/{goofoo_tinyadd_0.2.inst.cfg => goofoo_miniplus_0.2.inst.cfg} (83%) rename resources/variants/{goofoo_miniadd_0.4.inst.cfg => goofoo_miniplus_0.4.inst.cfg} (83%) rename resources/variants/{goofoo_tinyadd_0.6.inst.cfg => goofoo_miniplus_0.6.inst.cfg} (83%) rename resources/variants/{goofoo_miniadd_0.8.inst.cfg => goofoo_miniplus_0.8.inst.cfg} (83%) rename resources/variants/{goofoo_tinyadd_1.0.inst.cfg => goofoo_miniplus_1.0.inst.cfg} (83%) rename resources/variants/{goofoo_miniadd_0.2.inst.cfg => goofoo_tinyplus_0.2.inst.cfg} (83%) create mode 100644 resources/variants/goofoo_tinyplus_0.4.inst.cfg create mode 100644 resources/variants/goofoo_tinyplus_0.6.inst.cfg create mode 100644 resources/variants/goofoo_tinyplus_0.8.inst.cfg create mode 100644 resources/variants/goofoo_tinyplus_1.0.inst.cfg create mode 100644 resources/variants/renkforce_pro6_0.2.inst.cfg rename resources/variants/{goofoo_tinyadd_0.4.inst.cfg => renkforce_pro6_0.4.inst.cfg} (84%) rename resources/variants/{goofoo_miniadd_0.6.inst.cfg => renkforce_pro6_0.6.inst.cfg} (84%) rename resources/variants/{goofoo_tinyadd_0.8.inst.cfg => renkforce_pro6_0.8.inst.cfg} (84%) rename resources/variants/{goofoo_miniadd_1.0.inst.cfg => renkforce_pro6_1.0.inst.cfg} (84%) diff --git a/resources/definitions/goofoo_base.def.json b/resources/definitions/goofoo_base.def.json index ac397a44e6..6d840438c1 100644 --- a/resources/definitions/goofoo_base.def.json +++ b/resources/definitions/goofoo_base.def.json @@ -25,9 +25,6 @@ }, "overrides": { - "machine_name": { "default_value": "Goofoo Base Printer" }, - - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, diff --git a/resources/definitions/goofoo_e-one.def.json b/resources/definitions/goofoo_e-one.def.json index cda033a559..891bafa99c 100644 --- a/resources/definitions/goofoo_e-one.def.json +++ b/resources/definitions/goofoo_e-one.def.json @@ -1,15 +1,14 @@ { - "name": "goofoo_E-one", + "name": "Goofoo E-one", "version": 2, "inherits": "goofoo_open", "overrides": { - "machine_name": { "default_value": "e-one" }, + "machine_name": { "default_value": "Goofoo E-one" }, "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 300 }, "machine_height": { "default_value": 380 } }, "metadata": { - "author": "goofoo", "visible": true, "exclude_materials": [ "goofoo_bronze_pla", diff --git a/resources/definitions/goofoo_far.def.json b/resources/definitions/goofoo_far.def.json index 139e1af675..ca91655179 100644 --- a/resources/definitions/goofoo_far.def.json +++ b/resources/definitions/goofoo_far.def.json @@ -1,9 +1,8 @@ { - "name": "goofoo_far", + "name": "Goofoo Far", "version": 2, "inherits": "goofoo_base", "metadata": { - "author": "goofoo", "quality_definition": "goofoo_far", "visible": false, "exclude_materials": [ diff --git a/resources/definitions/goofoo_gemini.def.json b/resources/definitions/goofoo_gemini.def.json index ce98d759db..7ada5057de 100644 --- a/resources/definitions/goofoo_gemini.def.json +++ b/resources/definitions/goofoo_gemini.def.json @@ -1,9 +1,9 @@ { - "name": "goofoo_Gemini", + "name": "Goofoo Gemini", "version": 2, "inherits": "goofoo_far", "overrides": { - "machine_name": { "default_value": "gemini" }, + "machine_name": { "default_value": "Goofoo Gemini" }, "machine_width": { "default_value": 360 }, "machine_depth": { "default_value": 250 }, "machine_height": { "default_value": 200 }, @@ -13,7 +13,6 @@ } }, "metadata": { - "author": "goofoo", "machine_extruder_trains": { "0": "goofoo_gemini_1st", "1": "goofoo_gemini_2st" diff --git a/resources/definitions/goofoo_giant.def.json b/resources/definitions/goofoo_giant.def.json index 6668fb76c4..5a20902502 100644 --- a/resources/definitions/goofoo_giant.def.json +++ b/resources/definitions/goofoo_giant.def.json @@ -1,16 +1,15 @@ { - "name": "goofoo_Giant", + "name": "Goofoo Giant", "version": 2, "inherits": "goofoo_near", "overrides": { - "machine_name": { "default_value": "giant" }, + "machine_name": { "default_value": "Goofoo Giant" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 1000 } }, "metadata": { - "author": "goofoo", "visible": true } } \ No newline at end of file diff --git a/resources/definitions/goofoo_max.def.json b/resources/definitions/goofoo_max.def.json index a499dc1dae..8a1ffad335 100644 --- a/resources/definitions/goofoo_max.def.json +++ b/resources/definitions/goofoo_max.def.json @@ -1,9 +1,9 @@ { - "name": "goofoo_Max", + "name": "Goofoo Max", "version": 2, "inherits": "goofoo_near", "overrides": { - "machine_name": { "default_value": "max" }, + "machine_name": { "default_value": "Goofoo Max" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 580 }, "machine_height": { "default_value": 700 }, diff --git a/resources/definitions/goofoo_mido.def.json b/resources/definitions/goofoo_mido.def.json index 073c4242f1..a4f8c23bad 100644 --- a/resources/definitions/goofoo_mido.def.json +++ b/resources/definitions/goofoo_mido.def.json @@ -1,16 +1,15 @@ { - "name": "goofoo_Mido", + "name": "Goofoo Mido", "version": 2, "inherits": "goofoo_near", "overrides": { - "machine_name": { "default_value": "mido" }, + "machine_name": { "default_value": "Goofoo Mido" }, "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_height": { "default_value": 200 } }, "metadata": { - "author": "goofoo", "visible": true } } \ No newline at end of file diff --git a/resources/definitions/goofoo_miniadd.def.json b/resources/definitions/goofoo_miniplus.def.json similarity index 71% rename from resources/definitions/goofoo_miniadd.def.json rename to resources/definitions/goofoo_miniplus.def.json index 60db68895f..87ea5509a7 100644 --- a/resources/definitions/goofoo_miniadd.def.json +++ b/resources/definitions/goofoo_miniplus.def.json @@ -1,16 +1,15 @@ { - "name": "goofoo_Mini+", + "name": "Goofoo Mini+", "version": 2, "inherits": "goofoo_near", "overrides": { - "machine_name": { "default_value": "miniadd" }, + "machine_name": { "default_value": "Goofoo Mini+" }, "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_height": { "default_value": 150 } }, "metadata": { - "author": "goofoo", "visible": true } } \ No newline at end of file diff --git a/resources/definitions/goofoo_near.def.json b/resources/definitions/goofoo_near.def.json index b1d7f4f088..073e44a751 100644 --- a/resources/definitions/goofoo_near.def.json +++ b/resources/definitions/goofoo_near.def.json @@ -1,9 +1,8 @@ { - "name": "goofoo_near", + "name": "Goofoo Near", "version": 2, "inherits": "goofoo_base", "metadata": { - "author": "goofoo", "quality_definition": "goofoo_near", "visible": false } diff --git a/resources/definitions/goofoo_nova.def.json b/resources/definitions/goofoo_nova.def.json index 09c3369932..882669f663 100644 --- a/resources/definitions/goofoo_nova.def.json +++ b/resources/definitions/goofoo_nova.def.json @@ -1,9 +1,9 @@ { - "name": "goofoo_Nova", + "name": "Goofoo Nova", "version": 2, "inherits": "goofoo_near", "overrides": { - "machine_name": { "default_value": "nova" }, + "machine_name": { "default_value": "Goofoo Nova" }, "machine_width": { "default_value": 280 }, "machine_depth": { "default_value": 280 }, "machine_height": { "default_value": 300 } diff --git a/resources/definitions/goofoo_open.def.json b/resources/definitions/goofoo_open.def.json index e8313b6704..5349859809 100644 --- a/resources/definitions/goofoo_open.def.json +++ b/resources/definitions/goofoo_open.def.json @@ -1,9 +1,8 @@ { - "name": "goofoo_open", + "name": "Goofoo Open", "version": 2, "inherits": "goofoo_base", "metadata": { - "author": "goofoo", "quality_definition": "goofoo_open", "visible": false, "exclude_materials": [ diff --git a/resources/definitions/goofoo_plus.def.json b/resources/definitions/goofoo_plus.def.json index 1f1b0190e9..cf95d5b174 100644 --- a/resources/definitions/goofoo_plus.def.json +++ b/resources/definitions/goofoo_plus.def.json @@ -1,16 +1,15 @@ { - "name": "goofoo_Plus", + "name": "Goofoo Plus", "version": 2, "inherits": "goofoo_near", "overrides": { - "machine_name": { "default_value": "plus" }, + "machine_name": { "default_value": "Goofoo Plus" }, "machine_width": { "default_value": 360 }, "machine_depth": { "default_value": 360 }, "machine_height": { "default_value": 400 } }, "metadata": { - "author": "goofoo", "visible": true } } \ No newline at end of file diff --git a/resources/definitions/goofoo_small.def.json b/resources/definitions/goofoo_small.def.json index e5fab757fc..4c919e9398 100644 --- a/resources/definitions/goofoo_small.def.json +++ b/resources/definitions/goofoo_small.def.json @@ -1,10 +1,8 @@ { - "注释":"用于tiny,tiny+", - "name": "goofoo_small", + "name": "Goofoo Small", "version": 2, "inherits": "goofoo_base", "metadata": { - "author": "goofoo", "quality_definition": "goofoo_small", "visible": false, "exclude_materials": [ diff --git a/resources/definitions/goofoo_t-one.def.json b/resources/definitions/goofoo_t-one.def.json index e30424e589..e67f1efa72 100644 --- a/resources/definitions/goofoo_t-one.def.json +++ b/resources/definitions/goofoo_t-one.def.json @@ -1,9 +1,9 @@ { - "name": "goofoo_T-one", + "name": "Goofoo T-one", "version": 2, "inherits": "goofoo_far", "overrides": { - "machine_name": { "default_value": "t-one" }, + "machine_name": { "default_value": "Goofoo T-one" }, "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_height": { "default_value": 150 }, @@ -12,7 +12,6 @@ } }, "metadata": { - "author": "goofoo", "machine_extruder_trains": { "0": "goofoo_tone_1st", "1": "goofoo_tone_2st" diff --git a/resources/definitions/goofoo_tiny.def.json b/resources/definitions/goofoo_tiny.def.json index 2878227c7c..0b15ab64d1 100644 --- a/resources/definitions/goofoo_tiny.def.json +++ b/resources/definitions/goofoo_tiny.def.json @@ -1,9 +1,9 @@ { - "name": "goofoo_Tiny", + "name": "Goofoo Tiny", "version": 2, "inherits": "goofoo_small", "overrides": { - "machine_name": { "default_value": "tiny" }, + "machine_name": { "default_value": "Goofoo Tiny" }, "machine_width": { "default_value": 100 }, "machine_depth": { "default_value": 100 }, "machine_height": { "default_value": 100 }, @@ -11,8 +11,6 @@ "raft_margin": { "default_value": 5 } }, "metadata": { - "author": "goofoo", - "visible": true } } \ No newline at end of file diff --git a/resources/definitions/goofoo_tinyadd.def.json b/resources/definitions/goofoo_tinyplus.def.json similarity index 77% rename from resources/definitions/goofoo_tinyadd.def.json rename to resources/definitions/goofoo_tinyplus.def.json index 67c2f2e271..82557cc260 100644 --- a/resources/definitions/goofoo_tinyadd.def.json +++ b/resources/definitions/goofoo_tinyplus.def.json @@ -1,9 +1,9 @@ { - "name": "goofoo_Tiny+", + "name": "Goofoo Tiny+", "version": 2, "inherits": "goofoo_small", "overrides": { - "machine_name": { "default_value": "tinyadd" }, + "machine_name": { "default_value": "Goofoo Tiny+" }, "machine_width": { "default_value": 120 }, "machine_depth": { "default_value": 120 }, "machine_height": { "default_value": 180 }, @@ -11,7 +11,6 @@ "machine_heated_bed": { "default_value": false } }, "metadata": { - "author": "goofoo", "visible": true } } \ No newline at end of file diff --git a/resources/definitions/renkforce_basic3.def.json b/resources/definitions/renkforce_basic3.def.json index 1cc7c2deb2..98b355bd53 100644 --- a/resources/definitions/renkforce_basic3.def.json +++ b/resources/definitions/renkforce_basic3.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "goofoo_small", "overrides": { - "machine_name": { "default_value": "Basic 3" }, + "machine_name": { "default_value": "Renkforce Basic 3" }, "machine_width": { "default_value": 120 }, "machine_depth": { "default_value": 120 }, "machine_height": { "default_value": 180 }, diff --git a/resources/definitions/renkforce_pro3.def.json b/resources/definitions/renkforce_pro3.def.json index e047b1caa4..0c40fdc509 100644 --- a/resources/definitions/renkforce_pro3.def.json +++ b/resources/definitions/renkforce_pro3.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "goofoo_near", "overrides": { - "machine_name": { "default_value": "Pro 3" }, + "machine_name": { "default_value": "Renkforce Pro 3" }, "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "machine_height": { "default_value": 150 } diff --git a/resources/definitions/renkforce_pro6.def.json b/resources/definitions/renkforce_pro6.def.json new file mode 100644 index 0000000000..63560506ea --- /dev/null +++ b/resources/definitions/renkforce_pro6.def.json @@ -0,0 +1,17 @@ +{ + "name": "Renkforce Pro 6", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "Renkforce Pro 6" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 200 } + + }, + "metadata": { + "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "visible": true + } +} \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg index 8227fceaab..0456b901f4 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.25 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 support_interface_height = =layer_height*8 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg index bd2c89f6ce..ae1538e681 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.15 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 support_interface_height = =layer_height*12 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg index 093c4d567c..82e1ce4979 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.3 top_bottom_thickness = 0.8 wall_thickness = =line_width*4 support_interface_height = =layer_height*5 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg index 1f67e7a86b..47a2ebfa3e 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg @@ -17,4 +17,5 @@ top_bottom_thickness = 0.8 wall_thickness = =line_width*5 support_interface_height = =layer_height*6 adaptive_layer_height_enabled = true -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg index b1792099c4..283c420e57 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.25 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 support_interface_height = =layer_height*8 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg index 135ade7dee..13d7036e25 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.15 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 support_interface_height = =layer_height*12 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg index 676c01bc2c..88088facf4 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.3 top_bottom_thickness = 0.8 wall_thickness = =line_width*4 support_interface_height = =layer_height*5 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg index 5b1f5ddc3d..dc9c721262 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg @@ -17,4 +17,5 @@ top_bottom_thickness = 0.8 wall_thickness = =line_width*5 support_interface_height = =layer_height*6 adaptive_layer_height_enabled = true -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg index b465497b74..796f5451df 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.25 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 support_interface_height = =layer_height*8 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg index 1bc438a1f8..730176d9d3 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.15 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 support_interface_height = =layer_height*12 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg index 78551773d0..832091b5c0 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.3 top_bottom_thickness = 0.8 wall_thickness = =line_width*4 support_interface_height = =layer_height*5 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg index 94841370c9..5ed95c1f95 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg @@ -17,4 +17,5 @@ top_bottom_thickness = 0.8 wall_thickness = =line_width*5 support_interface_height = =layer_height*6 adaptive_layer_height_enabled = true -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg index 08f6cb050d..c18e61cac4 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.25 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 support_interface_height = =layer_height*8 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg index 0e77435150..298c18fede 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.15 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 support_interface_height = =layer_height*12 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg index 68cd9d45ff..dee6b17005 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg @@ -16,4 +16,5 @@ layer_height_0 = 0.3 top_bottom_thickness = 0.8 wall_thickness = =line_width*4 support_interface_height = =layer_height*5 -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg index deab999c97..27e1d60b99 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg @@ -17,4 +17,5 @@ top_bottom_thickness = 0.8 wall_thickness = =line_width*5 support_interface_height = =layer_height*6 adaptive_layer_height_enabled = true -retraction_speed = 60 \ No newline at end of file +retraction_speed = 60 +cool_fan_enabled = True \ No newline at end of file diff --git a/resources/variants/goofoo_tinyadd_0.2.inst.cfg b/resources/variants/goofoo_miniplus_0.2.inst.cfg similarity index 83% rename from resources/variants/goofoo_tinyadd_0.2.inst.cfg rename to resources/variants/goofoo_miniplus_0.2.inst.cfg index 8737c15bfd..14fdb6ee6e 100644 --- a/resources/variants/goofoo_tinyadd_0.2.inst.cfg +++ b/resources/variants/goofoo_miniplus_0.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.2mm Nozzle version = 4 -definition = goofoo_tinyadd +definition = goofoo_miniplus [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_miniadd_0.4.inst.cfg b/resources/variants/goofoo_miniplus_0.4.inst.cfg similarity index 83% rename from resources/variants/goofoo_miniadd_0.4.inst.cfg rename to resources/variants/goofoo_miniplus_0.4.inst.cfg index feaf84040d..d484d9e596 100644 --- a/resources/variants/goofoo_miniadd_0.4.inst.cfg +++ b/resources/variants/goofoo_miniplus_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4mm Nozzle version = 4 -definition = goofoo_miniadd +definition = goofoo_miniplus [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_tinyadd_0.6.inst.cfg b/resources/variants/goofoo_miniplus_0.6.inst.cfg similarity index 83% rename from resources/variants/goofoo_tinyadd_0.6.inst.cfg rename to resources/variants/goofoo_miniplus_0.6.inst.cfg index eb08046858..e85fb32875 100644 --- a/resources/variants/goofoo_tinyadd_0.6.inst.cfg +++ b/resources/variants/goofoo_miniplus_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6mm Nozzle version = 4 -definition = goofoo_tinyadd +definition = goofoo_miniplus [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_miniadd_0.8.inst.cfg b/resources/variants/goofoo_miniplus_0.8.inst.cfg similarity index 83% rename from resources/variants/goofoo_miniadd_0.8.inst.cfg rename to resources/variants/goofoo_miniplus_0.8.inst.cfg index 44e1542927..8ae1e4f3c4 100644 --- a/resources/variants/goofoo_miniadd_0.8.inst.cfg +++ b/resources/variants/goofoo_miniplus_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8mm Nozzle version = 4 -definition = goofoo_miniadd +definition = goofoo_miniplus [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_tinyadd_1.0.inst.cfg b/resources/variants/goofoo_miniplus_1.0.inst.cfg similarity index 83% rename from resources/variants/goofoo_tinyadd_1.0.inst.cfg rename to resources/variants/goofoo_miniplus_1.0.inst.cfg index 3b0d6fede5..aab56eb030 100644 --- a/resources/variants/goofoo_tinyadd_1.0.inst.cfg +++ b/resources/variants/goofoo_miniplus_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0mm Nozzle version = 4 -definition = goofoo_tinyadd +definition = goofoo_miniplus [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_miniadd_0.2.inst.cfg b/resources/variants/goofoo_tinyplus_0.2.inst.cfg similarity index 83% rename from resources/variants/goofoo_miniadd_0.2.inst.cfg rename to resources/variants/goofoo_tinyplus_0.2.inst.cfg index f58ec334b3..b57f7141d7 100644 --- a/resources/variants/goofoo_miniadd_0.2.inst.cfg +++ b/resources/variants/goofoo_tinyplus_0.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.2mm Nozzle version = 4 -definition = goofoo_miniadd +definition = goofoo_tinyplus [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_tinyplus_0.4.inst.cfg b/resources/variants/goofoo_tinyplus_0.4.inst.cfg new file mode 100644 index 0000000000..b731860e83 --- /dev/null +++ b/resources/variants/goofoo_tinyplus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = goofoo_tinyplus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/goofoo_tinyplus_0.6.inst.cfg b/resources/variants/goofoo_tinyplus_0.6.inst.cfg new file mode 100644 index 0000000000..12d8117753 --- /dev/null +++ b/resources/variants/goofoo_tinyplus_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = goofoo_tinyplus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/goofoo_tinyplus_0.8.inst.cfg b/resources/variants/goofoo_tinyplus_0.8.inst.cfg new file mode 100644 index 0000000000..d0c1dbb236 --- /dev/null +++ b/resources/variants/goofoo_tinyplus_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = goofoo_tinyplus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/goofoo_tinyplus_1.0.inst.cfg b/resources/variants/goofoo_tinyplus_1.0.inst.cfg new file mode 100644 index 0000000000..be3d5a0a01 --- /dev/null +++ b/resources/variants/goofoo_tinyplus_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = goofoo_tinyplus + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/renkforce_pro6_0.2.inst.cfg b/resources/variants/renkforce_pro6_0.2.inst.cfg new file mode 100644 index 0000000000..3a7739c90e --- /dev/null +++ b/resources/variants/renkforce_pro6_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = renkforce_pro6 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/goofoo_tinyadd_0.4.inst.cfg b/resources/variants/renkforce_pro6_0.4.inst.cfg similarity index 84% rename from resources/variants/goofoo_tinyadd_0.4.inst.cfg rename to resources/variants/renkforce_pro6_0.4.inst.cfg index 7e2bbe1c1e..0466c4780b 100644 --- a/resources/variants/goofoo_tinyadd_0.4.inst.cfg +++ b/resources/variants/renkforce_pro6_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4mm Nozzle version = 4 -definition = goofoo_tinyadd +definition = renkforce_pro6 [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_miniadd_0.6.inst.cfg b/resources/variants/renkforce_pro6_0.6.inst.cfg similarity index 84% rename from resources/variants/goofoo_miniadd_0.6.inst.cfg rename to resources/variants/renkforce_pro6_0.6.inst.cfg index 6455e5655e..6613f36ece 100644 --- a/resources/variants/goofoo_miniadd_0.6.inst.cfg +++ b/resources/variants/renkforce_pro6_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6mm Nozzle version = 4 -definition = goofoo_miniadd +definition = renkforce_pro6 [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_tinyadd_0.8.inst.cfg b/resources/variants/renkforce_pro6_0.8.inst.cfg similarity index 84% rename from resources/variants/goofoo_tinyadd_0.8.inst.cfg rename to resources/variants/renkforce_pro6_0.8.inst.cfg index bc12f12563..d82c379d42 100644 --- a/resources/variants/goofoo_tinyadd_0.8.inst.cfg +++ b/resources/variants/renkforce_pro6_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8mm Nozzle version = 4 -definition = goofoo_tinyadd +definition = renkforce_pro6 [metadata] setting_version = 16 diff --git a/resources/variants/goofoo_miniadd_1.0.inst.cfg b/resources/variants/renkforce_pro6_1.0.inst.cfg similarity index 84% rename from resources/variants/goofoo_miniadd_1.0.inst.cfg rename to resources/variants/renkforce_pro6_1.0.inst.cfg index 693a0cb2ba..9e736642f1 100644 --- a/resources/variants/goofoo_miniadd_1.0.inst.cfg +++ b/resources/variants/renkforce_pro6_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0mm Nozzle version = 4 -definition = goofoo_miniadd +definition = renkforce_pro6 [metadata] setting_version = 16 From 90f426797354a46e15b68370d6c1338e133e5972 Mon Sep 17 00:00:00 2001 From: goofoo Date: Wed, 28 Jul 2021 17:49:28 +0800 Subject: [PATCH 12/74] modify setting_version = 16 to setting_version = 17 --- .../scripts/ColorMix_goofoo.py | 282 ------------------ .../abs/goofoo_far_0.40_abs_fine.inst.cfg | 2 +- .../abs/goofoo_far_0.40_abs_standard.inst.cfg | 2 +- .../abs/goofoo_near_0.40_abs_fine.inst.cfg | 2 +- .../goofoo_near_0.40_abs_standard.inst.cfg | 2 +- .../asa/goofoo_far_0.40_asa_fine.inst.cfg | 2 +- .../asa/goofoo_far_0.40_asa_standard.inst.cfg | 2 +- .../asa/goofoo_near_0.40_asa_fine.inst.cfg | 2 +- .../goofoo_near_0.40_asa_standard.inst.cfg | 2 +- .../goofoo_far_global_0.15_fine.inst.cfg | 2 +- .../goofoo_far_global_0.1_efine.inst.cfg | 2 +- .../goofoo_far_global_0.20_standard.inst.cfg | 2 +- .../goofoo_far_global_0.3_draft.inst.cfg | 2 +- .../goofoo_near_global_0.15_fine.inst.cfg | 2 +- .../goofoo_near_global_0.1_efine.inst.cfg | 2 +- .../goofoo_near_global_0.20_standard.inst.cfg | 2 +- .../goofoo_near_global_0.3_draft.inst.cfg | 2 +- .../goofoo_open_global_0.15_fine.inst.cfg | 2 +- .../goofoo_open_global_0.1_efine.inst.cfg | 2 +- .../goofoo_open_global_0.20_standard.inst.cfg | 2 +- .../goofoo_open_global_0.3_draft.inst.cfg | 2 +- .../goofoo_small_global_0.15_fine.inst.cfg | 2 +- .../goofoo_small_global_0.1_efine.inst.cfg | 2 +- ...goofoo_small_global_0.20_standard.inst.cfg | 2 +- .../goofoo_small_global_0.3_draft.inst.cfg | 2 +- .../hips/goofoo_far_0.40_hips_draft.inst.cfg | 2 +- .../hips/goofoo_far_0.40_hips_efine.inst.cfg | 2 +- .../hips/goofoo_far_0.40_hips_fine.inst.cfg | 2 +- .../goofoo_far_0.40_hips_standard.inst.cfg | 2 +- .../hips/goofoo_near_0.40_hips_draft.inst.cfg | 2 +- .../hips/goofoo_near_0.40_hips_efine.inst.cfg | 2 +- .../hips/goofoo_near_0.40_hips_fine.inst.cfg | 2 +- .../goofoo_near_0.40_hips_standard.inst.cfg | 2 +- .../hips/goofoo_open_0.40_hips_draft.inst.cfg | 2 +- .../hips/goofoo_open_0.40_hips_efine.inst.cfg | 2 +- .../hips/goofoo_open_0.40_hips_fine.inst.cfg | 2 +- .../goofoo_open_0.40_hips_standard.inst.cfg | 2 +- .../pa/goofoo_far_0.40_pa_fine.inst.cfg | 2 +- .../pa/goofoo_far_0.40_pa_standard.inst.cfg | 2 +- .../pa/goofoo_near_0.40_pa_fine.inst.cfg | 2 +- .../pa/goofoo_near_0.40_pa_standard.inst.cfg | 2 +- .../pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg | 2 +- .../goofoo_far_0.40_pa_cf_standard.inst.cfg | 2 +- .../goofoo_near_0.40_pa_cf_fine.inst.cfg | 2 +- .../goofoo_near_0.40_pa_cf_standard.inst.cfg | 2 +- .../pc/goofoo_far_0.40_pc_draft.inst.cfg | 2 +- .../pc/goofoo_far_0.40_pc_efine.inst.cfg | 2 +- .../pc/goofoo_far_0.40_pc_fine.inst.cfg | 2 +- .../pc/goofoo_far_0.40_pc_standard.inst.cfg | 2 +- .../pc/goofoo_near_0.40_pc_draft.inst.cfg | 2 +- .../pc/goofoo_near_0.40_pc_efine.inst.cfg | 2 +- .../pc/goofoo_near_0.40_pc_fine.inst.cfg | 2 +- .../pc/goofoo_near_0.40_pc_standard.inst.cfg | 2 +- .../peek/goofoo_far_0.40_peek_draft.inst.cfg | 2 +- .../peek/goofoo_far_0.40_peek_efine.inst.cfg | 2 +- .../peek/goofoo_far_0.40_peek_fine.inst.cfg | 2 +- .../goofoo_far_0.40_peek_standard.inst.cfg | 2 +- .../peek/goofoo_near_0.40_peek_draft.inst.cfg | 2 +- .../peek/goofoo_near_0.40_peek_efine.inst.cfg | 2 +- .../peek/goofoo_near_0.40_peek_fine.inst.cfg | 2 +- .../goofoo_near_0.40_peek_standard.inst.cfg | 2 +- .../petg/goofoo_far_0.40_petg_fine.inst.cfg | 4 +- .../goofoo_far_0.40_petg_standard.inst.cfg | 4 +- .../petg/goofoo_near_0.40_petg_fine.inst.cfg | 4 +- .../goofoo_near_0.40_petg_standard.inst.cfg | 4 +- .../petg/goofoo_open_0.40_petg_fine.inst.cfg | 4 +- .../goofoo_open_0.40_petg_standard.inst.cfg | 4 +- .../petg/goofoo_small_0.40_petg_fine.inst.cfg | 4 +- .../goofoo_small_0.40_petg_standard.inst.cfg | 4 +- .../pla/goofoo_far_0.40_pla_draft.inst.cfg | 2 +- .../pla/goofoo_far_0.40_pla_efine.inst.cfg | 2 +- .../pla/goofoo_far_0.40_pla_fine.inst.cfg | 2 +- .../pla/goofoo_far_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_far_bronze_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_far_bronze_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_far_bronze_0.40_pla_fine.inst.cfg | 2 +- ...ofoo_far_bronze_0.40_pla_standard.inst.cfg | 2 +- ...goofoo_far_emarble_0.40_pla_draft.inst.cfg | 2 +- ...goofoo_far_emarble_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_far_emarble_0.40_pla_fine.inst.cfg | 2 +- ...foo_far_emarble_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_far_esilk_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_far_esilk_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_far_esilk_0.40_pla_fine.inst.cfg | 2 +- ...oofoo_far_esilk_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_far_wood_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_far_wood_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_far_wood_0.40_pla_fine.inst.cfg | 2 +- ...goofoo_far_wood_0.40_pla_standard.inst.cfg | 2 +- .../pla/goofoo_near_0.40_pla_draft.inst.cfg | 2 +- .../pla/goofoo_near_0.40_pla_efine.inst.cfg | 2 +- .../pla/goofoo_near_0.40_pla_fine.inst.cfg | 2 +- .../goofoo_near_0.40_pla_standard.inst.cfg | 2 +- ...goofoo_near_bronze_0.40_pla_draft.inst.cfg | 2 +- ...goofoo_near_bronze_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_near_bronze_0.40_pla_fine.inst.cfg | 2 +- ...foo_near_bronze_0.40_pla_standard.inst.cfg | 2 +- ...oofoo_near_emarble_0.40_pla_draft.inst.cfg | 2 +- ...oofoo_near_emarble_0.40_pla_efine.inst.cfg | 2 +- ...goofoo_near_emarble_0.40_pla_fine.inst.cfg | 2 +- ...oo_near_emarble_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_near_esilk_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_near_esilk_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_near_esilk_0.40_pla_fine.inst.cfg | 2 +- ...ofoo_near_esilk_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_near_wood_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_near_wood_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_near_wood_0.40_pla_fine.inst.cfg | 2 +- ...oofoo_near_wood_0.40_pla_standard.inst.cfg | 2 +- .../pla/goofoo_open_0.40_pla_draft.inst.cfg | 2 +- .../pla/goofoo_open_0.40_pla_efine.inst.cfg | 2 +- .../pla/goofoo_open_0.40_pla_fine.inst.cfg | 2 +- .../goofoo_open_0.40_pla_standard.inst.cfg | 2 +- ...oofoo_open_emarble_0.40_pla_draft.inst.cfg | 2 +- ...oofoo_open_emarble_0.40_pla_efine.inst.cfg | 2 +- ...goofoo_open_emarble_0.40_pla_fine.inst.cfg | 2 +- ...oo_open_emarble_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_open_esilk_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_open_esilk_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_open_esilk_0.40_pla_fine.inst.cfg | 2 +- ...ofoo_open_esilk_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_open_wood_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_open_wood_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_open_wood_0.40_pla_fine.inst.cfg | 2 +- ...oofoo_open_wood_0.40_pla_standard.inst.cfg | 2 +- .../pla/goofoo_small_0.40_pla_draft.inst.cfg | 2 +- .../pla/goofoo_small_0.40_pla_efine.inst.cfg | 2 +- .../pla/goofoo_small_0.40_pla_fine.inst.cfg | 2 +- .../goofoo_small_0.40_pla_standard.inst.cfg | 2 +- ...ofoo_small_emarble_0.40_pla_draft.inst.cfg | 2 +- ...ofoo_small_emarble_0.40_pla_efine.inst.cfg | 2 +- ...oofoo_small_emarble_0.40_pla_fine.inst.cfg | 2 +- ...o_small_emarble_0.40_pla_standard.inst.cfg | 2 +- ...goofoo_small_esilk_0.40_pla_draft.inst.cfg | 2 +- ...goofoo_small_esilk_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_small_esilk_0.40_pla_fine.inst.cfg | 2 +- ...foo_small_esilk_0.40_pla_standard.inst.cfg | 2 +- .../goofoo_small_wood_0.40_pla_draft.inst.cfg | 2 +- .../goofoo_small_wood_0.40_pla_efine.inst.cfg | 2 +- .../goofoo_small_wood_0.40_pla_fine.inst.cfg | 2 +- ...ofoo_small_wood_0.40_pla_standard.inst.cfg | 2 +- .../pva/goofoo_far_0.40_pva_draft.inst.cfg | 2 +- .../pva/goofoo_far_0.40_pva_efine.inst.cfg | 2 +- .../pva/goofoo_far_0.40_pva_fine.inst.cfg | 2 +- .../pva/goofoo_far_0.40_pva_standard.inst.cfg | 2 +- .../pva/goofoo_near_0.40_pva_draft.inst.cfg | 2 +- .../pva/goofoo_near_0.40_pva_efine.inst.cfg | 2 +- .../pva/goofoo_near_0.40_pva_fine.inst.cfg | 2 +- .../goofoo_near_0.40_pva_standard.inst.cfg | 2 +- .../pva/goofoo_open_0.40_pva_draft.inst.cfg | 2 +- .../pva/goofoo_open_0.40_pva_efine.inst.cfg | 2 +- .../pva/goofoo_open_0.40_pva_fine.inst.cfg | 2 +- .../goofoo_open_0.40_pva_standard.inst.cfg | 2 +- .../tpe/goofoo_far_0.40_tpe_draft.inst.cfg | 2 +- .../tpe/goofoo_far_0.40_tpe_efine.inst.cfg | 2 +- .../tpe/goofoo_far_0.40_tpe_fine.inst.cfg | 2 +- .../tpe/goofoo_far_0.40_tpe_standard.inst.cfg | 2 +- .../tpe/goofoo_near_0.40_tpe_draft.inst.cfg | 2 +- .../tpe/goofoo_near_0.40_tpe_efine.inst.cfg | 2 +- .../tpe/goofoo_near_0.40_tpe_fine.inst.cfg | 2 +- .../goofoo_near_0.40_tpe_standard.inst.cfg | 2 +- .../goofoo_far_0.40_tpu_87a_draft.inst.cfg | 6 +- .../tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg | 6 +- .../goofoo_far_0.40_tpu_87a_standard.inst.cfg | 6 +- .../goofoo_far_0.40_tpu_95a_draft.inst.cfg | 6 +- .../goofoo_far_0.40_tpu_95a_efine.inst.cfg | 2 +- .../tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg | 2 +- .../goofoo_far_0.40_tpu_95a_standard.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_87a_draft.inst.cfg | 6 +- .../goofoo_near_0.40_tpu_87a_fine.inst.cfg | 6 +- ...goofoo_near_0.40_tpu_87a_standard.inst.cfg | 6 +- .../goofoo_near_0.40_tpu_95a_draft.inst.cfg | 6 +- .../goofoo_near_0.40_tpu_95a_efine.inst.cfg | 2 +- .../goofoo_near_0.40_tpu_95a_fine.inst.cfg | 2 +- ...goofoo_near_0.40_tpu_95a_standard.inst.cfg | 2 +- 175 files changed, 198 insertions(+), 480 deletions(-) delete mode 100644 plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py diff --git a/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py b/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py deleted file mode 100644 index cc1085baca..0000000000 --- a/plugins/PostProcessingPlugin/scripts/ColorMix_goofoo.py +++ /dev/null @@ -1,282 +0,0 @@ -# ColorMix_goofoo extruder color mix and blending -# This script is specific for the goofoo dual extruder. -# -*- coding: UTF-8 -*- - -import re #To perform the search and replace. -from ..Script import Script - -class ColorMix_goofoo(Script): - def __init__(self): - super().__init__() - - def getSettingDataString(self): - return """{ - "name":"ColorMix 2-1 goofoo", - "key":"ColorMix_goofoo", - "metadata": {}, - "version": 2, - "settings": - { - "units_of_measurement": - { - "label": "Units", - "description": "Input value as mm or layer number.", - "type": "enum", - "options": {"mm":"mm","layer":"Layer"}, - "default_value": "layer" - }, - "start_height": - { - "label": "Start Height", - "description": "Value to start at (mm or layer)", - "type": "float", - "default_value": 0, - "minimum_value": "0" - }, - "behavior": - { - "label": "Fixed or blend", - "description": "Select Fixed (set new mixture) or Blend mode (dynamic mix)", - "type": "enum", - "options": {"fixed_value":"Fixed","blend_value":"Blend"}, - "default_value": "fixed_value" - }, - "mix_radio": - { - "label": "mix ratio", - "description": "First extruder percentage 5-95", - "type": "int", - "default_value": 95, - "minimum_value": "5", - "minimum_value_warning": "5", - "maximum_value_warning": "95" - } - } - }""" - def getValue(self, line, key, default = None): #replace default getvalue due to comment-reading feature - if not key in line: - return default - subPart = line[line.find(key) + len(key):] #allows for string lengths larger than 1 - if ";ChangeAtZ" in key: - m = re.search("^[0-4]", subPart) - elif ";LAYER:" in key: - m = re.search("^[+-]?[0-9]*", subPart) - elif ";LAYER_COUNT:" in key: - m = re.search("[0-9]*", subPart) - else: - #the minus at the beginning allows for negative values, e.g. for delta printers - m = re.search("^[-]?[0-9]*\.?[0-9]*", subPart) - if m == None: - return default - try: - return float(m.group(0)) - except: - return default - def analyData(self,data,layerObjs,setObj): - for active_layer in data: - lines = active_layer.split("\n") - for line in lines:#;GOOFOO_2-1:sRatio:5 fixed:1 layer 5 - if ";GOOFOO_2-1:" in line:#checks for state change comment - layerObjs.append({'sRatio':int(self.getValue(line,"sRatio",0)),'fixed':int(self.getValue(line,"fixed",1)),'layer':int(self.getValue(line,"layer",0)),'isUse':0}) - def findItem(self,layerObjs,idx): - if None == layerObjs: - return None - arrCount = len(layerObjs) - if arrCount <= 0: - return None - itemObj = None - for i in range(arrCount): - itemObj = layerObjs[i] - if int(idx) == int(itemObj['layer']): - return itemObj - return None - def getSetObj(self,setObj,data,layerObjs): - sHei = self.getSettingValueByKey("start_height") - sMix = int(self.getSettingValueByKey("mix_radio")) - sMix = 100 - sMix - setObj['sRatio'] = sMix - isFixed = 0 - if "fixed_value" == self.getSettingValueByKey("behavior"): - isFixed = 1 - setObj['fixed'] = isFixed - - isMMType = 0 - if "mm" == self.getSettingValueByKey("units_of_measurement"): - isMMType = 1 - - layerHeight = 0 - for active_layer in data: - lines = active_layer.split("\n") - for line in lines: - if ";Layer height: " in line: - layerHeight = self.getValue(line,";Layer height: ",layerHeight) - break - if layerHeight != 0: - break - if 0 == layerHeight: - layerHeight = .2 - setObj['layerHeight'] = layerHeight - layerCount = 0 - for active_layer in data: - lines = active_layer.split("\n") - for line in lines: - if ";LAYER_COUNT:" in line: - layerCount = int(self.getValue(line,";LAYER_COUNT:",layerCount)) - break - if layerCount != 0: - break - if 0 == layerCount: - layerCount = 1 - setObj['layerCount'] = int(layerCount) - - if isMMType: - sHei = round(sHei / layerHeight) - if sHei < 0: - sHei = 1 - startLayer = int(sHei) - if startLayer > layerCount: - startLayer = layerCount - setObj['isSetEnd'] = 1 - setObj['layer'] = startLayer - - itemObj = None - itemObj = self.findItem(layerObjs,startLayer) - if None == itemObj: - layerObjs.append({'sRatio':sMix,'incRation':0.0,'fixed':isFixed,'layer':startLayer,'isUse':0}) - else: - itemObj['sRatio'] = sMix - itemObj['incRation'] = 0.0 - itemObj['fixed'] = isFixed - itemObj['isUse'] = 0 - def sortLayer(self,layerObjs,setObj): - itemObj = None - itemObj = self.findItem(layerObjs,0) - if None == itemObj: - layerObjs.append({'sRatio':100,'fixed':1,'layer':0}) - itemObj = self.findItem(layerObjs,int(setObj['layerCount'])) - if None == itemObj: - layerObjs.append({'sRatio':0,'fixed':1,'layer':int(setObj['layerCount'])}) - else: - setObj['isSetEnd'] = 1 - def analyIncRatio(self,layerObjs,setObj): - if None == layerObjs: - return None - layerCount = len(layerObjs) - if 0 >= layerCount: - return None - for i in range(layerCount-1): - itemObj = layerObjs[i] - nextObj = layerObjs[i+1] - if None != itemObj and None != nextObj: - # or setObj['isSetEnd'] == 1 - if 5 > int(itemObj['sRatio']): - itemObj['sRatio'] = 5 - if 95 < int(itemObj['sRatio']): - itemObj['sRatio'] = 95 - if 5 > int(nextObj['sRatio']): - nextObj['sRatio'] = 5 - if 95 < int(nextObj['sRatio']): - nextObj['sRatio'] = 95 - if 0 == itemObj['fixed']: - itemObj['incRation'] = float((nextObj['sRatio']-itemObj['sRatio'])/(nextObj['layer']-itemObj['layer'])) - else: - itemObj['incRation'] = 0.0 - else: - itemObj['incRation'] = 0.0 - layerObjs[layerCount-1]['incRation'] = 0.0 - def findLayerInfo(self,layer,layerObjs): - if int(layer) < 0: - return None - if None == layerObjs: - return None - layerCount = len(layerObjs) - if layerCount <= 1: - return None - itemObj = None - for i in range(layerCount-1): - itemObj = layerObjs[i] - nextObj = layerObjs[i+1] - if int(layer) >= int(itemObj['layer']) and int(layer) <= int(nextObj['layer']) and itemObj['isUse'] == 0: - if(itemObj['fixed'] == 1): - itemObj['isUse'] = 1 - return itemObj - return None - def createCommand(self,data,layerObjs,setObj): - index = 0 - layer = -1 - itemObj = None - isInitMaxHei = 0 - nextLine = "" - findCount = 0 - curLayer = 0 - start = 0 - for active_layer in data: - modified_gcode = "" - lineIndex = 0 - lines = active_layer.split("\n") - for line in lines: - #dont leave blanks - if ";MAX_Z_HEIGHT:" in line: - isInitMaxHei = 1 - if isInitMaxHei == 0: - isInitMaxHei = 1 - modified_gcode = ";MAX_Z_HEIGHT:{0:f}\n".format(float(setObj['layerHeight'] * setObj['layerCount'])) - - if start == 0 and ";LAYER_COUNT" in line: - start = 1 - if start == 1: - # if itemObj != None and "G1" in line or "G0" in line and "E" in line: - # modified_gcode += "M6050 S{0:2f} P{1:2f} Z{2:f}\n".format(float(firstExtruderValue/100.0),0.0,float(curHeight)) - if ("G1" in line or "G0" in line) and "Z" in line: - itemObj = self.findLayerInfo(int(curLayer),layerObjs) - if None != itemObj: - firstExtruderValue = int(((curLayer - itemObj['layer']) * itemObj['incRation']) + itemObj['sRatio']) - curHeight = self.getValue(line,"Z",0.0) - modified_gcode += "M6050 S{0:2f} P{1:2f} Z{2:f}\n".format(float(firstExtruderValue/100.0),0.0,float(curHeight)) - curLayer+=1 - if line != "": - modified_gcode += line + "\n" - lineIndex += 1 #for deleting index - data[index] = modified_gcode - index += 1 - def delFlag(self,data,layerObjs): - index = 0 - for active_layer in data: - # lineIndex = 0 - modified_gcode = "" - lines = active_layer.split("\n") - for line in lines: - if ";GOOFOO_2-1:" not in line and "M6050" not in line and "T0" not in line: - modified_gcode += line + "\n" - data[index] = modified_gcode - index += 1 - isInitFlag = 0 - index = 0 - for active_layer in data: - modified_gcode = "" - lines = active_layer.split("\n") - for line in lines: - if line != "": - modified_gcode += line + "\n" - if ";GOOFOO_2-1:" in line: - isInitFlag = 1 - if isInitFlag == 0: - isInitFlag = 1 - layerCount = len(layerObjs) - itemObj = None - for i in range(layerCount): - itemObj = layerObjs[i] - modified_gcode += ";GOOFOO_2-1:sRatio{0:d} fixed{1:d} layer{2:d}\n".format(itemObj['sRatio'],itemObj['fixed'],itemObj['layer']) - data[index] = modified_gcode - index += 1 - def execute(self, data): - setObj = {'sRatio':100,'incRation':0,'fixed':1,'layer':0,'layerCount':1,'layerHeight':.2,'isSetEnd':0,"endlayer":1,'eRatio':100,'isUseSet':0} - layerObjs = [] - self.getSetObj(setObj,data,layerObjs) - self.analyData(data,layerObjs,setObj) - self.sortLayer(layerObjs,setObj) - layerObjs = sorted(layerObjs,key=lambda e:e['layer']) - self.delFlag(data,layerObjs) - self.analyIncRatio(layerObjs,setObj) - self.createCommand(data,layerObjs,setObj) - return data \ No newline at end of file diff --git a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg index d065b46f4f..db98493872 100644 --- a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg +++ b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_abs diff --git a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg index 2fedfd3b0e..4dd35ea705 100644 --- a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg +++ b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_abs diff --git a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg index 1053a33fd2..66c043cc26 100644 --- a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg +++ b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_abs diff --git a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg index d9e811fe74..8e608e2751 100644 --- a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg +++ b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_abs diff --git a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg index a637710cae..0722e16b24 100644 --- a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg +++ b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_asa diff --git a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg index 9763f062f4..f358aa16a5 100644 --- a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg +++ b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_asa diff --git a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg index bcf1576586..10019fa830 100644 --- a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg +++ b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_asa diff --git a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg index b35bc3a726..60855f3f72 100644 --- a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg +++ b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_asa diff --git a/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg index 0456b901f4..b5cfa2afe8 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = -1 diff --git a/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg index ae1538e681..0055d3f330 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine weight = 0 diff --git a/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg index 82e1ce4979..dd2984d73c 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -3 diff --git a/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg index 47a2ebfa3e..4ee3ffbb3e 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg index 283c420e57..2b9312b121 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = -1 diff --git a/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg index 13d7036e25..5b9d88244d 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine weight = 0 diff --git a/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg index 88088facf4..6a30280f67 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -3 diff --git a/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg index dc9c721262..e3396f5920 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg index 796f5451df..fc4ddff5c8 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = -1 diff --git a/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg index 730176d9d3..f4a5197592 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine weight = 0 diff --git a/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg index 832091b5c0..fd048b7fdd 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -3 diff --git a/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg index 5ed95c1f95..cb924b3928 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg index c18e61cac4..609b2e6af0 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = -1 diff --git a/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg index 298c18fede..1ab043152a 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine weight = 0 diff --git a/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg index dee6b17005..b775e41fb9 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -3 diff --git a/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg index 27e1d60b99..d4bc9c853c 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg index 44833e05ac..8dd4354efa 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg index e385fd688a..f9d991474e 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg index 955d2bfa46..fe520d21f4 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg index b3a51798dd..3a6ce34d5f 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg index d77f8bab31..9e94323af2 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg index 556d28cf77..d4fcbd1ffd 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg index 04fd52c833..2711715ce4 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg index bd3f0dc709..df9333e1d6 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg index 6bc0c1e2c3..bc41abe93e 100644 --- a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg index 889486deb1..7e8ca63eab 100644 --- a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg index 5eb3b31753..8ec0097c41 100644 --- a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_hips diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg index 79bcaf0ba7..502f946b48 100644 --- a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_hips diff --git a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg index 3003a3a1d2..7d427d320f 100644 --- a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg +++ b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pa diff --git a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg index ee8122c422..b62da28e07 100644 --- a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg +++ b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pa diff --git a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg index 842be04698..d6390b5d47 100644 --- a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg +++ b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pa diff --git a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg index 7939d4d68c..33f01f7900 100644 --- a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg +++ b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pa diff --git a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg index afd5ad5d23..6fe366078a 100644 --- a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg +++ b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pa_cf diff --git a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg index 3f794f58df..a8fda496a8 100644 --- a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg +++ b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pa_cf diff --git a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg index 67270c1dc0..8bdf264189 100644 --- a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg +++ b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pa_cf diff --git a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg index 732e98fb97..82822f7552 100644 --- a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg +++ b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pa_cf diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg index 2f338461b8..449249bd1d 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pc diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg index 95205bca7e..092500ebe7 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pc diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg index d04e5f07f9..065568128b 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pc diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg index 1be78e7e63..0d5eb04819 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pc diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg index 5cd7402bf2..dbba2c8da9 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pc diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg index 19e15e5660..85582e1dbc 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pc diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg index fcfa389bb4..1d0d0e277a 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pc diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg index 7ac0387c38..276b8b8dac 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pc diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg index 6ae0ff122e..9fbab16a7b 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_peek diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg index 574f1233bc..e492269551 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_peek diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg index 26e225eb53..f57615f286 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_peek diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg index 65de74bdf2..f4722919e0 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_peek diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg index 4c0a5f6b89..3d5e773c47 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_peek diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg index 75e9d17fff..d88e76a0e4 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_peek diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg index c077d5d547..c797b8e8a1 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_peek diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg index 1748b91482..b963833997 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_peek diff --git a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg index 4c950a2ef5..b3f5957fd3 100644 --- a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg @@ -4,10 +4,10 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine -material = generic_petg +material = goofoo_petg variant = 0.4mm Nozzle [values] diff --git a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg index 4e174e97ab..2e2477a8b0 100644 --- a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg @@ -4,10 +4,10 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal -material = generic_petg +material = goofoo_petg variant = 0.4mm Nozzle [values] diff --git a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg index eb858d0ed7..3a1afe0da8 100644 --- a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg @@ -4,10 +4,10 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine -material = generic_petg +material = goofoo_petg variant = 0.4mm Nozzle [values] diff --git a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg index 9d570cbbd8..dfc3242624 100644 --- a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg @@ -4,10 +4,10 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal -material = generic_petg +material = goofoo_petg variant = 0.4mm Nozzle [values] diff --git a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg index 9b546f2918..c90206a6bf 100644 --- a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg @@ -4,10 +4,10 @@ name = Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine -material = generic_petg +material = goofoo_petg variant = 0.4mm Nozzle [values] diff --git a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg index 04976769d3..ef8aca3bcc 100644 --- a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg @@ -4,10 +4,10 @@ name = Standard Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal -material = generic_petg +material = goofoo_petg variant = 0.4mm Nozzle [values] diff --git a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg index 171717be12..3f10db1e3b 100644 --- a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg @@ -4,10 +4,10 @@ name = Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine -material = generic_petg +material = goofoo_petg variant = 0.4mm Nozzle [values] diff --git a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg index 91e205d618..2e32f555f7 100644 --- a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg @@ -4,10 +4,10 @@ name = Standard Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal -material = generic_petg +material = goofoo_petg variant = 0.4mm Nozzle [values] diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg index c0081a8a59..4c14da8745 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg index ec8a0cbf93..0f6d81fbe8 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg index 7e4c20295e..0bfc6d2819 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg index 5df3cf7e4f..08daac76c9 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg index 443769bb6c..bec333ff61 100644 --- a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_bronze_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg index a3c3a99d9b..2dcb5005a8 100644 --- a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_bronze_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg index d22e8730f7..8c02d54220 100644 --- a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_bronze_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg index 507af9a733..de1c7e4370 100644 --- a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_bronze_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg index 40bd5ac541..cefc9daff7 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg index 0dde515a6c..4943789a1b 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg index 99f6dc067e..789b01f664 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg index e23d6d705c..e09c2c21e5 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg index 32c51f5b22..74e6028b99 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg index 7194809bd2..c5568f6b31 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg index 4af50479bb..9ba19e5450 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg index abb02d1309..62e89c7d9f 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg index 5af1490ef6..3be7cca700 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg index 3c9a05cc46..30ebb39fe1 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg index 177fac2704..632183e93b 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg index 57b67a1e5b..44d5f75516 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg index 4cf85bb476..8ffd6be2e5 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg index abecf3387f..f167eedae4 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg index 467f27cb01..977d3d710c 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg index 96339821e5..6c0c253942 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg index a6cdb979a8..dab701a87d 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_bronze_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg index bd0aca4a35..ce26c1077e 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_bronze_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg index 0ec08a0302..f6ba35e5e0 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_bronze_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg index ee19e99bff..8ef8bc753d 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_bronze_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg index 89639cd0d2..ac3191b711 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg index d70959603c..fd8b3cf81b 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg index 82c2c637b5..671ea1db9d 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg index 582f8d5f92..f1677653cf 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg index 3ad8614d3d..a719640114 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg index 8f815f53e7..fc71303ce1 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg index 8f7ce1c255..e92bcff3b2 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg index 246b8f4c3a..5666f3abea 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg index 79a53f1a13..61c824e3f5 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg index 045ea98479..d1beccaf4c 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg index 4875bf00a5..42a4c8b9be 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg index 210914aae8..a6a49094cf 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg index 1e1542cc17..6bbddd28a8 100644 --- a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg index bf945a246a..ca9144388e 100644 --- a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg index 3424c910f0..e2db78058a 100644 --- a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg index 6add5af306..ffade74aaa 100644 --- a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg index 8dd7f014ea..dd2377e171 100644 --- a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg index b595151cf4..1b50f1fff1 100644 --- a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg index f1b13439d5..16def63088 100644 --- a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg index 65a02f975e..88ebb60b5d 100644 --- a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg index 8e3f9075c4..569203d3a9 100644 --- a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg index c169caccbc..e1b02e7a5b 100644 --- a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg index f2f6cd6f87..f199f3a27d 100644 --- a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg index dcc03f51fa..ac2ce648a6 100644 --- a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg index 7b7f1c0bc7..a8f9e3b277 100644 --- a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg index c585b34a79..4b8c022cfd 100644 --- a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg index d84ea1328f..9260779304 100644 --- a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg index 0f7a4ca35a..6067154670 100644 --- a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg index 1d12aba008..fe3e712095 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg index 17a992dd7f..0b4cc8c33d 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg index 283cc02caa..a2ef9571d1 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg index 8d4985067c..e5ae17b358 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg index 51acfa53d3..43436b1fe2 100644 --- a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg index 11b15f1dfa..ad61ac4516 100644 --- a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg index d46edcda38..982a051025 100644 --- a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg index 2717fb8559..e1947d3b2c 100644 --- a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_emarble_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg index a1ff7bd15d..e89f7ef398 100644 --- a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg index c581134df7..3986432256 100644 --- a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg index 92190ed2a7..6bc74a4fd9 100644 --- a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg index d087fbe425..5546fc6c04 100644 --- a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_esilk_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg index de37196c95..9983ca25e0 100644 --- a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg index a5375d3039..72e9b1aed2 100644 --- a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg index f24118d370..5c4bbbd840 100644 --- a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg index bd1f683513..6c5bce0bf0 100644 --- a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_wood_pla diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg index f7adf78359..a749b6c42a 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg index 25ec633618..42268aaf5e 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg index a12b187791..106662f231 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg index 2b1c2ec43a..fa94394c44 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg index 9b013295e9..e658154be3 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg index 66fa3739c1..4607037ef9 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg index d739edd985..f844a7a0d1 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg index 28cc3a4887..1470aebb6e 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg index f737ee7684..c28bf6ba6f 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg index 91149647f6..177e543452 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg index 0622fe6e2c..5ceb8b92f3 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_pva diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg index d788fc672d..eea6681dfb 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_open [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_pva diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg index 2f8b797264..920e0372d7 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_tpe_83a diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg index 6083e22787..b8d2d3f7ea 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_tpe_83a diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg index 00f3525ea0..176bc7f0c7 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_tpe_83a diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg index 81d2456508..4fc798296f 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_tpe_83a diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg index 8578fa38d6..03c646dd37 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_tpe_83a diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg index 91f8d6c519..28351b1e2c 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_tpe_83a diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg index e74720b95a..49c4e26db3 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_tpe_83a diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg index 35cbf44e8b..c4f839ee74 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_tpe_83a diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg index 2afa0b0e60..23db02803a 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg @@ -4,14 +4,14 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_tpu_87a -variant = 0.5mm Nozzle +variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg index 8422fcd770..4fb6d626b3 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg @@ -4,14 +4,14 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_tpu_87a -variant = 0.6mm Nozzle +variant = 0.4mm Nozzle [values] wall_thickness = =line_width*3 speed_print = 20 speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg index 018d73bdab..a367b8f81c 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg @@ -4,14 +4,14 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_tpu_87a -variant = 0.5mm Nozzle +variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg index 5a186fef6e..d7aa4d5fec 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg @@ -4,14 +4,14 @@ name = Draft Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_tpu_95a -variant = 0.6mm Nozzle +variant = 0.4mm Nozzle [values] wall_thickness = =line_width*3 speed_print = 20 speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg index c506773578..7e95cdb13b 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_tpu_95a diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg index 21565b87dd..5886ce5721 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_tpu_95a diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg index 2ffc779628..5643a9459a 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_far [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_tpu_95a diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg index 86b51757f2..7d1e632e0c 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg @@ -4,14 +4,14 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_tpu_87a -variant = 0.5mm Nozzle +variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg index 3fde3ebb4e..5de2f6f438 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg @@ -4,14 +4,14 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_tpu_87a -variant = 0.6mm Nozzle +variant = 0.4mm Nozzle [values] wall_thickness = =line_width*3 speed_print = 20 speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg index 2371757541..1343ea9172 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg @@ -4,14 +4,14 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_tpu_87a -variant = 0.5mm Nozzle +variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 speed_print = 20 speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg index 8f1270d331..b6e6bcb6b2 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg @@ -4,14 +4,14 @@ name = Draft Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = goofoo_tpu_95a -variant = 0.6mm Nozzle +variant = 0.4mm Nozzle [values] wall_thickness = =line_width*3 speed_print = 20 speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +adhesion_type = skirt diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg index fe9aac6f06..4f8bfbfc22 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = efine material = goofoo_tpu_95a diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg index 8784132714..1149e159b8 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = goofoo_tpu_95a diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg index f46cb3c910..23c9cba6ef 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = goofoo_near [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = goofoo_tpu_95a From 7cf77dba4dded48a1ae8243b88242a8f6e3061b0 Mon Sep 17 00:00:00 2001 From: goofoo Date: Fri, 30 Jul 2021 10:35:44 +0800 Subject: [PATCH 13/74] modify renkforce & goofoo's files setting_version = 16 to 17 --- resources/variants/goofoo_base_0.4.inst.cfg | 2 +- resources/variants/goofoo_e-one_0.2.inst.cfg | 2 +- resources/variants/goofoo_e-one_0.4.inst.cfg | 2 +- resources/variants/goofoo_e-one_0.6.inst.cfg | 2 +- resources/variants/goofoo_e-one_0.8.inst.cfg | 2 +- resources/variants/goofoo_e-one_1.0.inst.cfg | 2 +- resources/variants/goofoo_gemini_0.2.inst.cfg | 2 +- resources/variants/goofoo_gemini_0.4.inst.cfg | 2 +- resources/variants/goofoo_gemini_0.6.inst.cfg | 2 +- resources/variants/goofoo_gemini_0.8.inst.cfg | 2 +- resources/variants/goofoo_gemini_1.0.inst.cfg | 2 +- resources/variants/goofoo_giant_0.2.inst.cfg | 2 +- resources/variants/goofoo_giant_0.4.inst.cfg | 2 +- resources/variants/goofoo_giant_0.6.inst.cfg | 2 +- resources/variants/goofoo_giant_0.8.inst.cfg | 2 +- resources/variants/goofoo_giant_1.0.inst.cfg | 2 +- resources/variants/goofoo_max_0.2.inst.cfg | 2 +- resources/variants/goofoo_max_0.4.inst.cfg | 2 +- resources/variants/goofoo_max_0.6.inst.cfg | 2 +- resources/variants/goofoo_max_0.8.inst.cfg | 2 +- resources/variants/goofoo_max_1.0.inst.cfg | 2 +- resources/variants/goofoo_mido_0.2.inst.cfg | 2 +- resources/variants/goofoo_mido_0.4.inst.cfg | 2 +- resources/variants/goofoo_mido_0.6.inst.cfg | 2 +- resources/variants/goofoo_mido_0.8.inst.cfg | 2 +- resources/variants/goofoo_mido_1.0.inst.cfg | 2 +- resources/variants/goofoo_miniplus_0.2.inst.cfg | 2 +- resources/variants/goofoo_miniplus_0.4.inst.cfg | 2 +- resources/variants/goofoo_miniplus_0.6.inst.cfg | 2 +- resources/variants/goofoo_miniplus_0.8.inst.cfg | 2 +- resources/variants/goofoo_miniplus_1.0.inst.cfg | 2 +- resources/variants/goofoo_nova_0.2.inst.cfg | 2 +- resources/variants/goofoo_nova_0.4.inst.cfg | 2 +- resources/variants/goofoo_nova_0.6.inst.cfg | 2 +- resources/variants/goofoo_nova_0.8.inst.cfg | 2 +- resources/variants/goofoo_nova_1.0.inst.cfg | 2 +- resources/variants/goofoo_plus_0.2.inst.cfg | 2 +- resources/variants/goofoo_plus_0.4.inst.cfg | 2 +- resources/variants/goofoo_plus_0.6.inst.cfg | 2 +- resources/variants/goofoo_plus_0.8.inst.cfg | 2 +- resources/variants/goofoo_plus_1.0.inst.cfg | 2 +- resources/variants/goofoo_t-one_0.2.inst.cfg | 2 +- resources/variants/goofoo_t-one_0.4.inst.cfg | 2 +- resources/variants/goofoo_t-one_0.6.inst.cfg | 2 +- resources/variants/goofoo_t-one_0.8.inst.cfg | 2 +- resources/variants/goofoo_t-one_1.0.inst.cfg | 2 +- resources/variants/goofoo_tiny_0.2.inst.cfg | 2 +- resources/variants/goofoo_tiny_0.4.inst.cfg | 2 +- resources/variants/goofoo_tiny_0.6.inst.cfg | 2 +- resources/variants/goofoo_tiny_0.8.inst.cfg | 2 +- resources/variants/goofoo_tiny_1.0.inst.cfg | 2 +- resources/variants/goofoo_tinyplus_0.2.inst.cfg | 2 +- resources/variants/goofoo_tinyplus_0.4.inst.cfg | 2 +- resources/variants/goofoo_tinyplus_0.6.inst.cfg | 2 +- resources/variants/goofoo_tinyplus_0.8.inst.cfg | 2 +- resources/variants/goofoo_tinyplus_1.0.inst.cfg | 2 +- resources/variants/renkforce_basic3_0.2.inst.cfg | 2 +- resources/variants/renkforce_basic3_0.4.inst.cfg | 2 +- resources/variants/renkforce_basic3_0.6.inst.cfg | 2 +- resources/variants/renkforce_basic3_0.8.inst.cfg | 2 +- resources/variants/renkforce_basic3_1.0.inst.cfg | 2 +- resources/variants/renkforce_pro3_0.2.inst.cfg | 2 +- resources/variants/renkforce_pro3_0.4.inst.cfg | 2 +- resources/variants/renkforce_pro3_0.6.inst.cfg | 2 +- resources/variants/renkforce_pro3_0.8.inst.cfg | 2 +- resources/variants/renkforce_pro3_1.0.inst.cfg | 2 +- resources/variants/renkforce_pro6_0.2.inst.cfg | 2 +- resources/variants/renkforce_pro6_0.4.inst.cfg | 2 +- resources/variants/renkforce_pro6_0.6.inst.cfg | 2 +- resources/variants/renkforce_pro6_0.8.inst.cfg | 2 +- resources/variants/renkforce_pro6_1.0.inst.cfg | 2 +- 71 files changed, 71 insertions(+), 71 deletions(-) diff --git a/resources/variants/goofoo_base_0.4.inst.cfg b/resources/variants/goofoo_base_0.4.inst.cfg index 7450306b2b..e3d0e539ef 100644 --- a/resources/variants/goofoo_base_0.4.inst.cfg +++ b/resources/variants/goofoo_base_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_e-one_0.2.inst.cfg b/resources/variants/goofoo_e-one_0.2.inst.cfg index 425dd815e7..cb7be65501 100644 --- a/resources/variants/goofoo_e-one_0.2.inst.cfg +++ b/resources/variants/goofoo_e-one_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_e-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_e-one_0.4.inst.cfg b/resources/variants/goofoo_e-one_0.4.inst.cfg index d4d409a508..d0bb8e2dd1 100644 --- a/resources/variants/goofoo_e-one_0.4.inst.cfg +++ b/resources/variants/goofoo_e-one_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_e-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_e-one_0.6.inst.cfg b/resources/variants/goofoo_e-one_0.6.inst.cfg index 3782f5619d..4cb22fb14a 100644 --- a/resources/variants/goofoo_e-one_0.6.inst.cfg +++ b/resources/variants/goofoo_e-one_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_e-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_e-one_0.8.inst.cfg b/resources/variants/goofoo_e-one_0.8.inst.cfg index ea103f9763..44e4bebb4e 100644 --- a/resources/variants/goofoo_e-one_0.8.inst.cfg +++ b/resources/variants/goofoo_e-one_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_e-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_e-one_1.0.inst.cfg b/resources/variants/goofoo_e-one_1.0.inst.cfg index 2435fb08d9..e8ccee3a60 100644 --- a/resources/variants/goofoo_e-one_1.0.inst.cfg +++ b/resources/variants/goofoo_e-one_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_e-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_gemini_0.2.inst.cfg b/resources/variants/goofoo_gemini_0.2.inst.cfg index 0d2141cfbe..c512cea3ef 100644 --- a/resources/variants/goofoo_gemini_0.2.inst.cfg +++ b/resources/variants/goofoo_gemini_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_gemini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_gemini_0.4.inst.cfg b/resources/variants/goofoo_gemini_0.4.inst.cfg index 27e0b16c56..f9cce304a2 100644 --- a/resources/variants/goofoo_gemini_0.4.inst.cfg +++ b/resources/variants/goofoo_gemini_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_gemini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_gemini_0.6.inst.cfg b/resources/variants/goofoo_gemini_0.6.inst.cfg index af3bbcd421..c89168bc9d 100644 --- a/resources/variants/goofoo_gemini_0.6.inst.cfg +++ b/resources/variants/goofoo_gemini_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_gemini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_gemini_0.8.inst.cfg b/resources/variants/goofoo_gemini_0.8.inst.cfg index d0065a6f82..8846dc3966 100644 --- a/resources/variants/goofoo_gemini_0.8.inst.cfg +++ b/resources/variants/goofoo_gemini_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_gemini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_gemini_1.0.inst.cfg b/resources/variants/goofoo_gemini_1.0.inst.cfg index f267c9c894..bc006589d8 100644 --- a/resources/variants/goofoo_gemini_1.0.inst.cfg +++ b/resources/variants/goofoo_gemini_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_gemini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_giant_0.2.inst.cfg b/resources/variants/goofoo_giant_0.2.inst.cfg index 62b6b5a310..79f11d6a19 100644 --- a/resources/variants/goofoo_giant_0.2.inst.cfg +++ b/resources/variants/goofoo_giant_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_giant [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_giant_0.4.inst.cfg b/resources/variants/goofoo_giant_0.4.inst.cfg index ee9f47e6e0..514de79aef 100644 --- a/resources/variants/goofoo_giant_0.4.inst.cfg +++ b/resources/variants/goofoo_giant_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_giant [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_giant_0.6.inst.cfg b/resources/variants/goofoo_giant_0.6.inst.cfg index f5d3b32188..9327fef669 100644 --- a/resources/variants/goofoo_giant_0.6.inst.cfg +++ b/resources/variants/goofoo_giant_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_giant [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_giant_0.8.inst.cfg b/resources/variants/goofoo_giant_0.8.inst.cfg index 6eff703b7a..ce96cafb24 100644 --- a/resources/variants/goofoo_giant_0.8.inst.cfg +++ b/resources/variants/goofoo_giant_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_giant [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_giant_1.0.inst.cfg b/resources/variants/goofoo_giant_1.0.inst.cfg index 0bfa850100..d8bac0ab65 100644 --- a/resources/variants/goofoo_giant_1.0.inst.cfg +++ b/resources/variants/goofoo_giant_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_giant [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_max_0.2.inst.cfg b/resources/variants/goofoo_max_0.2.inst.cfg index 3ec313e5cf..bdb151090b 100644 --- a/resources/variants/goofoo_max_0.2.inst.cfg +++ b/resources/variants/goofoo_max_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_max_0.4.inst.cfg b/resources/variants/goofoo_max_0.4.inst.cfg index 5a101e21c0..3e550e4b79 100644 --- a/resources/variants/goofoo_max_0.4.inst.cfg +++ b/resources/variants/goofoo_max_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_max_0.6.inst.cfg b/resources/variants/goofoo_max_0.6.inst.cfg index 3b9b7d46d7..3d14181253 100644 --- a/resources/variants/goofoo_max_0.6.inst.cfg +++ b/resources/variants/goofoo_max_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_max_0.8.inst.cfg b/resources/variants/goofoo_max_0.8.inst.cfg index ab1628f7d9..286a7d16d8 100644 --- a/resources/variants/goofoo_max_0.8.inst.cfg +++ b/resources/variants/goofoo_max_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_max_1.0.inst.cfg b/resources/variants/goofoo_max_1.0.inst.cfg index 58f897805b..68aad8b62f 100644 --- a/resources/variants/goofoo_max_1.0.inst.cfg +++ b/resources/variants/goofoo_max_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_mido_0.2.inst.cfg b/resources/variants/goofoo_mido_0.2.inst.cfg index 7a491e91da..560f63048c 100644 --- a/resources/variants/goofoo_mido_0.2.inst.cfg +++ b/resources/variants/goofoo_mido_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_mido [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_mido_0.4.inst.cfg b/resources/variants/goofoo_mido_0.4.inst.cfg index ec92e5d322..f87c98c1d5 100644 --- a/resources/variants/goofoo_mido_0.4.inst.cfg +++ b/resources/variants/goofoo_mido_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_mido [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_mido_0.6.inst.cfg b/resources/variants/goofoo_mido_0.6.inst.cfg index 98f9916130..61d5755106 100644 --- a/resources/variants/goofoo_mido_0.6.inst.cfg +++ b/resources/variants/goofoo_mido_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_mido [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_mido_0.8.inst.cfg b/resources/variants/goofoo_mido_0.8.inst.cfg index 7a22c95692..2d48966a05 100644 --- a/resources/variants/goofoo_mido_0.8.inst.cfg +++ b/resources/variants/goofoo_mido_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_mido [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_mido_1.0.inst.cfg b/resources/variants/goofoo_mido_1.0.inst.cfg index 19095ddf7c..bfb9c8568b 100644 --- a/resources/variants/goofoo_mido_1.0.inst.cfg +++ b/resources/variants/goofoo_mido_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_mido [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_miniplus_0.2.inst.cfg b/resources/variants/goofoo_miniplus_0.2.inst.cfg index 14fdb6ee6e..e32d06e234 100644 --- a/resources/variants/goofoo_miniplus_0.2.inst.cfg +++ b/resources/variants/goofoo_miniplus_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_miniplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_miniplus_0.4.inst.cfg b/resources/variants/goofoo_miniplus_0.4.inst.cfg index d484d9e596..256006bb7c 100644 --- a/resources/variants/goofoo_miniplus_0.4.inst.cfg +++ b/resources/variants/goofoo_miniplus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_miniplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_miniplus_0.6.inst.cfg b/resources/variants/goofoo_miniplus_0.6.inst.cfg index e85fb32875..cc6b70810f 100644 --- a/resources/variants/goofoo_miniplus_0.6.inst.cfg +++ b/resources/variants/goofoo_miniplus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_miniplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_miniplus_0.8.inst.cfg b/resources/variants/goofoo_miniplus_0.8.inst.cfg index 8ae1e4f3c4..d8e752289d 100644 --- a/resources/variants/goofoo_miniplus_0.8.inst.cfg +++ b/resources/variants/goofoo_miniplus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_miniplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_miniplus_1.0.inst.cfg b/resources/variants/goofoo_miniplus_1.0.inst.cfg index aab56eb030..e51c8b36b1 100644 --- a/resources/variants/goofoo_miniplus_1.0.inst.cfg +++ b/resources/variants/goofoo_miniplus_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_miniplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_nova_0.2.inst.cfg b/resources/variants/goofoo_nova_0.2.inst.cfg index 032031b373..53815ef7a9 100644 --- a/resources/variants/goofoo_nova_0.2.inst.cfg +++ b/resources/variants/goofoo_nova_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_nova [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_nova_0.4.inst.cfg b/resources/variants/goofoo_nova_0.4.inst.cfg index 7a7924aa47..52f45ae3b0 100644 --- a/resources/variants/goofoo_nova_0.4.inst.cfg +++ b/resources/variants/goofoo_nova_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_nova [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_nova_0.6.inst.cfg b/resources/variants/goofoo_nova_0.6.inst.cfg index 78915082fc..3817e42ec4 100644 --- a/resources/variants/goofoo_nova_0.6.inst.cfg +++ b/resources/variants/goofoo_nova_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_nova [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_nova_0.8.inst.cfg b/resources/variants/goofoo_nova_0.8.inst.cfg index b1b80cf9c0..9b7cbe456e 100644 --- a/resources/variants/goofoo_nova_0.8.inst.cfg +++ b/resources/variants/goofoo_nova_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_nova [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_nova_1.0.inst.cfg b/resources/variants/goofoo_nova_1.0.inst.cfg index efc8206e24..27cde50c8e 100644 --- a/resources/variants/goofoo_nova_1.0.inst.cfg +++ b/resources/variants/goofoo_nova_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_nova [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_plus_0.2.inst.cfg b/resources/variants/goofoo_plus_0.2.inst.cfg index 5cd3fd687e..cfa5727857 100644 --- a/resources/variants/goofoo_plus_0.2.inst.cfg +++ b/resources/variants/goofoo_plus_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_plus_0.4.inst.cfg b/resources/variants/goofoo_plus_0.4.inst.cfg index d67687de09..3dcfd10938 100644 --- a/resources/variants/goofoo_plus_0.4.inst.cfg +++ b/resources/variants/goofoo_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_plus_0.6.inst.cfg b/resources/variants/goofoo_plus_0.6.inst.cfg index 358e01bd11..7b9c243fea 100644 --- a/resources/variants/goofoo_plus_0.6.inst.cfg +++ b/resources/variants/goofoo_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_plus_0.8.inst.cfg b/resources/variants/goofoo_plus_0.8.inst.cfg index 5300fa8c2b..1a71e694dd 100644 --- a/resources/variants/goofoo_plus_0.8.inst.cfg +++ b/resources/variants/goofoo_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_plus_1.0.inst.cfg b/resources/variants/goofoo_plus_1.0.inst.cfg index 989f9721ca..7cbcbf93e8 100644 --- a/resources/variants/goofoo_plus_1.0.inst.cfg +++ b/resources/variants/goofoo_plus_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_t-one_0.2.inst.cfg b/resources/variants/goofoo_t-one_0.2.inst.cfg index a7e2650ccb..a966fdc57d 100644 --- a/resources/variants/goofoo_t-one_0.2.inst.cfg +++ b/resources/variants/goofoo_t-one_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_t-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_t-one_0.4.inst.cfg b/resources/variants/goofoo_t-one_0.4.inst.cfg index fe02d710d3..779d75cc43 100644 --- a/resources/variants/goofoo_t-one_0.4.inst.cfg +++ b/resources/variants/goofoo_t-one_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_t-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_t-one_0.6.inst.cfg b/resources/variants/goofoo_t-one_0.6.inst.cfg index ffc82782eb..5d8e657107 100644 --- a/resources/variants/goofoo_t-one_0.6.inst.cfg +++ b/resources/variants/goofoo_t-one_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_t-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_t-one_0.8.inst.cfg b/resources/variants/goofoo_t-one_0.8.inst.cfg index 0b7c09f744..bbbba8ccc4 100644 --- a/resources/variants/goofoo_t-one_0.8.inst.cfg +++ b/resources/variants/goofoo_t-one_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_t-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_t-one_1.0.inst.cfg b/resources/variants/goofoo_t-one_1.0.inst.cfg index caf0efacc2..559704cec0 100644 --- a/resources/variants/goofoo_t-one_1.0.inst.cfg +++ b/resources/variants/goofoo_t-one_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_t-one [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tiny_0.2.inst.cfg b/resources/variants/goofoo_tiny_0.2.inst.cfg index f58ec321b9..bf99b7570a 100644 --- a/resources/variants/goofoo_tiny_0.2.inst.cfg +++ b/resources/variants/goofoo_tiny_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tiny [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tiny_0.4.inst.cfg b/resources/variants/goofoo_tiny_0.4.inst.cfg index da4439cd55..ac662dff03 100644 --- a/resources/variants/goofoo_tiny_0.4.inst.cfg +++ b/resources/variants/goofoo_tiny_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tiny [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tiny_0.6.inst.cfg b/resources/variants/goofoo_tiny_0.6.inst.cfg index 32b2153320..5336ef5524 100644 --- a/resources/variants/goofoo_tiny_0.6.inst.cfg +++ b/resources/variants/goofoo_tiny_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tiny [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tiny_0.8.inst.cfg b/resources/variants/goofoo_tiny_0.8.inst.cfg index b57813593c..dbcb3e9820 100644 --- a/resources/variants/goofoo_tiny_0.8.inst.cfg +++ b/resources/variants/goofoo_tiny_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tiny [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tiny_1.0.inst.cfg b/resources/variants/goofoo_tiny_1.0.inst.cfg index d6da2eaee6..4d367692c9 100644 --- a/resources/variants/goofoo_tiny_1.0.inst.cfg +++ b/resources/variants/goofoo_tiny_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tiny [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tinyplus_0.2.inst.cfg b/resources/variants/goofoo_tinyplus_0.2.inst.cfg index b57f7141d7..1459b6bb53 100644 --- a/resources/variants/goofoo_tinyplus_0.2.inst.cfg +++ b/resources/variants/goofoo_tinyplus_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tinyplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tinyplus_0.4.inst.cfg b/resources/variants/goofoo_tinyplus_0.4.inst.cfg index b731860e83..75e32bc896 100644 --- a/resources/variants/goofoo_tinyplus_0.4.inst.cfg +++ b/resources/variants/goofoo_tinyplus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tinyplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tinyplus_0.6.inst.cfg b/resources/variants/goofoo_tinyplus_0.6.inst.cfg index 12d8117753..95c71bdcf8 100644 --- a/resources/variants/goofoo_tinyplus_0.6.inst.cfg +++ b/resources/variants/goofoo_tinyplus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tinyplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tinyplus_0.8.inst.cfg b/resources/variants/goofoo_tinyplus_0.8.inst.cfg index d0c1dbb236..b9a93a9561 100644 --- a/resources/variants/goofoo_tinyplus_0.8.inst.cfg +++ b/resources/variants/goofoo_tinyplus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tinyplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/goofoo_tinyplus_1.0.inst.cfg b/resources/variants/goofoo_tinyplus_1.0.inst.cfg index be3d5a0a01..eab9605a3a 100644 --- a/resources/variants/goofoo_tinyplus_1.0.inst.cfg +++ b/resources/variants/goofoo_tinyplus_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = goofoo_tinyplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_basic3_0.2.inst.cfg b/resources/variants/renkforce_basic3_0.2.inst.cfg index bbc0e23ff4..56179dde96 100644 --- a/resources/variants/renkforce_basic3_0.2.inst.cfg +++ b/resources/variants/renkforce_basic3_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_basic3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_basic3_0.4.inst.cfg b/resources/variants/renkforce_basic3_0.4.inst.cfg index 3fea108732..3d2f509215 100644 --- a/resources/variants/renkforce_basic3_0.4.inst.cfg +++ b/resources/variants/renkforce_basic3_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_basic3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_basic3_0.6.inst.cfg b/resources/variants/renkforce_basic3_0.6.inst.cfg index 9bee130c57..6f5866df2f 100644 --- a/resources/variants/renkforce_basic3_0.6.inst.cfg +++ b/resources/variants/renkforce_basic3_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_basic3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_basic3_0.8.inst.cfg b/resources/variants/renkforce_basic3_0.8.inst.cfg index 70eae41aca..db1bdce2dd 100644 --- a/resources/variants/renkforce_basic3_0.8.inst.cfg +++ b/resources/variants/renkforce_basic3_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_basic3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_basic3_1.0.inst.cfg b/resources/variants/renkforce_basic3_1.0.inst.cfg index 4cf2efa122..3780573db0 100644 --- a/resources/variants/renkforce_basic3_1.0.inst.cfg +++ b/resources/variants/renkforce_basic3_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_basic3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro3_0.2.inst.cfg b/resources/variants/renkforce_pro3_0.2.inst.cfg index 3aa576e1d3..40dc654978 100644 --- a/resources/variants/renkforce_pro3_0.2.inst.cfg +++ b/resources/variants/renkforce_pro3_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro3_0.4.inst.cfg b/resources/variants/renkforce_pro3_0.4.inst.cfg index 19e6ebbdfc..d92d8b58fc 100644 --- a/resources/variants/renkforce_pro3_0.4.inst.cfg +++ b/resources/variants/renkforce_pro3_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro3_0.6.inst.cfg b/resources/variants/renkforce_pro3_0.6.inst.cfg index fc5f92443d..a32f42617f 100644 --- a/resources/variants/renkforce_pro3_0.6.inst.cfg +++ b/resources/variants/renkforce_pro3_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro3_0.8.inst.cfg b/resources/variants/renkforce_pro3_0.8.inst.cfg index c2078dbdc4..d19df4598b 100644 --- a/resources/variants/renkforce_pro3_0.8.inst.cfg +++ b/resources/variants/renkforce_pro3_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro3_1.0.inst.cfg b/resources/variants/renkforce_pro3_1.0.inst.cfg index 45d79bbe14..aa5dab10ea 100644 --- a/resources/variants/renkforce_pro3_1.0.inst.cfg +++ b/resources/variants/renkforce_pro3_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro6_0.2.inst.cfg b/resources/variants/renkforce_pro6_0.2.inst.cfg index 3a7739c90e..1e7e4763f4 100644 --- a/resources/variants/renkforce_pro6_0.2.inst.cfg +++ b/resources/variants/renkforce_pro6_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro6 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro6_0.4.inst.cfg b/resources/variants/renkforce_pro6_0.4.inst.cfg index 0466c4780b..e4ddcdde3d 100644 --- a/resources/variants/renkforce_pro6_0.4.inst.cfg +++ b/resources/variants/renkforce_pro6_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro6 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro6_0.6.inst.cfg b/resources/variants/renkforce_pro6_0.6.inst.cfg index 6613f36ece..20acd99cf4 100644 --- a/resources/variants/renkforce_pro6_0.6.inst.cfg +++ b/resources/variants/renkforce_pro6_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro6 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro6_0.8.inst.cfg b/resources/variants/renkforce_pro6_0.8.inst.cfg index d82c379d42..a9cebf4cc7 100644 --- a/resources/variants/renkforce_pro6_0.8.inst.cfg +++ b/resources/variants/renkforce_pro6_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro6 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/renkforce_pro6_1.0.inst.cfg b/resources/variants/renkforce_pro6_1.0.inst.cfg index 9e736642f1..cb869fef66 100644 --- a/resources/variants/renkforce_pro6_1.0.inst.cfg +++ b/resources/variants/renkforce_pro6_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = renkforce_pro6 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle From 90f5ef63019edd854cbe405ead9c3b11bdcf1318 Mon Sep 17 00:00:00 2001 From: goofoo Date: Fri, 6 Aug 2021 10:08:22 +0800 Subject: [PATCH 14/74] modify pva support_pattern & e-one size --- resources/definitions/goofoo_e-one.def.json | 4 ++-- .../quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg | 4 ---- .../quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg | 4 ---- .../quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg | 4 ---- .../goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg | 4 ---- .../quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg | 4 ---- .../quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg | 4 ---- .../quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg | 4 ---- .../goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg | 4 ---- .../quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg | 6 +----- .../quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg | 6 +----- .../quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg | 6 +----- .../goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg | 6 +----- 13 files changed, 6 insertions(+), 54 deletions(-) diff --git a/resources/definitions/goofoo_e-one.def.json b/resources/definitions/goofoo_e-one.def.json index 891bafa99c..e2c89e0065 100644 --- a/resources/definitions/goofoo_e-one.def.json +++ b/resources/definitions/goofoo_e-one.def.json @@ -6,7 +6,7 @@ "machine_name": { "default_value": "Goofoo E-one" }, "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 380 } + "machine_height": { "default_value": 400 } }, "metadata": { "visible": true, @@ -26,4 +26,4 @@ "goofoo_pva" ] } -} \ No newline at end of file +} diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg index a749b6c42a..05d272f5a2 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg @@ -14,11 +14,7 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg index 42268aaf5e..2e84b49c07 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg @@ -14,11 +14,7 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg index 106662f231..4730f8a89c 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg @@ -14,11 +14,7 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg index fa94394c44..e18764d2d8 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg @@ -14,11 +14,7 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg index e658154be3..89c30d87cd 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg @@ -14,11 +14,7 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg index 4607037ef9..c227c2c731 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg @@ -14,11 +14,7 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg index f844a7a0d1..69c7e3c43c 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg @@ -14,11 +14,7 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg index 1470aebb6e..3fe22dbb0a 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg @@ -14,11 +14,7 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 \ No newline at end of file diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg index c28bf6ba6f..15dc4e9946 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg @@ -14,12 +14,8 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 -material_bed_temperature = 70 \ No newline at end of file +material_bed_temperature = 70 diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg index 177e543452..056c1754ba 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg @@ -14,12 +14,8 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 -material_bed_temperature = 70 \ No newline at end of file +material_bed_temperature = 70 diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg index 5ceb8b92f3..4bf6c4c77e 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg @@ -14,12 +14,8 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 -material_bed_temperature = 70 \ No newline at end of file +material_bed_temperature = 70 diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg index eea6681dfb..bbdf8d5232 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg @@ -14,12 +14,8 @@ variant = 0.4mm Nozzle wall_thickness = =line_width*2 adhesion_type = none support_pattern = everywhere -support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True support_enable = True -# retraction_enable = False -# retraction_amount = 1 -# retraction_speed = 1 -material_bed_temperature = 70 \ No newline at end of file +material_bed_temperature = 70 From bb485c3d74558daeedb21bc26d6ca1f53cda8ef3 Mon Sep 17 00:00:00 2001 From: goofoo Date: Fri, 6 Aug 2021 17:25:28 +0800 Subject: [PATCH 15/74] modify pva support pattern to grid --- resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg | 2 +- resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg | 2 +- resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg | 2 +- .../quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg | 2 +- .../quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg | 2 +- .../quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg | 2 +- resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg | 2 +- .../quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg | 2 +- .../quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg | 2 +- .../quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg | 2 +- resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg | 2 +- .../quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg index 05d272f5a2..52b57f65b9 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg index 2e84b49c07..8958e9c4a2 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg index 4730f8a89c..dae9ff6d40 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg index e18764d2d8..c8a6ab287e 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg index 89c30d87cd..7bbe273435 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg index c227c2c731..4af057c98c 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg index 69c7e3c43c..0d42f6fece 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg index 3fe22dbb0a..c6a5522e78 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg index 15dc4e9946..20d31c5d3a 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg index 056c1754ba..0a5e9ad056 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg index 4bf6c4c77e..f1bb2a1fd0 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg index bbdf8d5232..36026762ee 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg @@ -13,7 +13,7 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*2 adhesion_type = none -support_pattern = everywhere +support_pattern = grid support_infill_rate = 50 support_brim_enable = True support_interface_enable = True From d13d301a57bef53fe01b70b0e012e333488ac3fc Mon Sep 17 00:00:00 2001 From: goofoo Date: Tue, 30 Nov 2021 18:47:21 +0800 Subject: [PATCH 16/74] Add new machine Goofoo Cube --- resources/definitions/goofoo_cube.def.json | 32 +++++++++++++++++++ .../goofoo_small_0.70_pla_standard.inst.cfg | 14 ++++++++ resources/variants/goofoo_cube_0.7.inst.cfg | 12 +++++++ 3 files changed, 58 insertions(+) create mode 100644 resources/definitions/goofoo_cube.def.json create mode 100644 resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg create mode 100644 resources/variants/goofoo_cube_0.7.inst.cfg diff --git a/resources/definitions/goofoo_cube.def.json b/resources/definitions/goofoo_cube.def.json new file mode 100644 index 0000000000..22faf70f94 --- /dev/null +++ b/resources/definitions/goofoo_cube.def.json @@ -0,0 +1,32 @@ +{ + "name": "Goofoo Cube", + "version": 2, + "inherits": "goofoo_small", + "overrides": { + + "machine_name": { "default_value": "Goofoo Cube" }, + "machine_width": { "default_value": 80 }, + "machine_depth": { "default_value": 80 }, + "machine_height": { "default_value": 80 }, + "machine_heated_bed": { "default_value": false }, + "raft_margin": { "default_value": 5 }, + "layer_height":{"default_value": 0.4}, + "layer_height_0": {"default_value": 0.5}, + "wall_thickness": {"default_value": 1.4}, + "top_bottom_thickness": {"default_value": 1.6}, + "infill_pattern": {"default_value": "cubic"}, + "speed_print": {"value": 10}, + "speed_travel": {"value": 10}, + "speed_layer_0":{"value": 10}, + "speed_print_layer_0":{"value": 10}, + "speed_travel_layer_0":{"value": 10}, + + "retraction_speed": {"default_value": 60}, + "retraction_prime_speed":{"value": 80}, + "adhesion_type": {"default_value": "skirt"} + }, + "metadata": { + "author": "goofoo", + "visible": true + } +} \ No newline at end of file diff --git a/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg new file mode 100644 index 0000000000..f5291fe1d8 --- /dev/null +++ b/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = goofoo_small + +[metadata] +setting_version = 19 +type = quality +quality_type = normal +material = goofoo_pla +variant = 0.7mm Nozzle + +[values] +retraction_amount = 6 \ No newline at end of file diff --git a/resources/variants/goofoo_cube_0.7.inst.cfg b/resources/variants/goofoo_cube_0.7.inst.cfg new file mode 100644 index 0000000000..248870ae0d --- /dev/null +++ b/resources/variants/goofoo_cube_0.7.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.7mm Nozzle +version = 4 +definition = goofoo_cube + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.7 \ No newline at end of file From 4deefe56722441ec6dbd930643f6dd70cd2be925 Mon Sep 17 00:00:00 2001 From: goofoo Date: Tue, 30 Nov 2021 19:08:07 +0800 Subject: [PATCH 17/74] modify some goofoo_cube definitions and 0.7_pla_standard --- resources/definitions/goofoo_cube.def.json | 3 --- .../goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/goofoo_cube.def.json b/resources/definitions/goofoo_cube.def.json index 22faf70f94..55a606ff11 100644 --- a/resources/definitions/goofoo_cube.def.json +++ b/resources/definitions/goofoo_cube.def.json @@ -12,9 +12,6 @@ "raft_margin": { "default_value": 5 }, "layer_height":{"default_value": 0.4}, "layer_height_0": {"default_value": 0.5}, - "wall_thickness": {"default_value": 1.4}, - "top_bottom_thickness": {"default_value": 1.6}, - "infill_pattern": {"default_value": "cubic"}, "speed_print": {"value": 10}, "speed_travel": {"value": 10}, "speed_layer_0":{"value": 10}, diff --git a/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg index f5291fe1d8..3c2551e5a7 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg @@ -11,4 +11,7 @@ material = goofoo_pla variant = 0.7mm Nozzle [values] -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +infill_pattern = cubic +top_bottom_thickness = 1.6 +wall_thickness = 1.4 \ No newline at end of file From cfc4939d4245cd7727d36bd9b501916cba02e825 Mon Sep 17 00:00:00 2001 From: goofoo Date: Wed, 30 Mar 2022 14:21:59 +0800 Subject: [PATCH 18/74] modify goofoo_base material temperature --- resources/definitions/goofoo_base.def.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/definitions/goofoo_base.def.json b/resources/definitions/goofoo_base.def.json index 67a5a4f4cc..a2581127b0 100644 --- a/resources/definitions/goofoo_base.def.json +++ b/resources/definitions/goofoo_base.def.json @@ -81,8 +81,11 @@ "optimize_wall_printing_order": { "value": "True" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_print_temperature": { "maximum_value_warning": "421", "maximum_value": "500" }, + "material_print_temperature_layer_0": { "maximum_value_warning": "421", "maximum_value": "500" }, + "material_standby_temperature": { "maximum_value_warning": "421", "maximum_value": "500" }, + "material_initial_print_temperature": { "value": "material_print_temperature", "maximum_value_warning": "421", "maximum_value": "500" }, + "material_final_print_temperature": { "value": "material_print_temperature", "maximum_value_warning": "421", "maximum_value": "500" }, "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, From c509b310937fe085e0088e9bf5177f4ecbfd052b Mon Sep 17 00:00:00 2001 From: goofoo Date: Tue, 21 Jun 2022 16:11:23 +0800 Subject: [PATCH 19/74] add some Renkforce machines --- .../definitions/renkforce_cubeone.def.json | 30 +++++++++++++++++++ .../definitions/renkforce_pro6plus.def.json | 17 +++++++++++ .../definitions/renkforce_pro7dual.def.json | 22 ++++++++++++++ .../extruders/renkforce_pro7dual_1st.def.json | 19 ++++++++++++ .../extruders/renkforce_pro7dual_2st.def.json | 19 ++++++++++++ .../variants/renkforce_cubeone_0.7.inst.cfg | 12 ++++++++ .../variants/renkforce_pro6plus_0.4.inst.cfg | 12 ++++++++ .../variants/renkforce_pro6plus_0.6.inst.cfg | 12 ++++++++ .../variants/renkforce_pro6plus_0.8.inst.cfg | 12 ++++++++ .../variants/renkforce_pro6plus_1.0.inst.cfg | 12 ++++++++ .../variants/renkforce_pro7dual_0.2.inst.cfg | 12 ++++++++ .../variants/renkforce_pro7dual_0.4.inst.cfg | 12 ++++++++ .../variants/renkforce_pro7dual_0.6.inst.cfg | 12 ++++++++ .../variants/renkforce_pro7dual_0.8.inst.cfg | 12 ++++++++ .../variants/renkforce_pro7dual_1.0.inst.cfg | 12 ++++++++ 15 files changed, 227 insertions(+) create mode 100644 resources/definitions/renkforce_cubeone.def.json create mode 100644 resources/definitions/renkforce_pro6plus.def.json create mode 100755 resources/definitions/renkforce_pro7dual.def.json create mode 100755 resources/extruders/renkforce_pro7dual_1st.def.json create mode 100755 resources/extruders/renkforce_pro7dual_2st.def.json create mode 100644 resources/variants/renkforce_cubeone_0.7.inst.cfg create mode 100644 resources/variants/renkforce_pro6plus_0.4.inst.cfg create mode 100644 resources/variants/renkforce_pro6plus_0.6.inst.cfg create mode 100644 resources/variants/renkforce_pro6plus_0.8.inst.cfg create mode 100644 resources/variants/renkforce_pro6plus_1.0.inst.cfg create mode 100755 resources/variants/renkforce_pro7dual_0.2.inst.cfg create mode 100755 resources/variants/renkforce_pro7dual_0.4.inst.cfg create mode 100755 resources/variants/renkforce_pro7dual_0.6.inst.cfg create mode 100755 resources/variants/renkforce_pro7dual_0.8.inst.cfg create mode 100755 resources/variants/renkforce_pro7dual_1.0.inst.cfg diff --git a/resources/definitions/renkforce_cubeone.def.json b/resources/definitions/renkforce_cubeone.def.json new file mode 100644 index 0000000000..76f7263c3b --- /dev/null +++ b/resources/definitions/renkforce_cubeone.def.json @@ -0,0 +1,30 @@ +{ + "name": "Renkforce Cube One", + "version": 2, + "inherits": "goofoo_small", + "overrides": { + + "machine_name": { "default_value": "Renkforce Cube One" }, + "machine_width": { "default_value": 80 }, + "machine_depth": { "default_value": 80 }, + "machine_height": { "default_value": 80 }, + "machine_heated_bed": { "default_value": false }, + "raft_margin": { "default_value": 5 }, + "layer_height":{"default_value": 0.4}, + "layer_height_0": {"default_value": 0.5}, + "speed_print": {"value": 10}, + "speed_travel": {"value": 10}, + "speed_layer_0":{"value": 10}, + "speed_print_layer_0":{"value": 10}, + "speed_travel_layer_0":{"value": 10}, + + "retraction_speed": {"default_value": 60}, + "retraction_prime_speed":{"value": 80}, + "adhesion_type": {"default_value": "skirt"} + }, + "metadata": { + "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/renkforce_pro6plus.def.json b/resources/definitions/renkforce_pro6plus.def.json new file mode 100644 index 0000000000..09cb29719d --- /dev/null +++ b/resources/definitions/renkforce_pro6plus.def.json @@ -0,0 +1,17 @@ +{ + "name": "Renkforce Pro 6+", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "Renkforce Pro 6+" }, + "machine_width": { "default_value": 280 }, + "machine_depth": { "default_value": 280 }, + "machine_height": { "default_value": 300 } + + }, + "metadata": { + "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/renkforce_pro7dual.def.json b/resources/definitions/renkforce_pro7dual.def.json new file mode 100755 index 0000000000..59fd06d3ad --- /dev/null +++ b/resources/definitions/renkforce_pro7dual.def.json @@ -0,0 +1,22 @@ +{ + "name": "Renkforce Pro7 Dual", + "version": 2, + "inherits": "goofoo_far", + "overrides": { + "machine_name": { "default_value": "Renkforce Pro7 Dual" }, + "machine_width": { "default_value": 360 }, + "machine_depth": { "default_value": 250 }, + "machine_height": { "default_value": 200 }, + "machine_head_with_fans_polygon":{"default_value":[[0, 0], [0, 0], [0, 0], [0, 0]]}, + "machine_extruder_count": { + "default_value": 2 + } + }, + "metadata": { + "machine_extruder_trains": { + "0": "renkforce_pro7dual_1st", + "1": "renkforce_pro7dual_2st" + }, + "visible": true + } +} \ No newline at end of file diff --git a/resources/extruders/renkforce_pro7dual_1st.def.json b/resources/extruders/renkforce_pro7dual_1st.def.json new file mode 100755 index 0000000000..23659aa672 --- /dev/null +++ b/resources/extruders/renkforce_pro7dual_1st.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "renkforce_pro7dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/renkforce_pro7dual_2st.def.json b/resources/extruders/renkforce_pro7dual_2st.def.json new file mode 100755 index 0000000000..7b7a6a1743 --- /dev/null +++ b/resources/extruders/renkforce_pro7dual_2st.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "renkforce_pro7dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/variants/renkforce_cubeone_0.7.inst.cfg b/resources/variants/renkforce_cubeone_0.7.inst.cfg new file mode 100644 index 0000000000..605bdf75f5 --- /dev/null +++ b/resources/variants/renkforce_cubeone_0.7.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.7mm Nozzle +version = 4 +definition = renkforce_cubeone + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.7 \ No newline at end of file diff --git a/resources/variants/renkforce_pro6plus_0.4.inst.cfg b/resources/variants/renkforce_pro6plus_0.4.inst.cfg new file mode 100644 index 0000000000..26de9bfac7 --- /dev/null +++ b/resources/variants/renkforce_pro6plus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = renkforce_pro6plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/renkforce_pro6plus_0.6.inst.cfg b/resources/variants/renkforce_pro6plus_0.6.inst.cfg new file mode 100644 index 0000000000..7c337517ef --- /dev/null +++ b/resources/variants/renkforce_pro6plus_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = renkforce_pro6plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/renkforce_pro6plus_0.8.inst.cfg b/resources/variants/renkforce_pro6plus_0.8.inst.cfg new file mode 100644 index 0000000000..b3aba6d4a1 --- /dev/null +++ b/resources/variants/renkforce_pro6plus_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = renkforce_pro6plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/renkforce_pro6plus_1.0.inst.cfg b/resources/variants/renkforce_pro6plus_1.0.inst.cfg new file mode 100644 index 0000000000..e5e51b82b3 --- /dev/null +++ b/resources/variants/renkforce_pro6plus_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = renkforce_pro6plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/renkforce_pro7dual_0.2.inst.cfg b/resources/variants/renkforce_pro7dual_0.2.inst.cfg new file mode 100755 index 0000000000..e1d2ca7fa9 --- /dev/null +++ b/resources/variants/renkforce_pro7dual_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/renkforce_pro7dual_0.4.inst.cfg b/resources/variants/renkforce_pro7dual_0.4.inst.cfg new file mode 100755 index 0000000000..62aff750be --- /dev/null +++ b/resources/variants/renkforce_pro7dual_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/renkforce_pro7dual_0.6.inst.cfg b/resources/variants/renkforce_pro7dual_0.6.inst.cfg new file mode 100755 index 0000000000..b903531f1a --- /dev/null +++ b/resources/variants/renkforce_pro7dual_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/renkforce_pro7dual_0.8.inst.cfg b/resources/variants/renkforce_pro7dual_0.8.inst.cfg new file mode 100755 index 0000000000..3fd935a04d --- /dev/null +++ b/resources/variants/renkforce_pro7dual_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/renkforce_pro7dual_1.0.inst.cfg b/resources/variants/renkforce_pro7dual_1.0.inst.cfg new file mode 100755 index 0000000000..5c27ee38dd --- /dev/null +++ b/resources/variants/renkforce_pro7dual_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 From ec872492518d05fba79498d34e2a7217f4d44a69 Mon Sep 17 00:00:00 2001 From: goofoo Date: Wed, 22 Jun 2022 12:19:26 +0800 Subject: [PATCH 20/74] modify Renkforce Pro 7 Dual --- resources/definitions/renkforce_pro7dual.def.json | 4 +++- ..._pro7dual_2st.def.json => renkforce_pro7dual_2nd.def.json} | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename resources/extruders/{renkforce_pro7dual_2st.def.json => renkforce_pro7dual_2nd.def.json} (100%) diff --git a/resources/definitions/renkforce_pro7dual.def.json b/resources/definitions/renkforce_pro7dual.def.json index 59fd06d3ad..c6322046a9 100755 --- a/resources/definitions/renkforce_pro7dual.def.json +++ b/resources/definitions/renkforce_pro7dual.def.json @@ -15,8 +15,10 @@ "metadata": { "machine_extruder_trains": { "0": "renkforce_pro7dual_1st", - "1": "renkforce_pro7dual_2st" + "1": "renkforce_pro7dual_2nd" }, + "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", "visible": true } } \ No newline at end of file diff --git a/resources/extruders/renkforce_pro7dual_2st.def.json b/resources/extruders/renkforce_pro7dual_2nd.def.json similarity index 100% rename from resources/extruders/renkforce_pro7dual_2st.def.json rename to resources/extruders/renkforce_pro7dual_2nd.def.json From db752f6853b578fc6b7d6271daf3ee18d7a3fa2d Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:19:13 +0100 Subject: [PATCH 21/74] Create voron_trident_300_0.50.inst.cfg Add 0.50mm nozzle option --- .../variants/voron/voron_trident_300_0.50.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_300_0.50.inst.cfg diff --git a/resources/variants/voron/voron_trident_300_0.50.inst.cfg b/resources/variants/voron/voron_trident_300_0.50.inst.cfg new file mode 100644 index 0000000000..a6c001b55a --- /dev/null +++ b/resources/variants/voron/voron_trident_300_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_300 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.5 From 2bd1a4aa308f78b066bb52ace883c9cab701c173 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:20:01 +0100 Subject: [PATCH 22/74] Create voron_trident_350_0.50.inst.cfg --- .../variants/voron/voron_trident_350_0.50.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_350_0.50.inst.cfg diff --git a/resources/variants/voron/voron_trident_350_0.50.inst.cfg b/resources/variants/voron/voron_trident_350_0.50.inst.cfg new file mode 100644 index 0000000000..e67ee99b13 --- /dev/null +++ b/resources/variants/voron/voron_trident_350_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_350 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.5 From d4d9903f57fbd313caaf948d0d5376bd07350229 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:34:18 +0100 Subject: [PATCH 23/74] Create voron_trident_250_0.50.inst.cfg --- .../variants/voron/voron_trident_250_0.50.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_250_0.50.inst.cfg diff --git a/resources/variants/voron/voron_trident_250_0.50.inst.cfg b/resources/variants/voron/voron_trident_250_0.50.inst.cfg new file mode 100644 index 0000000000..61615f92b7 --- /dev/null +++ b/resources/variants/voron/voron_trident_250_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_250 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.5 From 5da5f938fb01f49a6f12922289eaa2ddf63069a3 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:35:16 +0100 Subject: [PATCH 24/74] Create voron_trident_350_0.25.inst.cfg --- .../variants/voron/voron_trident_350_0.25.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_350_0.25.inst.cfg diff --git a/resources/variants/voron/voron_trident_350_0.25.inst.cfg b/resources/variants/voron/voron_trident_350_0.25.inst.cfg new file mode 100644 index 0000000000..1817f39402 --- /dev/null +++ b/resources/variants/voron/voron_trident_350_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_350 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.25 From 51fceb63ef1090ffd2fd3c10f5c6cd4d72cf7db8 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:35:36 +0100 Subject: [PATCH 25/74] Create voron_trident_300_0.25.inst.cfg --- .../variants/voron/voron_trident_300_0.25.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_300_0.25.inst.cfg diff --git a/resources/variants/voron/voron_trident_300_0.25.inst.cfg b/resources/variants/voron/voron_trident_300_0.25.inst.cfg new file mode 100644 index 0000000000..4787f681d7 --- /dev/null +++ b/resources/variants/voron/voron_trident_300_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_300 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.25 From 5b4f83c47bf5ebc72309b7587a5747b264843913 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:35:58 +0100 Subject: [PATCH 26/74] Create voron_trident_250_0.25.inst.cfg --- .../variants/voron/voron_trident_250_0.25.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_250_0.25.inst.cfg diff --git a/resources/variants/voron/voron_trident_250_0.25.inst.cfg b/resources/variants/voron/voron_trident_250_0.25.inst.cfg new file mode 100644 index 0000000000..e84dc74b16 --- /dev/null +++ b/resources/variants/voron/voron_trident_250_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_250 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.25 From 04da0c9f7e22551b8d8c8cc6cb60c36b060ad8bd Mon Sep 17 00:00:00 2001 From: goofoo Date: Mon, 8 May 2023 14:10:11 +0800 Subject: [PATCH 27/74] add Renkforce Pro 10+ --- .../definitions/renkforce_pro10plus.def.json | 18 ++++++++++++++++++ .../renkforce/renkforce_pro10plus_0.4.inst.cfg | 13 +++++++++++++ .../renkforce/renkforce_pro10plus_0.6.inst.cfg | 13 +++++++++++++ .../renkforce/renkforce_pro10plus_0.8.inst.cfg | 13 +++++++++++++ .../renkforce/renkforce_pro10plus_1.0.inst.cfg | 13 +++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 resources/definitions/renkforce_pro10plus.def.json create mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg create mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg create mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg create mode 100644 resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg diff --git a/resources/definitions/renkforce_pro10plus.def.json b/resources/definitions/renkforce_pro10plus.def.json new file mode 100644 index 0000000000..414d59ec0b --- /dev/null +++ b/resources/definitions/renkforce_pro10plus.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Renkforce Pro 10+", + "inherits": "goofoo_near", + "metadata": + { + "visible": true, + "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce" + }, + "overrides": + { + "machine_depth": { "default_value": 360 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Renkforce Pro 10+" }, + "machine_width": { "default_value": 360 } + } +} \ No newline at end of file diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg new file mode 100644 index 0000000000..4f9ba6c1af --- /dev/null +++ b/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = renkforce_pro10plus +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg new file mode 100644 index 0000000000..72a6694904 --- /dev/null +++ b/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = renkforce_pro10plus +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg new file mode 100644 index 0000000000..25646fe297 --- /dev/null +++ b/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = renkforce_pro10plus +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg new file mode 100644 index 0000000000..3a40e67dc9 --- /dev/null +++ b/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = renkforce_pro10plus +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + From aca841302b280ff6fd43990f24c9d4e22962e5f0 Mon Sep 17 00:00:00 2001 From: goofoo Date: Mon, 8 May 2023 14:30:03 +0800 Subject: [PATCH 28/74] modify renkforce pro 10+ variants version to 22 --- resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg | 2 +- resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg | 2 +- resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg | 2 +- resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg index 4f9ba6c1af..aea6acc5e5 100644 --- a/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 20 +setting_version = 22 type = variant [values] diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg index 72a6694904..228ea98425 100644 --- a/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 20 +setting_version = 22 type = variant [values] diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg index 25646fe297..c7b037a84d 100644 --- a/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 20 +setting_version = 22 type = variant [values] diff --git a/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg index 3a40e67dc9..2c1e6194ed 100644 --- a/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 20 +setting_version = 22 type = variant [values] From b9a6efb332e09565681f658a88c0186e1bd8a73d Mon Sep 17 00:00:00 2001 From: Jordon Brooks <16258926+Jordonbc@users.noreply.github.com> Date: Tue, 23 May 2023 03:35:43 +0100 Subject: [PATCH 29/74] Added Kobra Plus printer profiles --- .../definitions/anycubic_kobra_plus.def.json | 30 +++++++++++++++++++ .../anycubic_kobra_plus_extruder_0.def.json | 16 ++++++++++ .../anycubic_kobra_plus_pla.inst.cfg | 27 +++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 resources/definitions/anycubic_kobra_plus.def.json create mode 100644 resources/extruders/anycubic_kobra_plus_extruder_0.def.json create mode 100644 resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg diff --git a/resources/definitions/anycubic_kobra_plus.def.json b/resources/definitions/anycubic_kobra_plus.def.json new file mode 100644 index 0000000000..5d41a5ef33 --- /dev/null +++ b/resources/definitions/anycubic_kobra_plus.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Anycubic Kobra Plus", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Jordon Brooks", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "anycubic_kobra_plus_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "pla", + "quality_definition": "anycubic_kobra_plus" + }, + "overrides": + { + "machine_depth": { "default_value": 302 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 352 }, + "machine_name": { "default_value": "Anycubic Kobra Plus" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nM355 S1; Turn LED on\n; Add Custom purge lines\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X1.0 Y30 Z0.3 F5000.0 ; Move to start position\nG1 X1.0 Y100.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X1.3 Y100.0 Z0.3 F5000.0 ; Move to side a little\nG1 X1.3 Y30 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line\nG1 Z5.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End custom purge lines" }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM355 S0; led off" }, + "machine_width": { "default_value": 302 } + } +} + diff --git a/resources/extruders/anycubic_kobra_plus_extruder_0.def.json b/resources/extruders/anycubic_kobra_plus_extruder_0.def.json new file mode 100644 index 0000000000..51a6c351bc --- /dev/null +++ b/resources/extruders/anycubic_kobra_plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "anycubic_kobra_plus", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg new file mode 100644 index 0000000000..a2565e0dc7 --- /dev/null +++ b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = anycubic_kobra_plus +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = pla +setting_version = 21 +type = quality +weight = 0 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +infill_pattern = cubic +retraction_hop = 0.1 +retraction_combing = off +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +speed_print = 80 +speed_infill = 40 +speed_wall_x = 60 +speed_layer_0 = 20 +wall_thickness = 1.2 +material_print_temperature = 195 +material_final_print_temperature = 195 \ No newline at end of file From d3c88eb7a6a9bed2d16a504eed0bad435bee112f Mon Sep 17 00:00:00 2001 From: Jordon Brooks <16258926+Jordonbc@users.noreply.github.com> Date: Tue, 23 May 2023 11:20:14 +0100 Subject: [PATCH 30/74] Update anycubic_kobra_plus_pla.inst.cfg Changed setting_version to 22 --- .../anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg index a2565e0dc7..02bd9edb5e 100644 --- a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg +++ b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = pla -setting_version = 21 +setting_version = 22 type = quality weight = 0 @@ -24,4 +24,4 @@ speed_wall_x = 60 speed_layer_0 = 20 wall_thickness = 1.2 material_print_temperature = 195 -material_final_print_temperature = 195 \ No newline at end of file +material_final_print_temperature = 195 From 8cfa59eabf7c140e99e9babe26eb5e8a80038a05 Mon Sep 17 00:00:00 2001 From: GregValiant <64202104+GregValiant@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:52:00 -0400 Subject: [PATCH 31/74] Update AnyCubic Kossel Remove the Disallowed areas from the Kossel and the Kossle Linear Plus. They cause disallowed areas to appear within the build area of the build plate. They were also designed to be off the build plate. --- .../definitions/anycubic_kossel.def.json | 45 ------------------- .../anycubic_kossel_linear_plus.def.json | 45 ------------------- 2 files changed, 90 deletions(-) diff --git a/resources/definitions/anycubic_kossel.def.json b/resources/definitions/anycubic_kossel.def.json index 28d6ac141d..50ee14db4e 100644 --- a/resources/definitions/anycubic_kossel.def.json +++ b/resources/definitions/anycubic_kossel.def.json @@ -18,51 +18,6 @@ { "machine_center_is_zero": { "default_value": true }, "machine_depth": { "default_value": 180 }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-50, -85], - [-85, -85], - [-90, -90] - ], - [ - [-85, -85], - [-85, -50], - [-90, -90] - ], - [ - [50, -85], - [85, -85], - [90, -90] - ], - [ - [85, -85], - [85, -50], - [90, -90] - ], - [ - [-50, 85], - [-85, 85], - [-90, 90] - ], - [ - [-85, 85], - [-85, 50], - [-90, 90] - ], - [ - [50, 85], - [85, 85], - [90, 90] - ], - [ - [85, 85], - [85, 50], - [90, 90] - ] - ] - }, "machine_end_gcode": { "default_value": "M400 ;Free buffer\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nM107 ;fan off\nM84 ;steppers off\nG28 ;move to endstop\nM84 ;steppers off" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { "default_value": true }, diff --git a/resources/definitions/anycubic_kossel_linear_plus.def.json b/resources/definitions/anycubic_kossel_linear_plus.def.json index 8f8080d58f..4e35fff69a 100644 --- a/resources/definitions/anycubic_kossel_linear_plus.def.json +++ b/resources/definitions/anycubic_kossel_linear_plus.def.json @@ -16,51 +16,6 @@ "overrides": { "machine_depth": { "default_value": 240 }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-50, -115], - [-115, -115], - [-90, -90] - ], - [ - [-115, -115], - [-115, -50], - [-90, -90] - ], - [ - [50, -115], - [115, -115], - [90, -90] - ], - [ - [115, -115], - [115, -50], - [90, -90] - ], - [ - [-50, 115], - [-115, 115], - [-90, 90] - ], - [ - [-115, 115], - [-115, 50], - [-90, 90] - ], - [ - [50, 115], - [115, 115], - [90, 90] - ], - [ - [115, 115], - [115, 50], - [90, 90] - ] - ] - }, "machine_name": { "default_value": "Anycubic Kossel Linear Plus" }, "machine_width": { "default_value": 240 } } From b23ab8f94083aa0575d9ce081a12db683680b75f Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 29 Jun 2023 17:14:07 -0400 Subject: [PATCH 32/74] Update Ender 3 Pro Profile to not Damage Bed --- resources/definitions/creality_ender3pro.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_ender3pro.def.json b/resources/definitions/creality_ender3pro.def.json index de0d4ed0bf..93038d9eff 100644 --- a/resources/definitions/creality_ender3pro.def.json +++ b/resources/definitions/creality_ender3pro.def.json @@ -23,7 +23,7 @@ }, "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Creality Ender-3 Pro" }, - "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z5.0 F3000 ; Move Z Axis up a bit during heating to not damage bed\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, "machine_width": { "default_value": 220 } } -} \ No newline at end of file +} From 4cc45da84d3238d03ae30fdf88bd4c143aa103a2 Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:09:00 +0100 Subject: [PATCH 33/74] Added Creality Ender-5 S1 Def --- .../definitions/creality_ender5s1.def.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 resources/definitions/creality_ender5s1.def.json diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json new file mode 100644 index 0000000000..e4cdf12e60 --- /dev/null +++ b/resources/definitions/creality_ender5s1.def.json @@ -0,0 +1,42 @@ +{ + "name": "Creality Ender-5 S1", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Ender-5/Ender-3Pro" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_width": { "default_value": 225 }, + "machine_depth": { "default_value": 225 }, + "machine_height": { "default_value": 305 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 }, + "build_volume_temperature": { "value": 195 }, + "material_bed_temperature": { "value": 60 }, + "retraction_amount": { "value": 2}, + "z_seam_type": { "value": "'sharpest_corner'" }, + "support_z_distance": { "value": 0.25 }, + "cool_min_layer_time": { "value": 5 }, + "wall_thickness": {"value": "line_width * 3" }, + "retraction_speed": { "value": 45 }, + "speed_print": { "value": 80.0 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} \ No newline at end of file From bd27d3a15405ff3cde6bc37699aea037c5916c4b Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:50:06 +0100 Subject: [PATCH 34/74] Added Creality Ender-5 S1 Nozzle Variants --- resources/variants/creality_ender5s1_0.2.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.3.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.4.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.5.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.6.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.8.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_1.0.inst.cfg | 12 ++++++++++++ 7 files changed, 84 insertions(+) create mode 100644 resources/variants/creality_ender5s1_0.2.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.3.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.4.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.5.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.6.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.8.inst.cfg create mode 100644 resources/variants/creality_ender5s1_1.0.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality_ender5s1_0.2.inst.cfg new file mode 100644 index 0000000000..efb2a8342c --- /dev/null +++ b/resources/variants/creality_ender5s1_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality_ender5s1_0.3.inst.cfg new file mode 100644 index 0000000000..c9d4204ace --- /dev/null +++ b/resources/variants/creality_ender5s1_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality_ender5s1_0.4.inst.cfg new file mode 100644 index 0000000000..9046a71b0b --- /dev/null +++ b/resources/variants/creality_ender5s1_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality_ender5s1_0.5.inst.cfg new file mode 100644 index 0000000000..c8ce62ffc7 --- /dev/null +++ b/resources/variants/creality_ender5s1_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality_ender5s1_0.6.inst.cfg new file mode 100644 index 0000000000..3eba1d8b6b --- /dev/null +++ b/resources/variants/creality_ender5s1_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality_ender5s1_0.8.inst.cfg new file mode 100644 index 0000000000..e697ea96cb --- /dev/null +++ b/resources/variants/creality_ender5s1_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality_ender5s1_1.0.inst.cfg new file mode 100644 index 0000000000..7901fe9e68 --- /dev/null +++ b/resources/variants/creality_ender5s1_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 From 4b9a40215e767f4384dd670ccd632031403c784c Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:52:21 +0100 Subject: [PATCH 35/74] Moved Creality Ender-5 S1 Nozzle Variants into the correct folder --- resources/variants/{ => creality}/creality_ender5s1_0.2.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.3.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.4.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.5.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.6.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.8.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_1.0.inst.cfg | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename resources/variants/{ => creality}/creality_ender5s1_0.2.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.3.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.4.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.5.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.6.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.8.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_1.0.inst.cfg (100%) diff --git a/resources/variants/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.2.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.2.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.3.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.3.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.4.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.4.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.5.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.5.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.6.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.6.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.8.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.8.inst.cfg diff --git a/resources/variants/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_1.0.inst.cfg rename to resources/variants/creality/creality_ender5s1_1.0.inst.cfg From 5acba34f97f35153fbccd60c00a04d0873749173 Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:57:36 +0100 Subject: [PATCH 36/74] Updated Creality Ender-5 S1 Nozzle Variants Names --- resources/definitions/creality_ender5s1.def.json | 2 +- resources/variants/creality/creality_ender5s1_0.2.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.3.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.4.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.5.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.6.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.8.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_1.0.inst.cfg | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json index e4cdf12e60..6272d3e04a 100644 --- a/resources/definitions/creality_ender5s1.def.json +++ b/resources/definitions/creality_ender5s1.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "creality_base", "overrides": { - "machine_name": { "default_value": "Creality Ender-5/Ender-3Pro" }, + "machine_name": { "default_value": "Creality Ender-5 S1" }, "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "machine_width": { "default_value": 225 }, "machine_depth": { "default_value": 225 }, diff --git a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg index efb2a8342c..b5969358e6 100644 --- a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.2mm +name = 0.2mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg index c9d4204ace..c8314bda4d 100644 --- a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.3mm +name = 0.3mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg index 9046a71b0b..1b519ad121 100644 --- a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.4mm +name = 0.4mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg index c8ce62ffc7..6bc413f30b 100644 --- a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.5mm +name = 0.5mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg index 3eba1d8b6b..f235650911 100644 --- a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.6mm +name = 0.6mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg index e697ea96cb..52b16eea23 100644 --- a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.8mm +name = 0.8mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg index 7901fe9e68..06c558c42b 100644 --- a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 1.0mm +name = 1.0mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle From b1e85a1b9c30c449797c1922c69446678b858aff Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 20:46:27 +0100 Subject: [PATCH 37/74] Updated Creality Ender-5 S1 Profile to be more inline with other defs --- .../definitions/creality_ender5s1.def.json | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json index 6272d3e04a..6deeba5c6f 100644 --- a/resources/definitions/creality_ender5s1.def.json +++ b/resources/definitions/creality_ender5s1.def.json @@ -2,28 +2,25 @@ "name": "Creality Ender-5 S1", "version": 2, "inherits": "creality_base", + "metadata": { + "quality_definition": "creality_base", + "visible": true + }, "overrides": { - "machine_name": { "default_value": "Creality Ender-5 S1" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, - "machine_width": { "default_value": 225 }, + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 225 }, - "machine_height": { "default_value": 305 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 }, + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Creality Ender-5 S1" }, + "machine_width": { "default_value": 225 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "build_volume_temperature": { "value": 195 }, "material_bed_temperature": { "value": 60 }, "retraction_amount": { "value": 2}, @@ -33,10 +30,5 @@ "wall_thickness": {"value": "line_width * 3" }, "retraction_speed": { "value": 45 }, "speed_print": { "value": 80.0 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true } } \ No newline at end of file From 85926e772c2cc1009b803a615b164f5dae2523d0 Mon Sep 17 00:00:00 2001 From: William Faircloth Date: Wed, 5 Jul 2023 15:04:19 -0400 Subject: [PATCH 38/74] fix: author --- resources/definitions/kingroon_kp3s_pro.def.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/definitions/kingroon_kp3s_pro.def.json b/resources/definitions/kingroon_kp3s_pro.def.json index 3d768e3bd0..79a4916680 100644 --- a/resources/definitions/kingroon_kp3s_pro.def.json +++ b/resources/definitions/kingroon_kp3s_pro.def.json @@ -6,7 +6,8 @@ { "visible": true, "platform": "kingroon_kp3s.stl", - "quality_definition": "kingroon_base" + "quality_definition": "kingroon_base", + "author": "willuhmjs" }, "overrides": { @@ -33,4 +34,4 @@ "retraction_speed": { "value": 40 }, "speed_z_hop": { "value": 4 } } -} \ No newline at end of file +} From 3ea970ff735f7df73dc97dfacb563a7dff3b807a Mon Sep 17 00:00:00 2001 From: protosam Date: Fri, 7 Jul 2023 05:32:46 -0500 Subject: [PATCH 39/74] add tina2 support --- resources/README.md | 3 + resources/definitions/entina_tina2.def.json | 242 ++++++++ resources/definitions/entina_tina2s.def.json | 238 ++++++++ resources/definitions/weedo_base.def.json | 544 +++++++++++++++--- resources/definitions/weedo_tina2.def.json | 242 ++++++++ resources/definitions/weedo_tina2s.def.json | 238 ++++++++ resources/definitions/weefun_tina2.def.json | 283 +++++++-- resources/definitions/weefun_tina2s.def.json | 277 +++++++-- .../extruders/weedo_base_extruder_0.def.json | 9 +- 9 files changed, 1895 insertions(+), 181 deletions(-) create mode 100644 resources/README.md create mode 100644 resources/definitions/entina_tina2.def.json create mode 100644 resources/definitions/entina_tina2s.def.json create mode 100644 resources/definitions/weedo_tina2.def.json create mode 100644 resources/definitions/weedo_tina2s.def.json diff --git a/resources/README.md b/resources/README.md new file mode 100644 index 0000000000..1c3894ef07 --- /dev/null +++ b/resources/README.md @@ -0,0 +1,3 @@ +Copy contents to: +- C:\Program Files\UltiMaker Cura 5.3.1\share\cura\resources\definitions +- C:\Program Files\UltiMaker Cura 5.3.1\share\cura\resources\extruders \ No newline at end of file diff --git a/resources/definitions/entina_tina2.def.json b/resources/definitions/entina_tina2.def.json new file mode 100644 index 0000000000..fe74030da4 --- /dev/null +++ b/resources/definitions/entina_tina2.def.json @@ -0,0 +1,242 @@ +{ + "name": "ENTINA TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "ENTINA", + "manufacturer": "ENTINA", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { + "default_value": "ENTINA TINA2" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 120 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": false + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 45 else 'grid'" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/entina_tina2s.def.json b/resources/definitions/entina_tina2s.def.json new file mode 100644 index 0000000000..0f197367fb --- /dev/null +++ b/resources/definitions/entina_tina2s.def.json @@ -0,0 +1,238 @@ +{ + "name": "ENTINA TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "ENTINA", + "manufacturer": "ENTINA", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { + "default_value": "ENTINA TINA2S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 110 + }, + "machine_height": { + "default_value": 100 + }, + "material_bed_temperature": { + "maximum_value_warning": "60", + "maximum_value": "65" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 0a43dae8cc..49f98ebfe1 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -1,95 +1,451 @@ -{ - "version": 2, - "name": "WEEDO Base", - "inherits": "fdmprinter", - "metadata": - { - "visible": false, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "exclude_materials": [ - "Extrudr_GreenTECPro_Anthracite", - "Extrudr_GreenTECPro_Black", - "Extrudr_GreenTECPro_Blue", - "Extrudr_GreenTECPro_Nature", - "Extrudr_GreenTECPro_Red", - "Extrudr_GreenTECPro_Silver", - "Extrudr_GreenTECPro_White", - "verbatim_bvoh", - "dsm_arnitel2045", - "dsm_novamid1070", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60" - ], - "has_machine_quality": false, - "has_materials": true, - "has_variants": false, - "machine_extruder_trains": { "0": "weedo_base_extruder_0" }, - "preferred_material": "generic_pla_175", - "preferred_quality_type": "draft" - }, - "overrides": - { - "adhesion_type": { "default_value": "raft" }, - "default_material_bed_temperature": { "default_value": 35 }, - "extruder_prime_pos_x": - { - "maximum_value": "machine_width", - "minimum_value": "0" - }, - "extruder_prime_pos_y": - { - "maximum_value": "machine_depth", - "minimum_value": "0" - }, - "infill_sparse_density": { "default_value": 10 }, - "machine_endstop_positive_direction_x": { "default_value": true }, - "machine_endstop_positive_direction_y": { "default_value": true }, - "machine_endstop_positive_direction_z": { "default_value": false }, - "machine_feeder_wheel_diameter": { "default_value": 10.61 }, - "machine_max_feedrate_e": { "default_value": 45 }, - "machine_max_feedrate_x": { "default_value": 250 }, - "machine_max_feedrate_y": { "default_value": 250 }, - "machine_max_feedrate_z": { "default_value": 10 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_steps_per_mm_e": { "default_value": 96 }, - "machine_steps_per_mm_x": { "default_value": 94 }, - "machine_steps_per_mm_y": { "default_value": 94 }, - "machine_steps_per_mm_z": { "default_value": 400 }, - "material_bed_temp_wait": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "material_flow": { "default_value": 95 }, - "material_print_temp_prepend": { "default_value": false }, - "material_print_temp_wait": { "default_value": false }, - "material_standby_temperature": { "minimum_value": "0" }, - "prime_tower_min_volume": { "default_value": 10 }, - "prime_tower_size": { "default_value": 15 }, - "raft_airgap": { "default_value": 0.22 }, - "raft_base_speed": { "value": 20 }, - "raft_interface_speed": { "value": 33 }, - "raft_margin": { "default_value": 8 }, - "raft_surface_fan_speed": { "value": 100 }, - "raft_surface_speed": { "value": 40 }, - "retraction_amount": { "default_value": 1.5 }, - "retraction_combing": { "value": "off" }, - "retraction_speed": { "default_value": 28 }, - "skirt_brim_speed": { "value": 26.0 }, - "speed_layer_0": { "value": 26.0 }, - "speed_prime_tower": { "value": "speed_support" }, - "speed_print_layer_0": { "value": 26.0 }, - "speed_support": { "value": "round(speed_print*0.82,1)" }, - "speed_support_interface": { "value": "round(speed_support*0.689,1)" }, - "speed_topbottom": { "value": "round(speed_print * 0.65,1)" }, - "speed_travel": { "value": 105.0 }, - "speed_travel_layer_0": { "value": 80.0 }, - "speed_wall": { "value": "max(5,round(speed_print / 2,1))" }, - "speed_wall_0": { "value": "max(5,speed_wall-5)" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "default_value": 60 }, - "support_interface_pattern": { "default_value": "lines" }, - "switch_extruder_retraction_amount": { "value": 16.5 }, - "switch_extruder_retraction_speeds": { "default_value": 28 } - } +{ + "version": 2, + "name": "WEEDO Base", + "inherits": "fdmprinter", + "metadata": { + "author": "WEEDO", + "manufacturer": "WEEDO", + "visible": false, + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_base_extruder_0" + }, + "has_materials": true, + "has_variants": false, + "has_machine_quality": false, + "preferred_quality_type": "draft", + "preferred_material": "generic_pla_175", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO Base" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_id": { + "default_value": 1 + }, + "material_bed_temp_wait": { + "default_value": false + }, + "material_print_temp_wait": { + "default_value": false + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_nozzle_tip_outer_diameter": { + "default_value": 0.8 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.8 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 0.67 + }, + "machine_min_cool_heat_time_window": { + "default_value": 1200.0 + }, + "machine_steps_per_mm_x": + { + "default_value": 94 + }, + "machine_steps_per_mm_y": + { + "default_value": 94 + }, + "machine_steps_per_mm_z": + { + "default_value": 400 + }, + "machine_steps_per_mm_e": + { + "default_value": 96 + }, + "machine_max_feedrate_x": { + "default_value": 200 + }, + "machine_max_feedrate_y": { + "default_value": 130 + }, + "machine_max_feedrate_z": { + "default_value": 10 + }, + "machine_max_feedrate_e": { + "default_value": 50 + }, + "machine_max_acceleration_x": { + "default_value": 3000 + }, + "machine_max_acceleration_y": { + "default_value": 3000 + }, + "machine_max_acceleration_z": { + "default_value": 120 + }, + "machine_max_acceleration_e": { + "default_value": 1600 + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_max_jerk_xy": { + "default_value": 10.0 + }, + "machine_max_jerk_z": { + "default_value": 5 + }, + "machine_max_jerk_e": { + "default_value": 5.1 + }, + "infill_line_width": { + "value": "line_width * 1.25" + }, + "initial_layer_line_width_factor": { + "default_value": 110.0 + }, + "wall_0_wipe_dist": { + "value": 0.0 + }, + "z_seam_corner": { + "default_value": "z_seam_corner_any" + }, + "skin_outline_count": { + "value": "0" + }, + "infill_sparse_density": { + "default_value": 10.0 + }, + "infill_pattern": { + "value": "'zigzag'" + }, + "infill_before_walls": { + "default_value": false + }, + "material_print_temperature": { + "maximum_value": "300" + }, + "material_print_temperature_layer_0": { + "value": "min(material_print_temperature + 10, 300)" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature" + }, + "material_final_print_temperature": { + "value": "material_print_temperature" + }, + "material_bed_temperature": { + "maximum_value_warning": "96" + }, + "material_flow": { + "default_value": 95.0 + }, + "material_flow_layer_0": { + "default_value": 95.0 + }, + "infill_material_flow": { + "value": "max(0, material_flow - 5)" + }, + "support_material_flow": { + "value": "max(0, material_flow - 5)" + }, + "speed_print": { + "default_value": 70.0 + }, + "speed_wall": { + "value": "max(5, round(speed_print / 2 - 5, 1))" + }, + "speed_wall_0": { + "value": "max(5, speed_wall - 5)" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.65, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.82, 1)" + }, + "speed_support_interface": { + "value": "round(speed_support * 0.689, 1)" + }, + "speed_prime_tower": { + "value": "speed_support" + }, + "speed_travel": { + "value": 105.0 + }, + "speed_layer_0": { + "value": 26.0 + }, + "speed_travel_layer_0": { + "value": 80.0 + }, + "skirt_brim_speed": { + "value": 26.0 + }, + "retraction_amount": { + "default_value": 3 + }, + "retraction_speed": { + "default_value": 28.0 + }, + "retraction_min_travel": { + "value": 0.8 + }, + "retraction_extrusion_window": { + "value": 1.0 + }, + "material_standby_temperature": { + "default_value": 175.0 + }, + "switch_extruder_retraction_amount": { + "value": 16.5 + }, + "switch_extruder_retraction_speeds": { + "default_value": 28.0 + }, + "retraction_combing": { + "value": "off" + }, + "retraction_hop_after_extruder_switch": { + "default_value": false + }, + "support_angle": { + "default_value": 60.0 + }, + "support_connect_zigzags": { + "default_value": false + }, + "support_z_distance": { + "default_value": 0.18 + }, + "support_interface_enable": { + "default_value": true + }, + "support_interface_density": { + "default_value": 60.0 + }, + "support_interface_height": { + "default_value": 0.8 + }, + "support_interface_pattern": { + "default_value": "lines" + }, + "adhesion_type": { + "default_value": "raft" + }, + "skirt_line_count": { + "default_value": 2 + }, + "raft_margin": { + "default_value": 8.0 + }, + "raft_airgap": { + "default_value": 0.19 + }, + "layer_0_z_overlap": { + "value": 0.09 + }, + "raft_surface_thickness": { + "value": 0.25 + }, + "raft_interface_thickness": { + "value": 0.27 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_base_thickness": { + "value": 0.3 + }, + "raft_surface_speed": { + "value": 40.0 + }, + "raft_interface_speed": { + "value": 33.0 + }, + "raft_base_speed": { + "value": 20.0 + }, + "raft_surface_fan_speed": { + "value": "100.0 if cool_fan_enabled else 0.0" + }, + "raft_interface_fan_speed": { + "value": 0.0 + }, + "raft_base_fan_speed": { + "value": 0.0 + }, + "prime_tower_size": { + "default_value": 15.0 + }, + "prime_tower_min_volume": { + "default_value": 10.0 + }, + "draft_shield_dist": { + "default_value": 3 + }, + "top_skin_preshrink": { + "value": 0.0 + } + } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json new file mode 100644 index 0000000000..f0d5a17a09 --- /dev/null +++ b/resources/definitions/weedo_tina2.def.json @@ -0,0 +1,242 @@ +{ + "name": "WEEDO TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 120 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": false + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 45 else 'grid'" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json new file mode 100644 index 0000000000..bbf73e7cf9 --- /dev/null +++ b/resources/definitions/weedo_tina2s.def.json @@ -0,0 +1,238 @@ +{ + "name": "WEEDO TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 110 + }, + "machine_height": { + "default_value": 100 + }, + "material_bed_temperature": { + "maximum_value_warning": "60", + "maximum_value": "65" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weefun_tina2.def.json b/resources/definitions/weefun_tina2.def.json index ebe026b163..0009267f0c 100644 --- a/resources/definitions/weefun_tina2.def.json +++ b/resources/definitions/weefun_tina2.def.json @@ -1,43 +1,242 @@ -{ - "version": 2, - "name": "WEEFUN TINA2", - "inherits": "weedo_base", - "metadata": - { - "visible": true, - "author": "WEEFUN", - "manufacturer": "WEEFUN", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": - { - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 120 }, - "machine_end_gcode": { "default_value": ";(**** end.gcode for TINA2****)\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG1 Z105 F300\nG28 X0 Y0\nG1 Y90 F1000\nM203 Z30" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 100 }, - "machine_name": { "default_value": "WEEFUN TINA2" }, - "machine_start_gcode": { "default_value": ";(**** start.gcode for TINA2****)\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG1 Z10 F200\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000 \nG92 E0 ; Reset extruder position\n\nM203 Z5" }, - "machine_width": { "default_value": 100 }, - "retraction_amount": { "default_value": 3 }, - "retraction_count_max": { "default_value": 10 }, - "retraction_speed": { "default_value": 35 }, - "speed_infill": { "value": 40.0 }, - "speed_print_layer_0": { "value": 22.0 }, - "speed_roofing": { "value": 25.0 }, - "speed_support_bottom": { "dvalue": 30.0 }, - "speed_support_infill": { "value": 45.0 }, - "speed_support_roof": { "value": 30.0 }, - "speed_topbottom": { "value": 30.0 }, - "speed_travel_layer_0": { "value": 60 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 25.0 }, - "support_xy_distance": { "default_value": 1.0 } - } +{ + "name": "WEEFUN TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEFUN TINA2" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 120 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": false + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 45 else 'grid'" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "value": 0.35 + } + } } \ No newline at end of file diff --git a/resources/definitions/weefun_tina2s.def.json b/resources/definitions/weefun_tina2s.def.json index d23e0c356c..54299a261d 100644 --- a/resources/definitions/weefun_tina2s.def.json +++ b/resources/definitions/weefun_tina2s.def.json @@ -1,41 +1,238 @@ -{ - "version": 2, - "name": "WEEFUN TINA2S", - "inherits": "weedo_base", - "metadata": - { - "visible": true, - "author": "WEEFUN", - "manufacturer": "WEEFUN", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": - { - "gantry_height": { "value": 20 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 120 }, - "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2s****)\nM203 Z15 ;Move Z axis up 5mm\nM104 S0 ;Turn off extruder heating\nM140 S0 ;Turn off bed heating\nM107 ;Turn Fans off\nG92 E0 ;(Reset after prime)\nG0 E-1 F300 ;Retract Fillament 1mm\nG28 Z F300 ;Park Hotend up\nG28 X0 Y0 ;Park Hotend\nG1 Y90 F1000 ;Present finished model\nG0 E-2 F300 ;Retract Fillament 2mm\nM82 ;absolute extrusion mode\nM104 S0 ;Ensure hotend is off\nM117 Print Complete" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 100 }, - "machine_name": { "default_value": "WEEFUN TINA2S" }, - "machine_start_gcode": { "default_value": ";MachineType:TINA2S\n;FilamentType:{material_type}\n;Layer height:{layer_height}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n;InfillDensity:{infill_sparse_density}\n;(**** start.gcode for tina2s****)\nM203 Z5 ;Move Z axis up 5mm\nM117 Homing axes\nG28 Z; Home extruder axis Z\nG28 X Y; Home extruder axis X Y\nM117 Start Warm Up\nM140 S{material_bed_temperature} ;start heating the bed to what is set in Cura\nM104 S130 ;start heating E to 130 for preheat\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nM117 Levling the build plate\nG29\nG1 Z1.0 F3000 ;Move Z Axis up to 1mm\nG1 X0.5 Y1 ;Move hotend to starting position\nM117 Heating Hotend\nM104 S{material_initial_print_temperature} T0 ;start heating T0 to what is set in Cura\nM109 S{material_initial_print_temperature} T0 ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nM117 Purging and cleaning nozzle\nG1 X1.1 Y10 Z0.28 F1000.0 ;Move to start position\nG1 X1.1 Y90.0 Z0.28 F2000.0 E15 ;Draw the first line\nG1 X1.4 Y90.0 Z0.23 F5000.0 ;Move to side a little\nG1 X1.4 Y10 Z0.20 F2000.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1 Y5 Z0.2 F5000.0 ;Move over to prevent blob squish\nM117 Printing..." }, - "machine_width": { "default_value": 100 }, - "retraction_amount": { "default_value": 3 }, - "speed_infill": { "value": 40.0 }, - "speed_print_layer_0": { "value": 22.0 }, - "speed_roofing": { "value": 25.0 }, - "speed_support_bottom": { "dvalue": 30.0 }, - "speed_support_infill": { "value": 45.0 }, - "speed_support_roof": { "value": 30.0 }, - "speed_topbottom": { "value": 30.0 }, - "speed_travel_layer_0": { "value": 60 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 25.0 } - } +{ + "name": "WEEFUN TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEFUN TINA2S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 110 + }, + "machine_height": { + "default_value": 100 + }, + "material_bed_temperature": { + "maximum_value_warning": "60", + "maximum_value": "65" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "value": 0.35 + } + } } \ No newline at end of file diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json index 82cf9d9541..0cb088acdd 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -2,15 +2,14 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "weedo_base", "position": "0" }, - "overrides": - { + + "overrides": { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} From dd89acdff4f97ea12876866607eaea47dfabf92a Mon Sep 17 00:00:00 2001 From: protosam Date: Fri, 7 Jul 2023 05:52:49 -0500 Subject: [PATCH 40/74] remove private readme --- resources/README.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 resources/README.md diff --git a/resources/README.md b/resources/README.md deleted file mode 100644 index 1c3894ef07..0000000000 --- a/resources/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Copy contents to: -- C:\Program Files\UltiMaker Cura 5.3.1\share\cura\resources\definitions -- C:\Program Files\UltiMaker Cura 5.3.1\share\cura\resources\extruders \ No newline at end of file From 0782ce43835741e3c1a5c132837cbf819e168170 Mon Sep 17 00:00:00 2001 From: protosam Date: Fri, 7 Jul 2023 06:01:22 -0500 Subject: [PATCH 41/74] removed machine_id value from weedo_base.def.json --- resources/definitions/weedo_base.def.json | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 49f98ebfe1..5023d5669f 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -179,9 +179,6 @@ "material_diameter": { "default_value": 1.75 }, - "machine_id": { - "default_value": 1 - }, "material_bed_temp_wait": { "default_value": false }, @@ -203,20 +200,16 @@ "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, - "machine_steps_per_mm_x": - { + "machine_steps_per_mm_x": { "default_value": 94 }, - "machine_steps_per_mm_y": - { + "machine_steps_per_mm_y": { "default_value": 94 }, - "machine_steps_per_mm_z": - { + "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_steps_per_mm_e": - { + "machine_steps_per_mm_e": { "default_value": 96 }, "machine_max_feedrate_x": { From 49b9d0b9de0c4f1c34fb50ec859ef15519f1cd6e Mon Sep 17 00:00:00 2001 From: protosam Date: Fri, 7 Jul 2023 06:05:42 -0500 Subject: [PATCH 42/74] resolve redundant settings in weedo_base.def.json --- resources/definitions/weedo_base.def.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 5023d5669f..86dfdb619f 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -401,12 +401,6 @@ "raft_surface_thickness": { "value": 0.25 }, - "raft_interface_thickness": { - "value": 0.27 - }, - "raft_interface_line_width": { - "value": 0.7 - }, "raft_base_thickness": { "value": 0.3 }, @@ -419,12 +413,6 @@ "raft_base_speed": { "value": 20.0 }, - "raft_surface_fan_speed": { - "value": "100.0 if cool_fan_enabled else 0.0" - }, - "raft_interface_fan_speed": { - "value": 0.0 - }, "raft_base_fan_speed": { "value": 0.0 }, From 076db20aaf7b09711ab10accdd8f2250267a83a0 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 10 Jul 2023 20:52:06 +0200 Subject: [PATCH 43/74] Enable support interface for the AA0.25 and AA0.4 nozzles for all materials. Default interface distance is 0.3mm (rounded to layerheights) and 0.4mm for CPE+ Relates to: PP-10 --- .../quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg | 5 ++++- .../ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg | 5 ++++- .../ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg | 5 ++++- .../ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg | 5 ++++- .../ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg | 5 ++++- .../ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg | 5 ++++- .../ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg | 7 ++++--- 106 files changed, 425 insertions(+), 47 deletions(-) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg index 6bc57b7a6e..3a88801570 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg @@ -13,4 +13,8 @@ weight = 0 [values] speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg index 2cba4bb788..cd74f2688f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg @@ -14,5 +14,9 @@ weight = 0 [values] speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg index 3d765aaa1e..a148563d97 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg @@ -20,6 +20,10 @@ retraction_min_travel = 5 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg index 3e97141c64..7a15e94478 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg @@ -29,7 +29,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg index ffaf1dd591..d2695b0eaf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg @@ -15,5 +15,9 @@ weight = 0 material_print_temperature = =default_material_print_temperature - 5 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg index 95d624cf99..1b40b93f91 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg @@ -21,6 +21,10 @@ retraction_hop = 0.2 speed_print = 30 speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.72 travel_avoid_distance = 0.4 wall_0_inset = 0.015 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg index 90ac201992..75cea75e5b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg @@ -34,6 +34,10 @@ speed_print = 25 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg index 90a389ea0b..03daa33819 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg @@ -21,6 +21,10 @@ speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg index ad57f4d87d..f6969a31a3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg @@ -22,4 +22,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg index 075c1fd4aa..6d5e7148c4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg @@ -23,4 +23,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg index 5c2bb0f6f4..852c8580d7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg @@ -22,4 +22,8 @@ speed_infill = =math.ceil(speed_print * 40 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg index 6d68564281..df95d49c12 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg @@ -23,4 +23,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg index fe501993d4..baa0b0c36d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg @@ -28,6 +28,9 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg index f9c44650c2..f53c0f5aeb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg @@ -26,6 +26,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg index d7b82b4a1c..967d3ccd44 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg @@ -28,6 +28,9 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg index 76a248a749..de0053edf9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -26,6 +26,9 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg index 8a399bd637..7a13861023 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg @@ -21,4 +21,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg index e6f19344df..60a9e47834 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg @@ -20,4 +20,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg index 730f7cd2f3..422258c09c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg index da5699d463..1764954dd5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg @@ -20,4 +20,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg index 39f3fd8686..f6be35a2ec 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg @@ -14,7 +14,10 @@ weight = 1 [values] ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg index b834ac75bb..874bcc66f0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg @@ -15,7 +15,10 @@ weight = -1 material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg index ea8f7837a2..89c3b6f361 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg @@ -14,7 +14,10 @@ weight = 0 [values] ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg index 88b89d7a47..662aa9fb66 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg @@ -15,7 +15,10 @@ weight = -2 material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg index 046b9f6ce2..4e217f5cca 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg index c1d488bf5f..b5ec910404 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg index d2a3b67d4c..ff2159e522 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg @@ -30,7 +30,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg index c95009797d..a524c5c040 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg index fdbdb811c1..adc4670e8d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg index d71148e5ce..3967838a12 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg @@ -19,4 +19,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg index 69f6059c00..7829f46334 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg index 5291946ccd..db079b04c9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg @@ -19,4 +19,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg index 6de3ad3edb..4b8f9f433b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg @@ -21,5 +21,9 @@ retraction_prime_speed = =retraction_speed speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg index f076447401..5581284de4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 70 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg index 40b7c5b843..30af138465 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg @@ -17,5 +17,9 @@ machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg index 8452bce4a9..e5dc960d98 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg @@ -24,5 +24,9 @@ retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg index 98990f6fe0..719adc820b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg @@ -27,6 +27,10 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.9 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg index b2cbff9177..70d53dd331 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg index 309f646559..009039d972 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg index 234ec47e8f..9c2870b661 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg index 6268da9a9f..e091136b32 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg index d94df8b8f3..450c82a0c2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg index cd358539bb..fa25ccb171 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg index a0d698a327..fd3574f313 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg @@ -22,5 +22,9 @@ speed_roofing = =math.ceil(speed_wall * 20 / 24) speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg index e9e0c2fc7f..cbf086000e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg @@ -27,6 +27,10 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg index 18aaeb6470..c6e9fc00d1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg @@ -36,6 +36,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg index e8e7410cd5..043aa880ad 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg index e24ab778b5..0c8d7eb429 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg @@ -36,6 +36,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg index 3dff641b42..fd25f84ca5 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg index f9d1cb1295..ea26d6b146 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg index 864e913a9c..b49ee3061e 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg index 138b118073..db82d6e40e 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg index 6f899afbbf..8e94df9387 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg index ae9144728a..08053a4f6d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg @@ -13,4 +13,8 @@ weight = 0 [values] speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg index ba519667d0..ca39f8dc7a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg @@ -14,5 +14,9 @@ weight = 0 [values] speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg index 710701b22a..009628fd2e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg @@ -15,11 +15,15 @@ weight = 0 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 -raft_airgap = 0.15 +raft_airgap = 0.4 retraction_min_travel = 5 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg index f5a34415b4..eeffba5b98 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg @@ -29,7 +29,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg index 7b41e45d1c..374ef26315 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg @@ -15,5 +15,9 @@ weight = 0 material_print_temperature = =default_material_print_temperature - 5 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg index 199995e5a1..2b99c9acce 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg @@ -21,6 +21,10 @@ retraction_hop = 0.2 speed_print = 30 speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.72 travel_avoid_distance = 0.4 wall_0_inset = 0.015 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg index 4b9d902b31..d38c036bcd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg @@ -34,6 +34,10 @@ speed_print = 25 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg index 81d1d1f735..4f02a053b4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg @@ -21,6 +21,10 @@ speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg index 8ecbf19956..7694e37ba3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg @@ -22,4 +22,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg index f576b20987..c27a4a1b57 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg @@ -23,4 +23,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg index 65e2cb0361..f19345a0fe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg @@ -22,4 +22,8 @@ speed_infill = =math.ceil(speed_print * 40 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg index 337054f0de..03f67f9924 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg @@ -23,4 +23,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg index e95804af3a..72e6ead239 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg @@ -28,6 +28,9 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg index ac1e50fd49..1a4e89f783 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg @@ -26,6 +26,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg index 77ccf92459..6c2e7b2f94 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg @@ -28,6 +28,9 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg index dde22bbd42..b2182320fd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -26,6 +26,9 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg index 5e96ec7e28..ab7fc5ef9b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg @@ -21,4 +21,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg index ec4cef925d..7c27d79d2d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg @@ -20,4 +20,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg index 2928127314..20c036907a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg index af34967c61..b1094daf5a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg @@ -20,4 +20,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg index e243e33749..0abeb14221 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg @@ -14,7 +14,10 @@ weight = 1 [values] ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg index 8833881fdf..94536f1904 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg @@ -15,7 +15,10 @@ weight = -1 material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg index 70f76a5266..f07d801dc0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg @@ -14,7 +14,10 @@ weight = 0 [values] ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg index 0f7b604b15..005ccf6e59 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg @@ -15,7 +15,10 @@ weight = -2 material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg index c19de26c93..a2e3bd792b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg index b21da5f2e4..9ef073b635 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg index c99934288e..e118f0db8a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg @@ -30,7 +30,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg index 7eedf33df9..4351a289b9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg index 8bebbf4113..6fe817fba1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg index ce957c1a50..060e9b3540 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg @@ -19,4 +19,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg index 4bba37dd01..1e04aad8ce 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg index 6b7f2fba1a..aaf279f115 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg @@ -19,4 +19,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg index 5facf88970..f34549bc78 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg @@ -21,5 +21,9 @@ retraction_prime_speed = =retraction_speed speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg index 262fa01441..4a9e914b99 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 70 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg index b05f4fdd62..dc73f13bb5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg @@ -17,5 +17,9 @@ machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg index aea145b1f9..ead512bb50 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg @@ -24,5 +24,9 @@ retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg index 31d2b31017..c6641e7a08 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg @@ -27,6 +27,10 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.9 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg index 318a14834f..9712132da9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg index 1527a11fd0..79a0f11262 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg index 356fa2d4cb..70207475dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg index 5f63f533f7..f3e17318b6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg index bf64c24170..6a3ec605ad 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg index 977232f4d4..9e3a3586f3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg index 8e904a41a5..506ed71f9a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg @@ -22,5 +22,9 @@ speed_roofing = =math.ceil(speed_wall * 20 / 24) speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg index 0ac60ad5a2..5590368369 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg @@ -27,6 +27,10 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg index b641bdbe13..281d99afb1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg @@ -36,6 +36,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg index 9a4f7c61fd..450b9adeb4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg index 3461b45736..21fbcff466 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg @@ -36,6 +36,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg index 4921b87434..88ee346758 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg index 2dde7772b6..00f9ef51ff 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg index df11fcf377..c9a6a2bafe 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg index 759f3ed41d..7abb9e4018 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg index f18c0e018e..e0c6719bde 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 From 7f04c326fbb0144d8cfd76a2ae66932f09ad4e48 Mon Sep 17 00:00:00 2001 From: GregValiant <64202104+GregValiant@users.noreply.github.com> Date: Sun, 16 Jul 2023 13:20:08 -0400 Subject: [PATCH 44/74] Update creality_ender3s1plus.def.json Change the G28 O to a plain G28 for backward compatibility with firmware. Update Creality3s1 series startup gcode Removed the "G28 O ;Home all untrusted axes" Replaced with "G28 ; Home all axes" Some firmware will not accept the "O" parameter. --- resources/definitions/creality_ender3s1.def.json | 2 +- resources/definitions/creality_ender3s1plus.def.json | 2 +- resources/definitions/creality_ender3s1pro.def.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/creality_ender3s1.def.json b/resources/definitions/creality_ender3s1.def.json index 37e69d72c0..62405572d7 100644 --- a/resources/definitions/creality_ender3s1.def.json +++ b/resources/definitions/creality_ender3s1.def.json @@ -24,7 +24,7 @@ }, "machine_height": { "default_value": 270 }, "machine_name": { "default_value": "Creality Ender-3 S1" }, - "machine_start_gcode": { "default_value": "; Ender 3 S1 Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_width": { "default_value": 220 }, "retraction_amount": { "value": 0.8 }, "retraction_extrusion_window": { "value": 1.5 }, diff --git a/resources/definitions/creality_ender3s1plus.def.json b/resources/definitions/creality_ender3s1plus.def.json index 61da5b690e..0982104cd9 100644 --- a/resources/definitions/creality_ender3s1plus.def.json +++ b/resources/definitions/creality_ender3s1plus.def.json @@ -24,7 +24,7 @@ }, "machine_height": { "default_value": 300 }, "machine_name": { "default_value": "Creality Ender-3 S1 Plus" }, - "machine_start_gcode": { "default_value": "; Ender 3 S1 Plus Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Plus Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_width": { "default_value": 300 }, "retraction_amount": { "value": 0.8 }, "retraction_extrusion_window": { "value": 1.5 }, diff --git a/resources/definitions/creality_ender3s1pro.def.json b/resources/definitions/creality_ender3s1pro.def.json index ba5d22e2dc..d375a904de 100644 --- a/resources/definitions/creality_ender3s1pro.def.json +++ b/resources/definitions/creality_ender3s1pro.def.json @@ -24,7 +24,7 @@ }, "machine_height": { "default_value": 270 }, "machine_name": { "default_value": "Creality Ender-3 S1 Pro" }, - "machine_start_gcode": { "default_value": "; Ender 3 S1 Pro Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Pro Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_width": { "default_value": 220 }, "retraction_amount": { "value": 0.8 }, "retraction_extrusion_window": { "value": 1.5 }, From 86cb3851fe8091df96613ce91e5c9f5d39321fdc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 25 Jul 2023 13:20:26 +0200 Subject: [PATCH 45/74] Force left to right reading direction for numeric textfield CURA-10583 --- resources/qml/MachineSettings/NumericTextFieldWithUnit.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index 64beeb9834..408db66f3a 100644 --- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml +++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml @@ -76,6 +76,11 @@ UM.TooltipArea anchors.left: fieldLabel.right anchors.leftMargin: spacing verticalAlignment: Text.AlignVCenter + + // The control is set up for left to right. So we force it to that. If we don't, it will take the OS reading + // direction, which might not be left to right. This will lead to the text overlapping with the unit + horizontalAlignment: TextInput.AlignLeft + selectionColor: UM.Theme.getColor("text_selection") selectedTextColor: UM.Theme.getColor("setting_control_text") padding: 0 From 3521947fefb72a9524b33e296b3b55cb9d6762a3 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Thu, 27 Jul 2023 13:49:21 +0200 Subject: [PATCH 46/74] Upload packages to jfrog --- .github/workflows/conan-package-create.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 701a978cd8..98e207acf3 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -151,7 +151,9 @@ jobs: - name: Upload the Package(s) if: ${{ always() && inputs.conan_upload_community }} - run: conan upload ${{ inputs.recipe_id_full }} -r cura --all -c + run: | + conan upload ${{ inputs.recipe_id_full }} -r cura --all -c + conan upload "*" -r cura --all -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} From fa6961a45035e5a0136423439ae23ff9ab5c5eab Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 27 Jul 2023 13:52:15 +0200 Subject: [PATCH 47/74] Revert "Upload packages to jfrog" This reverts commit 3521947fefb72a9524b33e296b3b55cb9d6762a3. --- .github/workflows/conan-package-create.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 98e207acf3..701a978cd8 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -151,9 +151,7 @@ jobs: - name: Upload the Package(s) if: ${{ always() && inputs.conan_upload_community }} - run: | - conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - conan upload "*" -r cura --all -c + run: conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} From 1d91eca483be47c2e88542b3473728502b35204e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 28 Jul 2023 10:52:27 +0200 Subject: [PATCH 48/74] Use correct value for multiple file open enum Previously we used the qdialog enum, which isn't the one you should use for the qml dialog. CURA-10741 --- resources/qml/Cura.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index cb3202bc00..31066f8f46 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -628,7 +628,7 @@ UM.MainWindow //: File open dialog title title: catalog.i18nc("@title:window","Open file(s)") modality: Qt.WindowModal - fileMode: FileDialog.FileMode.ExistingFile + fileMode: FileDialog.FileMode.OpenFiles nameFilters: UM.MeshFileHandler.supportedReadFileTypes; currentFolder: CuraApplication.getDefaultPath("dialog_load_path") onAccepted: From d08e2bc018026d7528199c96da17dbe48fa2511f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 28 Jul 2023 11:16:51 +0200 Subject: [PATCH 49/74] Increased max conan version to 1.60.0 For some magical reason, i got issues with 1.56.0. It used to work but when I needed to do a conan install, it suddenly failed to install any python packages, claiming I didn't have openssl. --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 438e3f07b7..520e7a693f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,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.56.0" +required_conan_version = "<=1.60.0" class CuraConan(ConanFile): From 202d802f613c8d6ff7a5b1b2e314920db31831d3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 28 Jul 2023 13:36:40 +0200 Subject: [PATCH 50/74] Move the required plugins list to before it's actually checked Cuz ya know. If you don't set the data before checking, you will have a baaaad time. --- cura/CuraApplication.py | 56 ++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 889e442eaa..64d88d13dc 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -495,6 +495,36 @@ class CuraApplication(QtApplication): def startSplashWindowPhase(self) -> None: """Runs preparations that needs to be done before the starting process.""" + self.setRequiredPlugins([ + # Misc.: + "ConsoleLogger", # You want to be able to read the log if something goes wrong. + "CuraEngineBackend", # Cura is useless without this one since you can't slice. + "FileLogger", # You want to be able to read the log if something goes wrong. + "XmlMaterialProfile", # Cura crashes without this one. + "Marketplace", + # This contains the interface to enable/disable plug-ins, so if you disable it you can't enable it back. + "PrepareStage", # Cura is useless without this one since you can't load models. + "PreviewStage", # This shows the list of the plugin views that are installed in Cura. + "MonitorStage", # Major part of Cura's functionality. + "LocalFileOutputDevice", # Major part of Cura's functionality. + "LocalContainerProvider", # Cura is useless without any profiles or setting definitions. + + # Views: + "SimpleView", # Dependency of SolidView. + "SolidView", # Displays models. Cura is useless without it. + + # Readers & Writers: + "GCodeWriter", # Cura is useless if it can't write its output. + "STLReader", # Most common model format, so disabling this makes Cura 90% useless. + "3MFWriter", # Required for writing project files. + + # Tools: + "CameraTool", # Needed to see the scene. Cura is useless without it. + "SelectionTool", # Dependency of the rest of the tools. + "TranslateTool", # You'll need this for almost every print. + ]) + # Plugins need to be set here, since in the super the check is done if they are actually loaded. + super().startSplashWindowPhase() if not self.getIsHeadLess(): @@ -503,33 +533,7 @@ class CuraApplication(QtApplication): except FileNotFoundError: Logger.log("w", "Unable to find the window icon.") - self.setRequiredPlugins([ - # Misc.: - "ConsoleLogger", #You want to be able to read the log if something goes wrong. - "CuraEngineBackend", #Cura is useless without this one since you can't slice. - "FileLogger", #You want to be able to read the log if something goes wrong. - "XmlMaterialProfile", #Cura crashes without this one. - "Marketplace", #This contains the interface to enable/disable plug-ins, so if you disable it you can't enable it back. - "PrepareStage", #Cura is useless without this one since you can't load models. - "PreviewStage", #This shows the list of the plugin views that are installed in Cura. - "MonitorStage", #Major part of Cura's functionality. - "LocalFileOutputDevice", #Major part of Cura's functionality. - "LocalContainerProvider", #Cura is useless without any profiles or setting definitions. - # Views: - "SimpleView", #Dependency of SolidView. - "SolidView", #Displays models. Cura is useless without it. - - # Readers & Writers: - "GCodeWriter", #Cura is useless if it can't write its output. - "STLReader", #Most common model format, so disabling this makes Cura 90% useless. - "3MFWriter", #Required for writing project files. - - # Tools: - "CameraTool", #Needed to see the scene. Cura is useless without it. - "SelectionTool", #Dependency of the rest of the tools. - "TranslateTool", #You'll need this for almost every print. - ]) self._i18n_catalog = i18nCatalog("cura") self._update_platform_activity_timer = QTimer() From e686baaf923f58555ee796fddc9cdd08581ce9a0 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 31 Jul 2023 11:47:15 +0200 Subject: [PATCH 51/74] Fixed for all the used python packages in venv CURA-10770 --- conanfile.py | 16 ++++++++++++---- resources/qml/Dialogs/AboutDialog.qml | 9 +++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index d75b2bc6bf..f028ccbe9e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -150,9 +150,14 @@ class CuraConan(ConanFile): conan_installs.append([dependency.ref.name,dependency.ref.version]) #list of python installs - import pkg_resources - for package in pkg_resources.working_set: - python_installs.append([package.key, package.version]) + python_ins_cmd = f""" python -c "import pkg_resources; import os; [open(os.path.join("'"{self.recipe_folder}"'", "'"info.txt"'"), "'"a"'").write(s.key+"'","'"+ s.version+"'";"'") for s in pkg_resources.working_set]" """ + self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=True) + with open(os.path.join(self.recipe_folder, "info.txt"), "r") as f: + packages = f.read() + package = packages.split(";") + for pack in package: + python_installs.append(pack.split(",")) + os.remove(os.path.join(self.recipe_folder, "info.txt")) with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f: f.write(cura_version_py.render( @@ -330,7 +335,7 @@ class CuraConan(ConanFile): vr.generate() self._generate_cura_version(os.path.join(self.source_folder, "cura")) - self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs")) + if self.options.devtools: entitlements_file = "'{}'".format(os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements")) @@ -349,6 +354,8 @@ class CuraConan(ConanFile): pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0]) pot.generate() + self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs")) + def build(self): if self.options.devtools: if self.settings.os != "Windows" or self.conf.get("tools.microsoft.bash:path", check_type = str): @@ -358,6 +365,7 @@ class CuraConan(ConanFile): 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 + print("we are here /n") self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def imports(self): diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index ae2bd44d74..8f3723da87 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -58,6 +58,15 @@ UM.Dialog anchors.horizontalCenter: parent.horizontalCenter UM.I18nCatalog{id: catalog; name: "cura"} + MouseArea + { + anchors.fill: parent + onClicked: + { + projectsList.visible = !projectsList.visible; + projectBuildInfoList.visible = !projectBuildInfoList.visible; + } + } } UM.Label From d3027fa976226fff3822500958a8e3c839f4d36a Mon Sep 17 00:00:00 2001 From: nallath Date: Tue, 1 Aug 2023 11:27:33 +0000 Subject: [PATCH 52/74] Applied printer-linter format --- resources/definitions/creality_ender3pro.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3pro.def.json b/resources/definitions/creality_ender3pro.def.json index 93038d9eff..aa5daa132b 100644 --- a/resources/definitions/creality_ender3pro.def.json +++ b/resources/definitions/creality_ender3pro.def.json @@ -26,4 +26,4 @@ "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z5.0 F3000 ; Move Z Axis up a bit during heating to not damage bed\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file From 5ef0cbd945f0000744ed6b8aa647cc2c9b838a24 Mon Sep 17 00:00:00 2001 From: nallath Date: Tue, 1 Aug 2023 11:42:07 +0000 Subject: [PATCH 53/74] Applied printer-linter format --- resources/definitions/entina_tina2.def.json | 440 +++++------ resources/definitions/entina_tina2s.def.json | 437 +++++------ resources/definitions/weedo_base.def.json | 688 +++++++----------- resources/definitions/weedo_tina2.def.json | 440 +++++------ resources/definitions/weedo_tina2s.def.json | 437 +++++------ resources/definitions/weefun_tina2.def.json | 440 +++++------ resources/definitions/weefun_tina2s.def.json | 437 +++++------ .../extruders/weedo_base_extruder_0.def.json | 9 +- 8 files changed, 1459 insertions(+), 1869 deletions(-) diff --git a/resources/definitions/entina_tina2.def.json b/resources/definitions/entina_tina2.def.json index fe74030da4..7e6b18a982 100644 --- a/resources/definitions/entina_tina2.def.json +++ b/resources/definitions/entina_tina2.def.json @@ -1,242 +1,200 @@ -{ - "name": "ENTINA TINA2", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "ENTINA", - "manufacturer": "ENTINA", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "ENTINA TINA2" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 100 - }, - "machine_heated_bed": { - "default_value": false - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 45 else 'grid'" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } - } +{ + "version": 2, + "name": "ENTINA TINA2", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "ENTINA", + "manufacturer": "ENTINA", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "ENTINA TINA2" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } + } } \ No newline at end of file diff --git a/resources/definitions/entina_tina2s.def.json b/resources/definitions/entina_tina2s.def.json index 0f197367fb..82dc85b36e 100644 --- a/resources/definitions/entina_tina2s.def.json +++ b/resources/definitions/entina_tina2s.def.json @@ -1,238 +1,201 @@ -{ - "name": "ENTINA TINA2S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "ENTINA", - "manufacturer": "ENTINA", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "ENTINA TINA2S" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 110 - }, - "machine_height": { - "default_value": 100 - }, - "material_bed_temperature": { - "maximum_value_warning": "60", - "maximum_value": "65" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } - } +{ + "version": 2, + "name": "ENTINA TINA2S", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "ENTINA", + "manufacturer": "ENTINA", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "machine_depth": { "default_value": 110 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "ENTINA TINA2S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "material_bed_temperature": + { + "maximum_value": "65", + "maximum_value_warning": "60" + }, + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } + } } \ No newline at end of file diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 86dfdb619f..bbc1fcd09e 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -1,432 +1,258 @@ -{ - "version": 2, - "name": "WEEDO Base", - "inherits": "fdmprinter", - "metadata": { - "author": "WEEDO", - "manufacturer": "WEEDO", - "visible": false, - "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "weedo_base_extruder_0" - }, - "has_materials": true, - "has_variants": false, - "has_machine_quality": false, - "preferred_quality_type": "draft", - "preferred_material": "generic_pla_175", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO Base" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" - }, - "material_diameter": { - "default_value": 1.75 - }, - "material_bed_temp_wait": { - "default_value": false - }, - "material_print_temp_wait": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_nozzle_tip_outer_diameter": { - "default_value": 0.8 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.8 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 0.67 - }, - "machine_min_cool_heat_time_window": { - "default_value": 1200.0 - }, - "machine_steps_per_mm_x": { - "default_value": 94 - }, - "machine_steps_per_mm_y": { - "default_value": 94 - }, - "machine_steps_per_mm_z": { - "default_value": 400 - }, - "machine_steps_per_mm_e": { - "default_value": 96 - }, - "machine_max_feedrate_x": { - "default_value": 200 - }, - "machine_max_feedrate_y": { - "default_value": 130 - }, - "machine_max_feedrate_z": { - "default_value": 10 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 3000 - }, - "machine_max_acceleration_y": { - "default_value": 3000 - }, - "machine_max_acceleration_z": { - "default_value": 120 - }, - "machine_max_acceleration_e": { - "default_value": 1600 - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_max_jerk_xy": { - "default_value": 10.0 - }, - "machine_max_jerk_z": { - "default_value": 5 - }, - "machine_max_jerk_e": { - "default_value": 5.1 - }, - "infill_line_width": { - "value": "line_width * 1.25" - }, - "initial_layer_line_width_factor": { - "default_value": 110.0 - }, - "wall_0_wipe_dist": { - "value": 0.0 - }, - "z_seam_corner": { - "default_value": "z_seam_corner_any" - }, - "skin_outline_count": { - "value": "0" - }, - "infill_sparse_density": { - "default_value": 10.0 - }, - "infill_pattern": { - "value": "'zigzag'" - }, - "infill_before_walls": { - "default_value": false - }, - "material_print_temperature": { - "maximum_value": "300" - }, - "material_print_temperature_layer_0": { - "value": "min(material_print_temperature + 10, 300)" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature" - }, - "material_final_print_temperature": { - "value": "material_print_temperature" - }, - "material_bed_temperature": { - "maximum_value_warning": "96" - }, - "material_flow": { - "default_value": 95.0 - }, - "material_flow_layer_0": { - "default_value": 95.0 - }, - "infill_material_flow": { - "value": "max(0, material_flow - 5)" - }, - "support_material_flow": { - "value": "max(0, material_flow - 5)" - }, - "speed_print": { - "default_value": 70.0 - }, - "speed_wall": { - "value": "max(5, round(speed_print / 2 - 5, 1))" - }, - "speed_wall_0": { - "value": "max(5, speed_wall - 5)" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.65, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.82, 1)" - }, - "speed_support_interface": { - "value": "round(speed_support * 0.689, 1)" - }, - "speed_prime_tower": { - "value": "speed_support" - }, - "speed_travel": { - "value": 105.0 - }, - "speed_layer_0": { - "value": 26.0 - }, - "speed_travel_layer_0": { - "value": 80.0 - }, - "skirt_brim_speed": { - "value": 26.0 - }, - "retraction_amount": { - "default_value": 3 - }, - "retraction_speed": { - "default_value": 28.0 - }, - "retraction_min_travel": { - "value": 0.8 - }, - "retraction_extrusion_window": { - "value": 1.0 - }, - "material_standby_temperature": { - "default_value": 175.0 - }, - "switch_extruder_retraction_amount": { - "value": 16.5 - }, - "switch_extruder_retraction_speeds": { - "default_value": 28.0 - }, - "retraction_combing": { - "value": "off" - }, - "retraction_hop_after_extruder_switch": { - "default_value": false - }, - "support_angle": { - "default_value": 60.0 - }, - "support_connect_zigzags": { - "default_value": false - }, - "support_z_distance": { - "default_value": 0.18 - }, - "support_interface_enable": { - "default_value": true - }, - "support_interface_density": { - "default_value": 60.0 - }, - "support_interface_height": { - "default_value": 0.8 - }, - "support_interface_pattern": { - "default_value": "lines" - }, - "adhesion_type": { - "default_value": "raft" - }, - "skirt_line_count": { - "default_value": 2 - }, - "raft_margin": { - "default_value": 8.0 - }, - "raft_airgap": { - "default_value": 0.19 - }, - "layer_0_z_overlap": { - "value": 0.09 - }, - "raft_surface_thickness": { - "value": 0.25 - }, - "raft_base_thickness": { - "value": 0.3 - }, - "raft_surface_speed": { - "value": 40.0 - }, - "raft_interface_speed": { - "value": 33.0 - }, - "raft_base_speed": { - "value": 20.0 - }, - "raft_base_fan_speed": { - "value": 0.0 - }, - "prime_tower_size": { - "default_value": 15.0 - }, - "prime_tower_min_volume": { - "default_value": 10.0 - }, - "draft_shield_dist": { - "default_value": 3 - }, - "top_skin_preshrink": { - "value": 0.0 - } - } +{ + "version": 2, + "name": "WEEDO Base", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "weedo_base_extruder_0" }, + "preferred_material": "generic_pla_175", + "preferred_quality_type": "draft" + }, + "overrides": + { + "adhesion_type": { "default_value": "raft" }, + "draft_shield_dist": { "default_value": 3 }, + "infill_before_walls": { "default_value": false }, + "infill_line_width": { "value": "line_width * 1.25" }, + "infill_material_flow": { "value": "max(0, material_flow - 5)" }, + "infill_pattern": { "value": "'zigzag'" }, + "infill_sparse_density": { "default_value": 10.0 }, + "initial_layer_line_width_factor": { "default_value": 110.0 }, + "layer_0_z_overlap": { "value": 0.09 }, + "machine_acceleration": { "default_value": 3000 }, + "machine_end_gcode": { "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "default_value": 1600 }, + "machine_max_acceleration_x": { "default_value": 3000 }, + "machine_max_acceleration_y": { "default_value": 3000 }, + "machine_max_acceleration_z": { "default_value": 120 }, + "machine_max_feedrate_e": { "default_value": 50 }, + "machine_max_feedrate_x": { "default_value": 200 }, + "machine_max_feedrate_y": { "default_value": 130 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_max_jerk_e": { "default_value": 5.1 }, + "machine_max_jerk_xy": { "default_value": 10.0 }, + "machine_max_jerk_z": { "default_value": 5 }, + "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, + "machine_name": { "default_value": "WEEDO Base" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.67 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_steps_per_mm_e": { "default_value": 96 }, + "machine_steps_per_mm_x": { "default_value": 94 }, + "machine_steps_per_mm_y": { "default_value": 94 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "material_bed_temp_wait": { "default_value": false }, + "material_bed_temperature": { "maximum_value_warning": "96" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "default_value": 95.0 }, + "material_flow_layer_0": { "default_value": 95.0 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temp_wait": { "default_value": false }, + "material_print_temperature": { "maximum_value": "300" }, + "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 10, 300)" }, + "material_standby_temperature": { "default_value": 175.0 }, + "prime_tower_min_volume": { "default_value": 10.0 }, + "prime_tower_size": { "default_value": 15.0 }, + "raft_airgap": { "default_value": 0.19 }, + "raft_base_fan_speed": { "value": 0.0 }, + "raft_base_speed": { "value": 20.0 }, + "raft_base_thickness": { "value": 0.3 }, + "raft_interface_speed": { "value": 33.0 }, + "raft_margin": { "default_value": 8.0 }, + "raft_surface_speed": { "value": 40.0 }, + "raft_surface_thickness": { "value": 0.25 }, + "retraction_amount": { "default_value": 3 }, + "retraction_combing": { "value": "off" }, + "retraction_extrusion_window": { "value": 1.0 }, + "retraction_hop_after_extruder_switch": { "default_value": false }, + "retraction_min_travel": { "value": 0.8 }, + "retraction_speed": { "default_value": 28.0 }, + "skin_outline_count": { "value": "0" }, + "skirt_brim_speed": { "value": 26.0 }, + "skirt_line_count": { "default_value": 2 }, + "speed_layer_0": { "value": 26.0 }, + "speed_prime_tower": { "value": "speed_support" }, + "speed_print": { "default_value": 70.0 }, + "speed_support": { "value": "round(speed_print * 0.82, 1)" }, + "speed_support_interface": { "value": "round(speed_support * 0.689, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.65, 1)" }, + "speed_travel": { "value": 105.0 }, + "speed_travel_layer_0": { "value": 80.0 }, + "speed_wall": { "value": "max(5, round(speed_print / 2 - 5, 1))" }, + "speed_wall_0": { "value": "max(5, speed_wall - 5)" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "default_value": 60.0 }, + "support_connect_zigzags": { "default_value": false }, + "support_interface_density": { "default_value": 60.0 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "default_value": 0.8 }, + "support_interface_pattern": { "default_value": "lines" }, + "support_material_flow": { "value": "max(0, material_flow - 5)" }, + "support_z_distance": { "default_value": 0.18 }, + "switch_extruder_retraction_amount": { "value": 16.5 }, + "switch_extruder_retraction_speeds": { "default_value": 28.0 }, + "top_skin_preshrink": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + "z_seam_corner": { "default_value": "z_seam_corner_any" } + } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index f0d5a17a09..7824aa3006 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -1,242 +1,200 @@ -{ - "name": "WEEDO TINA2", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO TINA2" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 100 - }, - "machine_heated_bed": { - "default_value": false - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 45 else 'grid'" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } - } +{ + "version": 2, + "name": "WEEDO TINA2", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEDO TINA2" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } + } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index bbf73e7cf9..5c11529854 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -1,238 +1,201 @@ -{ - "name": "WEEDO TINA2S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO TINA2S" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 110 - }, - "machine_height": { - "default_value": 100 - }, - "material_bed_temperature": { - "maximum_value_warning": "60", - "maximum_value": "65" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } - } +{ + "version": 2, + "name": "WEEDO TINA2S", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "machine_depth": { "default_value": 110 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEDO TINA2S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "material_bed_temperature": + { + "maximum_value": "65", + "maximum_value_warning": "60" + }, + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } + } } \ No newline at end of file diff --git a/resources/definitions/weefun_tina2.def.json b/resources/definitions/weefun_tina2.def.json index 0009267f0c..8177da741c 100644 --- a/resources/definitions/weefun_tina2.def.json +++ b/resources/definitions/weefun_tina2.def.json @@ -1,242 +1,200 @@ -{ - "name": "WEEFUN TINA2", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEFUN", - "manufacturer": "WEEFUN", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEFUN TINA2" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 100 - }, - "machine_heated_bed": { - "default_value": false - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 45 else 'grid'" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } - } +{ + "version": 2, + "name": "WEEFUN TINA2", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEFUN TINA2" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } + } } \ No newline at end of file diff --git a/resources/definitions/weefun_tina2s.def.json b/resources/definitions/weefun_tina2s.def.json index 54299a261d..fc0720ade0 100644 --- a/resources/definitions/weefun_tina2s.def.json +++ b/resources/definitions/weefun_tina2s.def.json @@ -1,238 +1,201 @@ -{ - "name": "WEEFUN TINA2S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEFUN", - "manufacturer": "WEEFUN", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla" - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEFUN TINA2S" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 110 - }, - "machine_height": { - "default_value": 100 - }, - "material_bed_temperature": { - "maximum_value_warning": "60", - "maximum_value": "65" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } - } +{ + "version": 2, + "name": "WEEFUN TINA2S", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "machine_depth": { "default_value": 110 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEFUN TINA2S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "material_bed_temperature": + { + "maximum_value": "65", + "maximum_value_warning": "60" + }, + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } + } } \ No newline at end of file diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json index 0cb088acdd..82cf9d9541 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From 2876a0e922d4a8603260de1ff1b909d9ccbdfcaf Mon Sep 17 00:00:00 2001 From: rburema Date: Tue, 1 Aug 2023 11:54:38 +0000 Subject: [PATCH 54/74] Applied printer-linter format --- resources/variants/voron/voron_trident_250_0.25.inst.cfg | 1 + resources/variants/voron/voron_trident_250_0.50.inst.cfg | 1 + resources/variants/voron/voron_trident_300_0.25.inst.cfg | 1 + resources/variants/voron/voron_trident_300_0.50.inst.cfg | 1 + resources/variants/voron/voron_trident_350_0.25.inst.cfg | 1 + resources/variants/voron/voron_trident_350_0.50.inst.cfg | 1 + 6 files changed, 6 insertions(+) diff --git a/resources/variants/voron/voron_trident_250_0.25.inst.cfg b/resources/variants/voron/voron_trident_250_0.25.inst.cfg index e84dc74b16..2ba2351c56 100644 --- a/resources/variants/voron/voron_trident_250_0.25.inst.cfg +++ b/resources/variants/voron/voron_trident_250_0.25.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron/voron_trident_250_0.50.inst.cfg b/resources/variants/voron/voron_trident_250_0.50.inst.cfg index 61615f92b7..deae0b748c 100644 --- a/resources/variants/voron/voron_trident_250_0.50.inst.cfg +++ b/resources/variants/voron/voron_trident_250_0.50.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron/voron_trident_300_0.25.inst.cfg b/resources/variants/voron/voron_trident_300_0.25.inst.cfg index 4787f681d7..99b00d7683 100644 --- a/resources/variants/voron/voron_trident_300_0.25.inst.cfg +++ b/resources/variants/voron/voron_trident_300_0.25.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron/voron_trident_300_0.50.inst.cfg b/resources/variants/voron/voron_trident_300_0.50.inst.cfg index a6c001b55a..5a9bde2f79 100644 --- a/resources/variants/voron/voron_trident_300_0.50.inst.cfg +++ b/resources/variants/voron/voron_trident_300_0.50.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron/voron_trident_350_0.25.inst.cfg b/resources/variants/voron/voron_trident_350_0.25.inst.cfg index 1817f39402..8d124cca03 100644 --- a/resources/variants/voron/voron_trident_350_0.25.inst.cfg +++ b/resources/variants/voron/voron_trident_350_0.25.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron/voron_trident_350_0.50.inst.cfg b/resources/variants/voron/voron_trident_350_0.50.inst.cfg index e67ee99b13..896a12aee7 100644 --- a/resources/variants/voron/voron_trident_350_0.50.inst.cfg +++ b/resources/variants/voron/voron_trident_350_0.50.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.5 + From 60dba90cb519c865242cdd13841d1787331fbd90 Mon Sep 17 00:00:00 2001 From: MariMakes Date: Tue, 1 Aug 2023 13:27:47 +0000 Subject: [PATCH 55/74] Applied printer-linter format --- .../definitions/creality_ender5s1.def.json | 37 ++++++++++--------- .../creality/creality_ender5s1_0.2.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.3.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.4.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.5.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.6.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.8.inst.cfg | 5 ++- .../creality/creality_ender5s1_1.0.inst.cfg | 5 ++- 8 files changed, 41 insertions(+), 31 deletions(-) diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json index 6deeba5c6f..32dbf75b02 100644 --- a/resources/definitions/creality_ender5s1.def.json +++ b/resources/definitions/creality_ender5s1.def.json @@ -1,15 +1,21 @@ { - "name": "Creality Ender-5 S1", "version": 2, + "name": "Creality Ender-5 S1", "inherits": "creality_base", - "metadata": { - "quality_definition": "creality_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "creality_base" }, - "overrides": { + "overrides": + { + "build_volume_temperature": { "value": 195 }, + "cool_min_layer_time": { "value": 5 }, "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 225 }, - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-26, 34], [-26, -32], @@ -19,16 +25,13 @@ }, "machine_height": { "default_value": 305 }, "machine_name": { "default_value": "Creality Ender-5 S1" }, - "machine_width": { "default_value": 225 }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, - "build_volume_temperature": { "value": 195 }, - "material_bed_temperature": { "value": 60 }, - "retraction_amount": { "value": 2}, - "z_seam_type": { "value": "'sharpest_corner'" }, - "support_z_distance": { "value": 0.25 }, - "cool_min_layer_time": { "value": 5 }, - "wall_thickness": {"value": "line_width * 3" }, - "retraction_speed": { "value": 45 }, - "speed_print": { "value": 80.0 } + "machine_width": { "default_value": 225 }, + "material_bed_temperature": { "value": 60 }, + "retraction_amount": { "value": 2 }, + "retraction_speed": { "value": 45 }, + "speed_print": { "value": 80.0 }, + "support_z_distance": { "value": 0.25 }, + "wall_thickness": { "value": "line_width * 3" }, + "z_seam_type": { "value": "'sharpest_corner'" } } } \ No newline at end of file diff --git a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg index b5969358e6..bb3e5312ea 100644 --- a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.2mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg index c8314bda4d..f7aa3350bc 100644 --- a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.3mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg index 1b519ad121..6e38f503fc 100644 --- a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.4mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg index 6bc413f30b..cb2b684542 100644 --- a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.5mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg index f235650911..2c2d0480ff 100644 --- a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.6mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg index 52b16eea23..2e95f8e3d0 100644 --- a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.8mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg index 06c558c42b..48fba7a715 100644 --- a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 1.0mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + From 1442031e28dde91ba12bf2a8b67b1f41154cfbc2 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 2 Aug 2023 09:24:42 +0200 Subject: [PATCH 56/74] Review comments fixed CURA-10770 --- conanfile.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/conanfile.py b/conanfile.py index f028ccbe9e..8c86bdb60f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -139,7 +139,7 @@ class CuraConan(ConanFile): return "None" def _generate_about_versions(self, location): - with open(os.path.join(self.recipe_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: + with open(os.path.join(self.source_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: cura_version_py = Template(f.read()) conan_installs = [] @@ -150,14 +150,17 @@ class CuraConan(ConanFile): conan_installs.append([dependency.ref.name,dependency.ref.version]) #list of python installs - python_ins_cmd = f""" python -c "import pkg_resources; import os; [open(os.path.join("'"{self.recipe_folder}"'", "'"info.txt"'"), "'"a"'").write(s.key+"'","'"+ s.version+"'";"'") for s in pkg_resources.working_set]" """ - self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=True) - with open(os.path.join(self.recipe_folder, "info.txt"), "r") as f: - packages = f.read() - package = packages.split(";") - for pack in package: - python_installs.append(pack.split(",")) - os.remove(os.path.join(self.recipe_folder, "info.txt")) + outer = '"' if self.settings.os == "Windows" else "'" + inner = "'" if self.settings.os == "Windows" else '"' + python_ins_cmd = 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}" + from six import StringIO + buffer = StringIO() + self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=buffer) + + packages = str(buffer.getvalue()).split("-----------------\n") + package = packages[1].strip('\r\n').split(";") + for pack in package: + python_installs.append(pack.split(",")) with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f: f.write(cura_version_py.render( @@ -354,7 +357,7 @@ class CuraConan(ConanFile): pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0]) pot.generate() - self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs")) + self._generate_about_versions(os.path.join(self.source_folder, "resources","qml", "Dialogs")) def build(self): if self.options.devtools: @@ -365,7 +368,6 @@ class CuraConan(ConanFile): 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 - print("we are here /n") self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def imports(self): @@ -471,6 +473,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV 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") + self._generate_about_versions(os.path.join(self.source_folder, "resources", "qml", "Dialogs")) + def package(self): copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0])) copy(self, "*", src = os.path.join(self.source_folder, "cura"), dst = os.path.join(self.package_folder, self.cpp.package.libdirs[0])) From a6780b541726dd5eb479583cbd267751afd3ac08 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 2 Aug 2023 10:45:02 +0200 Subject: [PATCH 57/74] Review comments fixed CURA-10770 --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 8c86bdb60f..1f7b1c6620 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,7 +21,7 @@ class CuraConan(ConanFile): description = "3D printer / slicing GUI built on top of the Uranium framework" topics = ("conan", "python", "pyqt6", "qt", "qml", "3d-printing", "slicer") build_policy = "missing" - exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja" + exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja", "AboutDialogVersionsList.qml.jinja" settings = "os", "compiler", "build_type", "arch" # FIXME: Remove specific branch once merged to main @@ -139,7 +139,7 @@ class CuraConan(ConanFile): return "None" def _generate_about_versions(self, location): - with open(os.path.join(self.source_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: + with open(os.path.join(self.recipe_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: cura_version_py = Template(f.read()) conan_installs = [] From 9c7f14d00da16bc35f352816383265e77b8b7995 Mon Sep 17 00:00:00 2001 From: Mariska <40423138+MariMakes@users.noreply.github.com> Date: Wed, 2 Aug 2023 16:21:19 +0200 Subject: [PATCH 58/74] Revert " Creat new machine named Renkforce 10+" --- .../definitions/renkforce_pro10plus.def.json | 18 ------------------ .../renkforce/renkforce_pro10plus_0.4.inst.cfg | 13 ------------- .../renkforce/renkforce_pro10plus_0.6.inst.cfg | 13 ------------- .../renkforce/renkforce_pro10plus_0.8.inst.cfg | 13 ------------- .../renkforce/renkforce_pro10plus_1.0.inst.cfg | 13 ------------- 5 files changed, 70 deletions(-) delete mode 100644 resources/definitions/renkforce_pro10plus.def.json delete mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg delete mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg delete mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg delete mode 100644 resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg diff --git a/resources/definitions/renkforce_pro10plus.def.json b/resources/definitions/renkforce_pro10plus.def.json deleted file mode 100644 index 414d59ec0b..0000000000 --- a/resources/definitions/renkforce_pro10plus.def.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 2, - "name": "Renkforce Pro 10+", - "inherits": "goofoo_near", - "metadata": - { - "visible": true, - "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", - "manufacturer": "Renkforce" - }, - "overrides": - { - "machine_depth": { "default_value": 360 }, - "machine_height": { "default_value": 400 }, - "machine_name": { "default_value": "Renkforce Pro 10+" }, - "machine_width": { "default_value": 360 } - } -} \ No newline at end of file diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg deleted file mode 100644 index aea6acc5e5..0000000000 --- a/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = renkforce_pro10plus -name = 0.4mm Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.4 - diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg deleted file mode 100644 index 228ea98425..0000000000 --- a/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = renkforce_pro10plus -name = 0.6mm Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.6 - diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg deleted file mode 100644 index c7b037a84d..0000000000 --- a/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = renkforce_pro10plus -name = 0.8mm Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.8 - diff --git a/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg deleted file mode 100644 index 2c1e6194ed..0000000000 --- a/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = renkforce_pro10plus -name = 1.0mm Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 1.0 - From f07faac4223d3d15d36b486e1fce18a84ea55fb0 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 4 Aug 2023 13:24:06 +0200 Subject: [PATCH 59/74] Add copy, paste, cut functionality CURA-7913 --- cura/CuraActions.py | 70 +++++++++++++++++++++++++++-- resources/qml/Actions.qml | 33 +++++++++++++- resources/qml/Menus/ContextMenu.qml | 2 + 3 files changed, 101 insertions(+), 4 deletions(-) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 193803325f..aef26c7082 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -1,15 +1,20 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2023 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. -from PyQt6.QtCore import QObject, QUrl -from PyQt6.QtGui import QDesktopServices from typing import List, cast +from PyQt6.QtCore import QObject, QUrl, QMimeData +from PyQt6.QtGui import QDesktopServices +from PyQt6.QtWidgets import QApplication + +import pySavitar as Savitar + from UM.Event import CallFunctionEvent from UM.FlameProfiler import pyqtSlot from UM.Math.Vector import Vector from UM.Scene.Selection import Selection from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator +from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Operations.GroupedOperation import GroupedOperation from UM.Operations.RemoveSceneNodeOperation import RemoveSceneNodeOperation from UM.Operations.TranslateOperation import TranslateOperation @@ -19,6 +24,7 @@ from cura.Operations.SetParentOperation import SetParentOperation from cura.MultiplyObjectsJob import MultiplyObjectsJob from cura.Settings.SetObjectExtruderOperation import SetObjectExtruderOperation from cura.Settings.ExtruderManager import ExtruderManager +from cura.Arranging.Nest2DArrange import createGroupOperationForArrange from cura.Operations.SetBuildPlateNumberOperation import SetBuildPlateNumberOperation @@ -181,5 +187,63 @@ class CuraActions(QObject): Selection.clear() + @pyqtSlot() + def cut(self) -> None: + self.copy() + self.deleteSelection() + + @pyqtSlot() + def copy(self) -> None: + # Convert all selected objects to a Savitar scene + savitar_scene = Savitar.Scene() + mesh_writer = cura.CuraApplication.CuraApplication.getInstance().getMeshFileHandler().getWriter("3MFWriter") + for scene_node in Selection.getAllSelectedObjects(): + savitar_node = mesh_writer._convertUMNodeToSavitarNode(scene_node) + savitar_scene.addSceneNode(savitar_node) + + # Convert the scene to a string + parser = Savitar.ThreeMFParser() + scene_string = parser.sceneToString(savitar_scene) + + # Copy the scene to the clipboard + QApplication.clipboard().setText(scene_string) + + @pyqtSlot() + def paste(self) -> None: + application = cura.CuraApplication.CuraApplication.getInstance() + + # Parse the scene from the clipboard + scene_string = QApplication.clipboard().text() + parser = Savitar.ThreeMFParser() + scene = parser.parse(scene_string) + + # Convert the scene to scene nodes + nodes = [] + mesh_reader = application.getMeshFileHandler().getReaderForFile(".3mf") + for savitar_node in scene.getSceneNodes(): + scene_node = mesh_reader._convertSavitarNodeToUMNode(savitar_node, "file_name") + if scene_node is None: + continue + nodes.append(scene_node) + + # Find all fixed nodes, these are the nodes that should be avoided when arranging + fixed_nodes = [] + root = application.getController().getScene().getRoot() + for node in DepthFirstIterator(root): + # Only count sliceable objects + if node.callDecoration("isSliceable"): + fixed_nodes.append(node) + # Add the new nodes to the scene, and arrange them + group_operation, not_fit_count = createGroupOperationForArrange(nodes, application.getBuildVolume(), + fixed_nodes, factor=10000, + add_new_nodes_in_scene=True) + group_operation.push() + + # deselect currently selected nodes, and select the new nodes + for node in Selection.getAllSelectedObjects(): + Selection.remove(node) + for node in nodes: + Selection.add(node) + def _openUrl(self, url: QUrl) -> None: QDesktopServices.openUrl(url) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 6cd75b51ac..9cd72026b2 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker +// Copyright (c) 2023 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. pragma Singleton @@ -71,6 +71,10 @@ Item property alias browsePackages: browsePackagesAction + property alias paste: pasteAction + property alias copy: copyAction + property alias cut: cutAction + UM.I18nCatalog{id: catalog; name: "cura"} @@ -309,6 +313,33 @@ Item onTriggered: CuraActions.centerSelection() } + Action + { + id: copyAction + text: catalog.i18nc("@action:inmenu menubar:edit", "Copy to clipboard") + onTriggered: CuraActions.copy() + enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection + shortcut: StandardKey.Copy + } + + Action + { + id: pasteAction + text: catalog.i18nc("@action:inmenu menubar:edit", "Paste from clipboard") + onTriggered: CuraActions.paste() + enabled: UM.Controller.toolsEnabled + shortcut: StandardKey.Paste + } + + Action + { + id: cutAction + text: catalog.i18nc("@action:inmenu menubar:edit", "Cut") + onTriggered: CuraActions.cut() + enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection + shortcut: StandardKey.Cut + } + Action { id: multiplySelectionAction diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml index f7029939cd..d85703451f 100644 --- a/resources/qml/Menus/ContextMenu.qml +++ b/resources/qml/Menus/ContextMenu.qml @@ -19,6 +19,8 @@ Cura.Menu // Selection-related actions. Cura.MenuItem { action: Cura.Actions.centerSelection; } Cura.MenuItem { action: Cura.Actions.deleteSelection; } + Cura.MenuItem { action: Cura.Actions.copy; } + Cura.MenuItem { action: Cura.Actions.paste; } Cura.MenuItem { action: Cura.Actions.multiplySelection; } // Extruder selection - only visible if there is more than 1 extruder From f9981d3df18005a255dc88fb2d4b05179116449f Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 4 Aug 2023 14:14:08 +0200 Subject: [PATCH 60/74] Clicking Show all connected printers shows all cloud printers offline and online CURA-10770 --- cura/Machines/Models/MachineListModel.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py index 74ef7ae7b4..69a3c53d03 100644 --- a/cura/Machines/Models/MachineListModel.py +++ b/cura/Machines/Models/MachineListModel.py @@ -110,22 +110,22 @@ class MachineListModel(ListModel): for abstract_machine in abstract_machine_stacks: definition_id = abstract_machine.definition.getId() - online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True) + connected_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = False) - online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks)) - online_machine_stacks.sort(key=lambda machine: machine.getName().upper()) + connected_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), connected_machine_stacks)) + connected_machine_stacks.sort(key=lambda machine: machine.getName().upper()) if abstract_machine in other_machine_stacks: other_machine_stacks.remove(abstract_machine) - if abstract_machine in online_machine_stacks: - online_machine_stacks.remove(abstract_machine) + if abstract_machine in connected_machine_stacks: + connected_machine_stacks.remove(abstract_machine) # Create a list item for abstract machine - self.addItem(abstract_machine, True, len(online_machine_stacks)) + self.addItem(abstract_machine, True, len(connected_machine_stacks)) # Create list of machines that are children of the abstract machine - for stack in online_machine_stacks: + for stack in connected_machine_stacks: if self._show_cloud_printers: self.addItem(stack, True) # Remove this machine from the other stack list From fc9a2280623003f109de53bd49e9477b17411d95 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 4 Aug 2023 14:24:38 +0200 Subject: [PATCH 61/74] Deleting Shake detection CURA-10770 --- resources/qml/Dialogs/AboutDialog.qml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index 8f3723da87..b0cd9d2ad3 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -21,13 +21,6 @@ UM.Dialog backgroundColor: UM.Theme.getColor("main_background") - property real dialogX: base.x - property real dialogY: base.y - property int shakeDetected: shakeDetector.shakeIsdetected - property UM.ShakeDetector shakeDetector: UM.ShakeDetector - { - position: Qt.point(base.x, base.y) - } Rectangle { @@ -203,11 +196,6 @@ UM.Dialog } - onShakeDetectedChanged: - { - projectsList.visible = !projectsList.visible; - projectBuildInfoList.visible = !projectBuildInfoList.visible; - } onVisibleChanged: { From b1100cb4c586dbfe952576a914d626e79d89c63a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 4 Aug 2023 15:53:52 +0200 Subject: [PATCH 62/74] Relevant comment specifically requests not to call closeApplication in most cases. done as a 5 min fix. --- plugins/Marketplace/resources/qml/Marketplace.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 97ba2303e9..8028b89e02 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -280,7 +280,7 @@ Window onClicked: { marketplaceDialog.hide(); - CuraApplication.closeApplication(); + CuraApplication.checkAndExitApplication(); } } } From ce82033f6ac6e2f1ef5dd946d4273a91d572efff Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 7 Aug 2023 08:21:03 +0200 Subject: [PATCH 63/74] exclude the correct conan versions --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 520e7a693f..7157a679ac 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,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.60.0" +required_conan_version = ">=1.54 <=1.56.0 || >=1.58.0 <2.0.0" class CuraConan(ConanFile): From 476f92bd1c3d1812e40a252a30fad283aa3e1dc6 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 7 Aug 2023 12:40:05 +0200 Subject: [PATCH 64/74] Brim distance is not "settable_per_mesh" A new feature request needed to make this work. CURA-10770 --- 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 d1c532a32d..fca9e69310 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5921,7 +5921,7 @@ "maximum_value_warning": "skirt_brim_line_width", "enabled": "resolveOrValue('adhesion_type') == 'brim'", "limit_to_extruder": "skirt_brim_extruder_nr", - "settable_per_mesh": true, + "settable_per_mesh": false, "settable_per_extruder": true }, "brim_replaces_support": From f8b3fb3d67890b5ee3d2aeac945c9ff136cf62bf Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 7 Aug 2023 13:41:01 +0200 Subject: [PATCH 65/74] Move parse/write responsibility of copy/paste to 3MFWriter/3MFReader CURA-7913 --- cura/CuraActions.py | 27 ++++++--------------------- plugins/3MFReader/ThreeMFReader.py | 29 +++++++++++++++++++++++------ plugins/3MFWriter/ThreeMFWriter.py | 26 +++++++++++++++++++------- 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index aef26c7082..338c18a6b9 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -7,8 +7,6 @@ from PyQt6.QtCore import QObject, QUrl, QMimeData from PyQt6.QtGui import QDesktopServices from PyQt6.QtWidgets import QApplication -import pySavitar as Savitar - from UM.Event import CallFunctionEvent from UM.FlameProfiler import pyqtSlot from UM.Math.Vector import Vector @@ -194,18 +192,13 @@ class CuraActions(QObject): @pyqtSlot() def copy(self) -> None: - # Convert all selected objects to a Savitar scene - savitar_scene = Savitar.Scene() mesh_writer = cura.CuraApplication.CuraApplication.getInstance().getMeshFileHandler().getWriter("3MFWriter") - for scene_node in Selection.getAllSelectedObjects(): - savitar_node = mesh_writer._convertUMNodeToSavitarNode(scene_node) - savitar_scene.addSceneNode(savitar_node) - # Convert the scene to a string - parser = Savitar.ThreeMFParser() - scene_string = parser.sceneToString(savitar_scene) - - # Copy the scene to the clipboard + # Get the selected nodes + selected_objects = Selection.getAllSelectedObjects() + # Serialize the nodes to a string + scene_string = mesh_writer.sceneNodesToString(selected_objects) + # Put the string on the clipboard QApplication.clipboard().setText(scene_string) @pyqtSlot() @@ -214,17 +207,9 @@ class CuraActions(QObject): # Parse the scene from the clipboard scene_string = QApplication.clipboard().text() - parser = Savitar.ThreeMFParser() - scene = parser.parse(scene_string) - # Convert the scene to scene nodes - nodes = [] mesh_reader = application.getMeshFileHandler().getReaderForFile(".3mf") - for savitar_node in scene.getSceneNodes(): - scene_node = mesh_reader._convertSavitarNodeToUMNode(savitar_node, "file_name") - if scene_node is None: - continue - nodes.append(scene_node) + nodes = mesh_reader.stringToSceneNodes(scene_string) # Find all fixed nodes, these are the nodes that should be avoided when arranging fixed_nodes = [] diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index e8b6a54e46..e06e9dcf4e 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -56,7 +56,8 @@ class ThreeMFReader(MeshReader): def emptyFileHintSet(self) -> bool: return self._empty_project - def _createMatrixFromTransformationString(self, transformation: str) -> Matrix: + @staticmethod + def _createMatrixFromTransformationString(transformation: str) -> Matrix: if transformation == "": return Matrix() @@ -90,7 +91,8 @@ class ThreeMFReader(MeshReader): return temp_mat - def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]: + @staticmethod + def _convertSavitarNodeToUMNode(savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]: """Convenience function that converts a SceneNode object (as obtained from libSavitar) to a scene node. :returns: Scene node. @@ -119,7 +121,7 @@ class ThreeMFReader(MeshReader): pass um_node.setName(node_name) um_node.setId(node_id) - transformation = self._createMatrixFromTransformationString(savitar_node.getTransformation()) + transformation = ThreeMFReader._createMatrixFromTransformationString(savitar_node.getTransformation()) um_node.setTransformation(transformation) mesh_builder = MeshBuilder() @@ -138,7 +140,7 @@ class ThreeMFReader(MeshReader): um_node.setMeshData(mesh_data) for child in savitar_node.getChildren(): - child_node = self._convertSavitarNodeToUMNode(child) + child_node = ThreeMFReader._convertSavitarNodeToUMNode(child) if child_node: um_node.addChild(child_node) @@ -214,7 +216,7 @@ class ThreeMFReader(MeshReader): CuraApplication.getInstance().getController().getScene().setMetaDataEntry(key, value) for node in scene_3mf.getSceneNodes(): - um_node = self._convertSavitarNodeToUMNode(node, file_name) + um_node = ThreeMFReader._convertSavitarNodeToUMNode(node, file_name) if um_node is None: continue @@ -300,8 +302,23 @@ class ThreeMFReader(MeshReader): if unit is None: unit = "millimeter" elif unit not in conversion_to_mm: - Logger.log("w", "Unrecognised unit {unit} used. Assuming mm instead.".format(unit = unit)) + Logger.log("w", "Unrecognised unit {unit} used. Assuming mm instead.".format(unit=unit)) unit = "millimeter" scale = conversion_to_mm[unit] return Vector(scale, scale, scale) + + @staticmethod + def stringToSceneNodes(scene_string: str) -> List[SceneNode]: + parser = Savitar.ThreeMFParser() + scene = parser.parse(scene_string) + + # Convert the scene to scene nodes + nodes = [] + for savitar_node in scene.getSceneNodes(): + scene_node = ThreeMFReader._convertSavitarNodeToUMNode(savitar_node, "file_name") + if scene_node is None: + continue + nodes.append(scene_node) + + return nodes diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 57c667145e..3f6fef7201 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -55,11 +55,12 @@ class ThreeMFWriter(MeshWriter): "cura": "http://software.ultimaker.com/xml/cura/3mf/2015/10" } - self._unit_matrix_string = self._convertMatrixToString(Matrix()) + self._unit_matrix_string = ThreeMFWriter._convertMatrixToString(Matrix()) self._archive: Optional[zipfile.ZipFile] = None self._store_archive = False - def _convertMatrixToString(self, matrix): + @staticmethod + def _convertMatrixToString(matrix): result = "" result += str(matrix._data[0, 0]) + " " result += str(matrix._data[1, 0]) + " " @@ -83,7 +84,8 @@ class ThreeMFWriter(MeshWriter): """ self._store_archive = store_archive - def _convertUMNodeToSavitarNode(self, um_node, transformation = Matrix()): + @staticmethod + def _convertUMNodeToSavitarNode(um_node, transformation=Matrix()): """Convenience function that converts an Uranium SceneNode object to a SavitarSceneNode :returns: Uranium Scene node. @@ -100,7 +102,7 @@ class ThreeMFWriter(MeshWriter): node_matrix = um_node.getLocalTransformation() - matrix_string = self._convertMatrixToString(node_matrix.preMultiply(transformation)) + matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix.preMultiply(transformation)) savitar_node.setTransformation(matrix_string) mesh_data = um_node.getMeshData() @@ -133,7 +135,7 @@ class ThreeMFWriter(MeshWriter): # only save the nodes on the active build plate if child_node.callDecoration("getBuildPlateNumber") != active_build_plate_nr: continue - savitar_child_node = self._convertUMNodeToSavitarNode(child_node) + savitar_child_node = ThreeMFWriter._convertUMNodeToSavitarNode(child_node) if savitar_child_node is not None: savitar_node.addChild(savitar_child_node) @@ -221,7 +223,7 @@ class ThreeMFWriter(MeshWriter): for node in nodes: if node == root_node: for root_child in node.getChildren(): - savitar_node = self._convertUMNodeToSavitarNode(root_child, transformation_matrix) + savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(root_child, transformation_matrix) if savitar_node: savitar_scene.addSceneNode(savitar_node) else: @@ -303,9 +305,19 @@ class ThreeMFWriter(MeshWriter): Logger.log("w", "Can't create snapshot when renderer not initialized.") return None try: - snapshot = Snapshot.snapshot(width = 300, height = 300) + snapshot = Snapshot.snapshot(width=300, height=300) except: Logger.logException("w", "Failed to create snapshot image") return None return snapshot + + @staticmethod + def sceneNodesToString(scene_nodes: [SceneNode]) -> str: + savitar_scene = Savitar.Scene() + for scene_node in scene_nodes: + savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(scene_node) + savitar_scene.addSceneNode(savitar_node) + parser = Savitar.ThreeMFParser() + scene_string = parser.sceneToString(savitar_scene) + return scene_string From c393d915d7e85e7437846475d416ead9c3455c0d Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 8 Aug 2023 12:17:08 +0200 Subject: [PATCH 66/74] Disable copy paste when either 3mf reader or writer is disabled CURA-7913 --- cura/CuraActions.py | 8 +++++++- resources/qml/Actions.qml | 13 +++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 338c18a6b9..2f62944caa 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -193,6 +193,9 @@ class CuraActions(QObject): @pyqtSlot() def copy(self) -> None: mesh_writer = cura.CuraApplication.CuraApplication.getInstance().getMeshFileHandler().getWriter("3MFWriter") + if not mesh_writer: + Logger.log("e", "No 3MF writer found, unable to copy.") + return # Get the selected nodes selected_objects = Selection.getAllSelectedObjects() @@ -204,11 +207,14 @@ class CuraActions(QObject): @pyqtSlot() def paste(self) -> None: application = cura.CuraApplication.CuraApplication.getInstance() + mesh_reader = application.getMeshFileHandler().getReaderForFile(".3mf") + if not mesh_reader: + Logger.log("e", "No 3MF reader found, unable to paste.") + return # Parse the scene from the clipboard scene_string = QApplication.clipboard().text() - mesh_reader = application.getMeshFileHandler().getReaderForFile(".3mf") nodes = mesh_reader.stringToSceneNodes(scene_string) # Find all fixed nodes, these are the nodes that should be avoided when arranging diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 9cd72026b2..3b75c7699e 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -6,7 +6,7 @@ pragma Singleton import QtQuick 2.10 import QtQuick.Controls 2.4 import UM 1.1 as UM -import Cura 1.0 as Cura +import Cura 1.5 as Cura Item { @@ -75,6 +75,11 @@ Item property alias copy: copyAction property alias cut: cutAction + readonly property bool copy_paste_enabled: { + const all_enabled_packages = CuraApplication.getPackageManager().allEnabledPackages; + return all_enabled_packages.includes("3MFReader") && all_enabled_packages.includes("3MFWriter"); + } + UM.I18nCatalog{id: catalog; name: "cura"} @@ -318,7 +323,7 @@ Item id: copyAction text: catalog.i18nc("@action:inmenu menubar:edit", "Copy to clipboard") onTriggered: CuraActions.copy() - enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection + enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection && copy_paste_enabled shortcut: StandardKey.Copy } @@ -327,7 +332,7 @@ Item id: pasteAction text: catalog.i18nc("@action:inmenu menubar:edit", "Paste from clipboard") onTriggered: CuraActions.paste() - enabled: UM.Controller.toolsEnabled + enabled: UM.Controller.toolsEnabled && copy_paste_enabled shortcut: StandardKey.Paste } @@ -336,7 +341,7 @@ Item id: cutAction text: catalog.i18nc("@action:inmenu menubar:edit", "Cut") onTriggered: CuraActions.cut() - enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection + enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection && copy_paste_enabled shortcut: StandardKey.Cut } From 511f05c392648c93c1840fac3b47b5dd70706558 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 8 Aug 2023 12:26:44 +0200 Subject: [PATCH 67/74] Don't arrange in paste when no objects were present in the clipboard CURA-7913 --- cura/CuraActions.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 2f62944caa..6c2d3f4cb8 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -217,6 +217,10 @@ class CuraActions(QObject): nodes = mesh_reader.stringToSceneNodes(scene_string) + if not nodes: + # Nothing to paste + return + # Find all fixed nodes, these are the nodes that should be avoided when arranging fixed_nodes = [] root = application.getController().getScene().getRoot() From fd97dd5d0c7303fc455581cb08dd406f77cd868a Mon Sep 17 00:00:00 2001 From: jellespijker Date: Tue, 8 Aug 2023 11:25:29 +0000 Subject: [PATCH 68/74] Applied printer-linter format --- resources/definitions/anycubic_kobra_plus.def.json | 5 ++--- .../anycubic_kobra_plus_pla.inst.cfg | 13 +++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/definitions/anycubic_kobra_plus.def.json b/resources/definitions/anycubic_kobra_plus.def.json index 5d41a5ef33..85b2ac15a9 100644 --- a/resources/definitions/anycubic_kobra_plus.def.json +++ b/resources/definitions/anycubic_kobra_plus.def.json @@ -18,13 +18,12 @@ "overrides": { "machine_depth": { "default_value": 302 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM355 S0; led off" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 352 }, "machine_name": { "default_value": "Anycubic Kobra Plus" }, "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nM355 S1; Turn LED on\n; Add Custom purge lines\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X1.0 Y30 Z0.3 F5000.0 ; Move to start position\nG1 X1.0 Y100.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X1.3 Y100.0 Z0.3 F5000.0 ; Move to side a little\nG1 X1.3 Y30 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line\nG1 Z5.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End custom purge lines" }, - "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM355 S0; led off" }, "machine_width": { "default_value": 302 } } -} - +} \ No newline at end of file diff --git a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg index 02bd9edb5e..4a3a5817cf 100644 --- a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg +++ b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg @@ -11,17 +11,18 @@ type = quality weight = 0 [values] +infill_pattern = cubic layer_height = 0.2 layer_height_0 = 0.2 -infill_pattern = cubic -retraction_hop = 0.1 +material_final_print_temperature = 195 +material_print_temperature = 195 retraction_combing = off +retraction_hop = 0.1 retraction_hop_enabled = True retraction_hop_only_when_collides = True -speed_print = 80 speed_infill = 40 -speed_wall_x = 60 speed_layer_0 = 20 +speed_print = 80 +speed_wall_x = 60 wall_thickness = 1.2 -material_print_temperature = 195 -material_final_print_temperature = 195 + From 63bc3cc996f7275330a9afb920b5e268e3f4773a Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 8 Aug 2023 13:29:10 +0200 Subject: [PATCH 69/74] Renamed pla quality to normal Contributes CURA-10885 --- resources/definitions/anycubic_kobra_plus.def.json | 2 +- ...ra_plus_pla.inst.cfg => anycubic_kobra_plus_normal.inst.cfg} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename resources/quality/anycubic_kobra_plus/{anycubic_kobra_plus_pla.inst.cfg => anycubic_kobra_plus_normal.inst.cfg} (95%) diff --git a/resources/definitions/anycubic_kobra_plus.def.json b/resources/definitions/anycubic_kobra_plus.def.json index 85b2ac15a9..944398711f 100644 --- a/resources/definitions/anycubic_kobra_plus.def.json +++ b/resources/definitions/anycubic_kobra_plus.def.json @@ -12,7 +12,7 @@ "has_materials": true, "machine_extruder_trains": { "0": "anycubic_kobra_plus_extruder_0" }, "preferred_material": "generic_pla", - "preferred_quality_type": "pla", + "preferred_quality_type": "normal", "quality_definition": "anycubic_kobra_plus" }, "overrides": diff --git a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_normal.inst.cfg similarity index 95% rename from resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg rename to resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_normal.inst.cfg index 4a3a5817cf..47983fe3b1 100644 --- a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg +++ b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_normal.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = pla +quality_type = normal setting_version = 22 type = quality weight = 0 From 64a77440daee0a53341f8e8a532684051dba02b0 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 8 Aug 2023 13:40:51 +0200 Subject: [PATCH 70/74] from deploy field. CURA-10770 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index d4f365c7a4..7a4e8174f9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -473,7 +473,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV 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") - self._generate_about_versions(os.path.join(self.source_folder, "resources", "qml", "Dialogs")) + self._generate_about_versions(os.path.join(self._site_packages, "resources", "qml", "Dialogs")) 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 f2a1830ad99c7d5ccadac37e795dfe618481f6bb Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 8 Aug 2023 15:05:53 +0200 Subject: [PATCH 71/74] testing for build CURA-10770 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 7a4e8174f9..77cecf1134 100644 --- a/conanfile.py +++ b/conanfile.py @@ -466,6 +466,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV 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._generate_about_versions(str(self._share_dir.joinpath("cura", "resources", "qml", "Dialogs"))) entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self._base_dir, @@ -473,7 +474,6 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV 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") - self._generate_about_versions(os.path.join(self._site_packages, "resources", "qml", "Dialogs")) 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 415d2481d359a7f62bd6a67e316fbb1657d3b56c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 9 Aug 2023 23:44:01 +0200 Subject: [PATCH 72/74] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c40ead2baa..94187fdff8 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![Badge Test]][Test]    [![Badge Conan]][Conan]    - +[![Badge Downloads]][Downloads]

@@ -84,6 +84,7 @@ [Badge Conan]: https://img.shields.io/github/workflow/status/Ultimaker/Cura/conan-package?style=for-the-badge&logoColor=white&labelColor=6185aa&color=4c6987&logo=Conan&label=Conan%20Package [Badge Test]: https://img.shields.io/github/workflow/status/Ultimaker/Cura/unit-test?style=for-the-badge&logoColor=white&labelColor=4a999d&color=346c6e&logo=Codacy&label=Unit%20Test [Badge Size]: https://img.shields.io/github/repo-size/ultimaker/cura?style=for-the-badge&logoColor=white&labelColor=715a97&color=584674&logo=GoogleAnalytics +[Badge Downloads]: https://img.shields.io/github/downloads-pre/Ultimaker/Cura/latest/total?style=for-the-badge From 298f00ebdeb545ea93d56001c962b5eb8a26f1ab Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 9 Aug 2023 23:45:44 +0200 Subject: [PATCH 73/74] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94187fdff8..3ab44b88e3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![Badge Test]][Test]    [![Badge Conan]][Conan]    -[![Badge Downloads]][Downloads] +[![Badge Downloads]]

From 8eb7866694e0286f1f42885cf33ecf0eb75b2dd9 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 9 Aug 2023 23:46:01 +0200 Subject: [PATCH 74/74] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ab44b88e3..eb04799339 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![Badge Test]][Test]    [![Badge Conan]][Conan]    -[![Badge Downloads]] +![Badge Downloads]