From 2c972d98d4ef9b373371c06c1e80bdaeba9a9d14 Mon Sep 17 00:00:00 2001 From: Aleksey Karadzhi Date: Sun, 16 Aug 2020 14:04:04 +0300 Subject: [PATCH 01/17] Add 'Flying Bear Ghost 5' printer --- .../definitions/flyingbear_ghost_5.def.json | 54 +++++++++++++++++++ .../variants/flyingbear_ghost_5_0.25.inst.cfg | 12 +++++ .../variants/flyingbear_ghost_5_0.40.inst.cfg | 12 +++++ .../variants/flyingbear_ghost_5_0.80.inst.cfg | 12 +++++ 4 files changed, 90 insertions(+) create mode 100644 resources/definitions/flyingbear_ghost_5.def.json create mode 100644 resources/variants/flyingbear_ghost_5_0.25.inst.cfg create mode 100644 resources/variants/flyingbear_ghost_5_0.40.inst.cfg create mode 100644 resources/variants/flyingbear_ghost_5_0.80.inst.cfg diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json new file mode 100644 index 0000000000..51563d817a --- /dev/null +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -0,0 +1,54 @@ +{ + "name": "Flying Bear Ghost 5", + "version": 2, + "inherits": "flyingbear_base", + "metadata": { + "visible": true, + "author": "oducceu", + + "platform": "flyingbear_platform.obj", + "platform_texture": "flyingbear_platform.png", + + "quality_definition": "flyingbear_base" + + }, + + "overrides": { + "machine_name": { "default_value": "Flying Bear Ghost 5" }, + "machine_width": { "default_value": 255 }, + "machine_depth": { "default_value": 210 }, + "machine_height": { "default_value": 210 }, + + "machine_steps_per_mm_x": { "default_value": 80 }, + "machine_steps_per_mm_y": { "default_value": 80 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "machine_steps_per_mm_e": { "default_value": 410 }, + + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_feedrate_e": { "value": 70 }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + + "machine_max_acceleration_x": { "value": 1000 }, + "machine_max_acceleration_y": { "value": 1000 }, + "machine_max_acceleration_z": { "value": 200 }, + "machine_max_acceleration_e": { "value": 80000 }, + "machine_acceleration": { "value": 1000 }, + + "machine_max_jerk_xy": { "value": 20 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5.0 }, + + "acceleration_print": { "value": 1000 }, + "acceleration_travel": { "value": 3000 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 20 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" } + } +} \ No newline at end of file diff --git a/resources/variants/flyingbear_ghost_5_0.25.inst.cfg b/resources/variants/flyingbear_ghost_5_0.25.inst.cfg new file mode 100644 index 0000000000..8f6416037f --- /dev/null +++ b/resources/variants/flyingbear_ghost_5_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.25mm Nozzle +version = 4 +definition = flyingbear_ghost_5 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 diff --git a/resources/variants/flyingbear_ghost_5_0.40.inst.cfg b/resources/variants/flyingbear_ghost_5_0.40.inst.cfg new file mode 100644 index 0000000000..a8f2afcc69 --- /dev/null +++ b/resources/variants/flyingbear_ghost_5_0.40.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = flyingbear_ghost_5 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/flyingbear_ghost_5_0.80.inst.cfg b/resources/variants/flyingbear_ghost_5_0.80.inst.cfg new file mode 100644 index 0000000000..bce8e4a9b2 --- /dev/null +++ b/resources/variants/flyingbear_ghost_5_0.80.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = flyingbear_ghost_5 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 From 3522501fa826eed0a90445c1823c2ed657fea0f8 Mon Sep 17 00:00:00 2001 From: Aleksey Karadzhi Date: Sun, 16 Aug 2020 14:07:10 +0300 Subject: [PATCH 02/17] Adjust base print settings for all FB printers --- .../definitions/flyingbear_base.def.json | 131 +++++++++++++++++- .../abs/flyingbear_0.25_abs_super.inst.cfg | 1 + .../abs/flyingbear_0.25_abs_ultra.inst.cfg | 1 + .../abs/flyingbear_0.40_abs_adaptive.inst.cfg | 1 + .../abs/flyingbear_0.40_abs_low.inst.cfg | 1 + .../abs/flyingbear_0.40_abs_standard.inst.cfg | 1 + .../abs/flyingbear_0.40_abs_super.inst.cfg | 1 + .../abs/flyingbear_0.80_abs_draft.inst.cfg | 3 +- .../flyingbear_global_0.08_ultra.inst.cfg | 2 +- .../flyingbear_global_0.12_super.inst.cfg | 4 +- .../flyingbear_global_0.16_adaptive.inst.cfg | 2 +- .../flyingbear_global_0.20_standard.inst.cfg | 6 +- .../flyingbear_global_0.28_low.inst.cfg | 2 +- .../flyingbear_global_0.32_draft.inst.cfg | 4 +- .../hips/flyingbear_0.25_hips_super.inst.cfg | 1 + .../hips/flyingbear_0.25_hips_ultra.inst.cfg | 1 + .../flyingbear_0.40_hips_adaptive.inst.cfg | 1 + .../hips/flyingbear_0.40_hips_low.inst.cfg | 1 + .../flyingbear_0.40_hips_standard.inst.cfg | 1 + .../hips/flyingbear_0.40_hips_super.inst.cfg | 1 + .../hips/flyingbear_0.80_hips_draft.inst.cfg | 3 +- .../petg/flyingbear_0.25_petg_super.inst.cfg | 3 +- .../petg/flyingbear_0.25_petg_ultra.inst.cfg | 2 +- .../flyingbear_0.40_petg_adaptive.inst.cfg | 2 +- .../petg/flyingbear_0.40_petg_low.inst.cfg | 2 +- .../flyingbear_0.40_petg_standard.inst.cfg | 2 +- .../petg/flyingbear_0.40_petg_super.inst.cfg | 2 +- .../petg/flyingbear_0.80_petg_draft.inst.cfg | 2 +- .../pla/flyingbear_0.80_pla_draft.inst.cfg | 2 +- .../flyingbear_0.80_plapro_draft.inst.cfg | 2 +- .../tpu/flyingbear_0.40_tpu_adaptive.inst.cfg | 2 + .../tpu/flyingbear_0.40_tpu_low.inst.cfg | 16 +++ .../tpu/flyingbear_0.40_tpu_standard.inst.cfg | 2 + .../tpu/flyingbear_0.40_tpu_super.inst.cfg | 2 + .../tpu/flyingbear_0.80_tpu_draft.inst.cfg | 4 +- 35 files changed, 188 insertions(+), 26 deletions(-) create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index b02060932d..d78559fd58 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -21,7 +21,131 @@ "has_machine_quality": true, "preferred_quality_type": "normal", - "exclude_materials": ["Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_PLA_Glitter", "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", "generic_cpe_plus", "generic_gffcpe", "generic_gffpa", "generic_hips", "generic_nylon", "generic_pc", "generic_petg", "generic_pla", "generic_pp", "generic_pva", "generic_tough_pla", "generic_tpu", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", "leapfrog_abs_natural", "leapfrog_epla_natural", "leapfrog_pva_natural", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "structur3d_dap100silicone", "tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "zyyx_pro_flex", "zyyx_pro_pla"] + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pp", + "generic_pva", + "generic_tough_pla", + "generic_tpu", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] }, "overrides": { "machine_name": { "default_value": "Flying Bear Base Printer" }, @@ -72,7 +196,7 @@ "retraction_extrusion_window": { "value": 10 }, "speed_print": { "value": 60 } , - "speed_infill": { "value": "speed_print" }, + "speed_infill": { "value": "speed_print * 1.5" }, "speed_wall": { "value": "speed_print / 2" }, "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_print" }, @@ -82,7 +206,7 @@ "speed_support_interface": { "value": "speed_topbottom" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, - "speed_layer_0": { "value": 20 }, + "speed_layer_0": { "value": "speed_print / 2" }, "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, "skirt_brim_speed": { "value": "speed_layer_0" }, @@ -124,6 +248,7 @@ "skirt_gap": { "value": 10 }, "skirt_brim_minimal_length": { "value": 50 }, "brim_replaces_support": { "value": false }, + "brim_gap": { "value": "line_width / 2 if line_width < 0.4 else 0.2" }, "meshfix_maximum_resolution": { "value": 0.05 }, "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, diff --git a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg index 032ca1ffaa..81fd000e24 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg @@ -12,3 +12,4 @@ variant = 0.25mm Nozzle [values] wall_thickness = =line_width*6 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg index b2662eb668..c43abf96d4 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg @@ -12,3 +12,4 @@ variant = 0.25mm Nozzle [values] wall_thickness = =line_width*6 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg index 346337fd98..4f434d75f8 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg index a7d9f8ef48..29c8e9ca77 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg index 1f924f8d27..86993fbf00 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg index bd88547ca5..63f92bd7e6 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg index a557e058b2..d178f6f1c6 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg @@ -11,4 +11,5 @@ material = generic_abs variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*3 +wall_thickness = =line_width*2 +adhesion_type = brim diff --git a/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg index 60ed7249d9..7487badfd1 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg @@ -14,5 +14,5 @@ global_quality = True layer_height = 0.08 layer_height_0 = 0.12 top_bottom_thickness = =layer_height_0+layer_height*10 -wall_thickness = =line_width*3 +wall_thickness = =line_width*6 support_interface_height = =layer_height*12 diff --git a/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg index c095b018f7..ab3e6fd3e0 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg @@ -12,7 +12,7 @@ global_quality = True [values] layer_height = 0.12 -layer_height_0 = 0.12 +layer_height_0 = 0.16 top_bottom_thickness = =layer_height_0+layer_height*6 -wall_thickness = =line_width*3 +wall_thickness = =line_width*6 support_interface_height = =layer_height*8 diff --git a/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg index 80db69e119..7f3df6b0ec 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg @@ -14,6 +14,6 @@ global_quality = True layer_height = 0.16 layer_height_0 = 0.20 top_bottom_thickness = =layer_height_0+layer_height*4 -wall_thickness = =line_width*3 +wall_thickness = =line_width*5 support_interface_height = =layer_height*6 adaptive_layer_height_enabled = true diff --git a/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg index 8d700a5de5..80a4f685df 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg @@ -11,8 +11,8 @@ weight = -3 global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.2 +layer_height = 0.20 +layer_height_0 = 0.20 top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*3 +wall_thickness = =line_width*4 support_interface_height = =layer_height*5 diff --git a/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg index d64ed2b1f4..7a9c3821e2 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg @@ -14,5 +14,5 @@ global_quality = True layer_height = 0.28 layer_height_0 = 0.28 top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 +wall_thickness = =line_width*3 support_interface_height = =layer_height*4 diff --git a/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg index dc9f56a16b..b061fce584 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg @@ -14,5 +14,5 @@ global_quality = True layer_height = 0.32 layer_height_0 = 0.32 top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*3 diff --git a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg index 5112db5adc..5955617ba9 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg @@ -12,3 +12,4 @@ variant = 0.25mm Nozzle [values] wall_thickness = =line_width*6 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg index b755c98342..a5b41b8510 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg @@ -12,3 +12,4 @@ variant = 0.25mm Nozzle [values] wall_thickness = =line_width*6 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg index 1155778c5b..8ef247243c 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg index 8df9ddbaab..39c3520923 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg index 989d34bf0d..575e19da4b 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg index 11c5570442..6d1ed494ec 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg @@ -12,3 +12,4 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg index 36f412aa17..dbb7886360 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg @@ -11,4 +11,5 @@ material = generic_hips variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*3 +wall_thickness = =line_width*2 +adhesion_type = brim diff --git a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg index d7e6490418..e4a7428474 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg @@ -11,6 +11,5 @@ material = generic_petg variant = 0.25mm Nozzle [values] -speed_layer_0 = 15 wall_thickness = =line_width*6 - +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg index d8da87058d..71801ac95d 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg @@ -11,5 +11,5 @@ material = generic_petg variant = 0.25mm Nozzle [values] -speed_layer_0 = 15 wall_thickness = =line_width*6 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg index 397840dbb8..f3ffbc5683 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg @@ -11,5 +11,5 @@ material = generic_petg variant = 0.4mm Nozzle [values] -speed_layer_0 = 15 wall_thickness = =line_width*4 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg index 49f768b33d..3f99e366f5 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg @@ -11,5 +11,5 @@ material = generic_petg variant = 0.4mm Nozzle [values] -speed_layer_0 = 15 wall_thickness = =line_width*4 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg index 8e50d40128..e85c74e836 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg @@ -11,5 +11,5 @@ material = generic_petg variant = 0.4mm Nozzle [values] -speed_layer_0 = 15 wall_thickness = =line_width*4 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg index 41e1471174..f73d1a1808 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg @@ -11,5 +11,5 @@ material = generic_petg variant = 0.4mm Nozzle [values] -speed_layer_0 = 15 wall_thickness = =line_width*4 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg index cb41e816f3..651f650389 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg @@ -11,5 +11,5 @@ material = generic_petg variant = 0.8mm Nozzle [values] +wall_thickness = =line_width*2 speed_layer_0 = 15 -wall_thickness = =line_width*3 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg index 24b9c135c6..1dd4bdaa9c 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg @@ -11,4 +11,4 @@ material = generic_pla variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*3 +wall_thickness = =line_width*2 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg index 9f90a8b5bc..4f899f8544 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg @@ -11,4 +11,4 @@ material = eSUN_PLA_PRO_Black variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*3 +wall_thickness = =line_width*2 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg index a007668fe3..f1684df73d 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg @@ -12,3 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg new file mode 100644 index 0000000000..2f48a680f0 --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg index d0b7ea2430..c2936b64ea 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg @@ -12,3 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg index 6675ac3761..b51652c0b8 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg @@ -12,3 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg index 5341069fbf..4bf91bbebd 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg @@ -11,4 +11,6 @@ material = generic_tpu variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*3 +wall_thickness = =line_width*2 +speed_print = 20 +speed_layer_0 = 10 From 29ade7542982b00175f9951b4f819d5d5cb3ed78 Mon Sep 17 00:00:00 2001 From: Aleksey Karadzhi Date: Sun, 16 Aug 2020 14:09:15 +0300 Subject: [PATCH 03/17] Add 'Coarse' quality profile (0.4h for 0.8d) --- .../abs/flyingbear_0.80_abs_coarse.inst.cfg | 15 +++++++++++++++ .../flyingbear_global_0.40_coarse.inst.cfg | 18 ++++++++++++++++++ .../hips/flyingbear_0.80_hips_coarse.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.80_petg_coarse.inst.cfg | 15 +++++++++++++++ .../pla/flyingbear_0.80_pla_coarse.inst.cfg | 14 ++++++++++++++ .../flyingbear_0.80_plapro_coarse.inst.cfg | 14 ++++++++++++++ .../tpu/flyingbear_0.80_tpu_coarse.inst.cfg | 16 ++++++++++++++++ 7 files changed, 107 insertions(+) create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg create mode 100644 resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg diff --git a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg new file mode 100644 index 0000000000..034f892908 --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Coarse Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = coarse +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = brim diff --git a/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg new file mode 100644 index 0000000000..81481286c4 --- /dev/null +++ b/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Coarse Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = coarse +weight = -6 +global_quality = True + +[values] +layer_height = 0.40 +layer_height_0 = 0.40 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*2 diff --git a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg new file mode 100644 index 0000000000..33694a14b7 --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Coarse Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = coarse +material = generic_hips +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*2 +adhesion_type = brim diff --git a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg new file mode 100644 index 0000000000..ce3072b277 --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Coarse Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = coarse +material = generic_petg +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*2 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg new file mode 100644 index 0000000000..15c77c140a --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Coarse Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = coarse +material = generic_pla +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*2 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg new file mode 100644 index 0000000000..199195fc12 --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Coarse Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = coarse +material = eSUN_PLA_PRO_Black +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*2 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg new file mode 100644 index 0000000000..07313f2bea --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Coarse Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = coarse +material = generic_tpu +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*2 +speed_print = 20 +speed_layer_0 = 10 From 573a8c87207513b6bebae1abd3614b43d8a7142b Mon Sep 17 00:00:00 2001 From: Aleksey Karadzhi Date: Sun, 16 Aug 2020 14:10:10 +0300 Subject: [PATCH 04/17] Add more nozzle diameter variants (0.3, 0.5, 0.6) --- .../abs/flyingbear_0.30_abs_adaptive.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.30_abs_standard.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.30_abs_super.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.50_abs_adaptive.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.50_abs_draft.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.50_abs_low.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.50_abs_standard.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.60_abs_draft.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.60_abs_low.inst.cfg | 15 +++++++++++++++ .../abs/flyingbear_0.60_abs_standard.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.30_hips_adaptive.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.30_hips_standard.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.30_hips_super.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.50_hips_adaptive.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.50_hips_draft.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.50_hips_low.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.50_hips_standard.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.60_hips_draft.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.60_hips_low.inst.cfg | 15 +++++++++++++++ .../hips/flyingbear_0.60_hips_standard.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.30_petg_adaptive.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.30_petg_standard.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.30_petg_super.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.50_petg_adaptive.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.50_petg_draft.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.50_petg_low.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.50_petg_standard.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.60_petg_draft.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.60_petg_low.inst.cfg | 15 +++++++++++++++ .../petg/flyingbear_0.60_petg_standard.inst.cfg | 15 +++++++++++++++ .../pla/flyingbear_0.30_pla_adaptive.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.30_pla_standard.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.30_pla_super.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.50_pla_adaptive.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.50_pla_draft.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.50_pla_low.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.50_pla_standard.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.60_pla_draft.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.60_pla_low.inst.cfg | 14 ++++++++++++++ .../pla/flyingbear_0.60_pla_standard.inst.cfg | 14 ++++++++++++++ .../flyingbear_0.30_plapro_adaptive.inst.cfg | 14 ++++++++++++++ .../flyingbear_0.30_plapro_standard.inst.cfg | 14 ++++++++++++++ .../plapro/flyingbear_0.30_plapro_super.inst.cfg | 14 ++++++++++++++ .../flyingbear_0.50_plapro_adaptive.inst.cfg | 14 ++++++++++++++ .../plapro/flyingbear_0.50_plapro_draft.inst.cfg | 14 ++++++++++++++ .../plapro/flyingbear_0.50_plapro_low.inst.cfg | 14 ++++++++++++++ .../flyingbear_0.50_plapro_standard.inst.cfg | 14 ++++++++++++++ .../plapro/flyingbear_0.60_plapro_draft.inst.cfg | 14 ++++++++++++++ .../plapro/flyingbear_0.60_plapro_low.inst.cfg | 14 ++++++++++++++ .../flyingbear_0.60_plapro_standard.inst.cfg | 14 ++++++++++++++ .../tpu/flyingbear_0.50_tpu_adaptive.inst.cfg | 16 ++++++++++++++++ .../tpu/flyingbear_0.50_tpu_draft.inst.cfg | 16 ++++++++++++++++ .../tpu/flyingbear_0.50_tpu_low.inst.cfg | 16 ++++++++++++++++ .../tpu/flyingbear_0.50_tpu_standard.inst.cfg | 16 ++++++++++++++++ .../tpu/flyingbear_0.60_tpu_draft.inst.cfg | 16 ++++++++++++++++ .../tpu/flyingbear_0.60_tpu_low.inst.cfg | 16 ++++++++++++++++ .../tpu/flyingbear_0.60_tpu_standard.inst.cfg | 16 ++++++++++++++++ resources/variants/flyingbear_base_0.30.inst.cfg | 12 ++++++++++++ resources/variants/flyingbear_base_0.50.inst.cfg | 12 ++++++++++++ resources/variants/flyingbear_base_0.60.inst.cfg | 12 ++++++++++++ .../variants/flyingbear_ghost_4s_0.30.inst.cfg | 12 ++++++++++++ .../variants/flyingbear_ghost_4s_0.50.inst.cfg | 12 ++++++++++++ .../variants/flyingbear_ghost_4s_0.60.inst.cfg | 12 ++++++++++++ .../variants/flyingbear_ghost_5_0.30.inst.cfg | 12 ++++++++++++ .../variants/flyingbear_ghost_5_0.50.inst.cfg | 12 ++++++++++++ .../variants/flyingbear_ghost_5_0.60.inst.cfg | 12 ++++++++++++ 66 files changed, 950 insertions(+) create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg create mode 100644 resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg create mode 100644 resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg create mode 100644 resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg create mode 100644 resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg create mode 100644 resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg create mode 100644 resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg create mode 100644 resources/variants/flyingbear_base_0.30.inst.cfg create mode 100644 resources/variants/flyingbear_base_0.50.inst.cfg create mode 100644 resources/variants/flyingbear_base_0.60.inst.cfg create mode 100644 resources/variants/flyingbear_ghost_4s_0.30.inst.cfg create mode 100644 resources/variants/flyingbear_ghost_4s_0.50.inst.cfg create mode 100644 resources/variants/flyingbear_ghost_4s_0.60.inst.cfg create mode 100644 resources/variants/flyingbear_ghost_5_0.30.inst.cfg create mode 100644 resources/variants/flyingbear_ghost_5_0.50.inst.cfg create mode 100644 resources/variants/flyingbear_ghost_5_0.60.inst.cfg diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg new file mode 100644 index 0000000000..0f264cf94a --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg new file mode 100644 index 0000000000..fd5734b905 --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg new file mode 100644 index 0000000000..7a6c81224c --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = super +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg new file mode 100644 index 0000000000..7d43e7b01f --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg new file mode 100644 index 0000000000..f5ae781313 --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg new file mode 100644 index 0000000000..60c5f24e98 --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg new file mode 100644 index 0000000000..bb51b45baa --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg new file mode 100644 index 0000000000..cae0179006 --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg new file mode 100644 index 0000000000..d05f40296f --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +adhesion_type = brim diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg new file mode 100644 index 0000000000..8e5da99cd0 --- /dev/null +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg new file mode 100644 index 0000000000..d8bd39d500 --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_hips +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg new file mode 100644 index 0000000000..b7187f2ef0 --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_hips +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg new file mode 100644 index 0000000000..eef3750701 --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = super +material = generic_hips +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg new file mode 100644 index 0000000000..d9d5f5c187 --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_hips +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg new file mode 100644 index 0000000000..86f42eebb9 --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_hips +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg new file mode 100644 index 0000000000..77e44e8434 --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_hips +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg new file mode 100644 index 0000000000..4b3174d19a --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_hips +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg new file mode 100644 index 0000000000..a78662f716 --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_hips +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg new file mode 100644 index 0000000000..eb1d50886a --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_hips +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +adhesion_type = brim diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg new file mode 100644 index 0000000000..a515aa4cdc --- /dev/null +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_hips +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +adhesion_type = brim diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg new file mode 100644 index 0000000000..d21368e543 --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg new file mode 100644 index 0000000000..6c0753e357 --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_petg +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg new file mode 100644 index 0000000000..e56984febf --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = super +material = generic_petg +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg new file mode 100644 index 0000000000..092b65c7d9 --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg new file mode 100644 index 0000000000..79ec0e8149 --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_petg +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg new file mode 100644 index 0000000000..917ece36f0 --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_petg +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg new file mode 100644 index 0000000000..64875a407a --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_petg +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg new file mode 100644 index 0000000000..b877aedcf9 --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_petg +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg new file mode 100644 index 0000000000..9d2907477d --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_petg +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg new file mode 100644 index 0000000000..80fe66e64f --- /dev/null +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_petg +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_layer_0 = 15 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg new file mode 100644 index 0000000000..99e209fb0d --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg new file mode 100644 index 0000000000..a24b698ed7 --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_pla +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg new file mode 100644 index 0000000000..95fe67a25a --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = super +material = generic_pla +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg new file mode 100644 index 0000000000..afd03c8506 --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg new file mode 100644 index 0000000000..b32e0e1783 --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_pla +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg new file mode 100644 index 0000000000..e62ac4e4a9 --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_pla +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg new file mode 100644 index 0000000000..2e1fd93352 --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_pla +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg new file mode 100644 index 0000000000..6b8fa2604a --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg new file mode 100644 index 0000000000..70d8b08ba4 --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg new file mode 100644 index 0000000000..2bf233a94e --- /dev/null +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_pla +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg new file mode 100644 index 0000000000..0015ce38e9 --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = eSUN_PLA_PRO_Black +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg new file mode 100644 index 0000000000..f7e43d629a --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = eSUN_PLA_PRO_Black +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg new file mode 100644 index 0000000000..b7892c7316 --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = super +material = eSUN_PLA_PRO_Black +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*5 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg new file mode 100644 index 0000000000..7aeccd6cb7 --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = eSUN_PLA_PRO_Black +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg new file mode 100644 index 0000000000..5e13575ba7 --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = eSUN_PLA_PRO_Black +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg new file mode 100644 index 0000000000..f23d880569 --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = eSUN_PLA_PRO_Black +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg new file mode 100644 index 0000000000..9ea43bc9cd --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = eSUN_PLA_PRO_Black +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg new file mode 100644 index 0000000000..26b4c8479e --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = eSUN_PLA_PRO_Black +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg new file mode 100644 index 0000000000..1fa2f8c455 --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = eSUN_PLA_PRO_Black +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg new file mode 100644 index 0000000000..ab4e92ca6d --- /dev/null +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = eSUN_PLA_PRO_Black +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg new file mode 100644 index 0000000000..3e6b3ab80a --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg new file mode 100644 index 0000000000..d04c801c06 --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg new file mode 100644 index 0000000000..ac16d7c2d0 --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg new file mode 100644 index 0000000000..7f45c5fe9a --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg new file mode 100644 index 0000000000..519a7bbffe --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg new file mode 100644 index 0000000000..8a4a3d6bf3 --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = low +material = generic_tpu +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg new file mode 100644 index 0000000000..a499723017 --- /dev/null +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = quality +quality_type = normal +material = generic_tpu +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 +speed_print = 20 +speed_layer_0 = 10 diff --git a/resources/variants/flyingbear_base_0.30.inst.cfg b/resources/variants/flyingbear_base_0.30.inst.cfg new file mode 100644 index 0000000000..376cdb9be5 --- /dev/null +++ b/resources/variants/flyingbear_base_0.30.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/flyingbear_base_0.50.inst.cfg b/resources/variants/flyingbear_base_0.50.inst.cfg new file mode 100644 index 0000000000..02eb5d4b9f --- /dev/null +++ b/resources/variants/flyingbear_base_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/flyingbear_base_0.60.inst.cfg b/resources/variants/flyingbear_base_0.60.inst.cfg new file mode 100644 index 0000000000..7e1ed0af47 --- /dev/null +++ b/resources/variants/flyingbear_base_0.60.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = flyingbear_base + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg new file mode 100644 index 0000000000..990656890e --- /dev/null +++ b/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = flyingbear_ghost_4s + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg new file mode 100644 index 0000000000..c3e4122897 --- /dev/null +++ b/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = flyingbear_ghost_4s + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg new file mode 100644 index 0000000000..0dc4e11f1d --- /dev/null +++ b/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = flyingbear_ghost_4s + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/flyingbear_ghost_5_0.30.inst.cfg b/resources/variants/flyingbear_ghost_5_0.30.inst.cfg new file mode 100644 index 0000000000..4a451090dd --- /dev/null +++ b/resources/variants/flyingbear_ghost_5_0.30.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = flyingbear_ghost_5 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/flyingbear_ghost_5_0.50.inst.cfg b/resources/variants/flyingbear_ghost_5_0.50.inst.cfg new file mode 100644 index 0000000000..99b143fb8b --- /dev/null +++ b/resources/variants/flyingbear_ghost_5_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = flyingbear_ghost_5 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/flyingbear_ghost_5_0.60.inst.cfg b/resources/variants/flyingbear_ghost_5_0.60.inst.cfg new file mode 100644 index 0000000000..f4b5fa35eb --- /dev/null +++ b/resources/variants/flyingbear_ghost_5_0.60.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = flyingbear_ghost_5 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 From bf9c41351605b486a1e63af36aaa8541715b771b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 25 Aug 2020 16:31:11 +0200 Subject: [PATCH 05/17] Change wording of logline The log was incorrect. At that point the device isn't connected yet, it's state is connecting! --- plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 3b73e54b25..63c11ba484 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -109,8 +109,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): if self.isConnected(): return + Logger.log("i", "Attempting to connect to cluster %s", self.key) super().connect() - Logger.log("i", "Connected to cluster %s", self.key) + CuraApplication.getInstance().getBackend().backendStateChange.connect(self._onBackendStateChange) self._update() From f6cbb0f88c723348570d5106d06776d84f32a733 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 25 Aug 2020 17:02:39 +0200 Subject: [PATCH 06/17] Prevent continued connect / disconnect loop If a cloud printer was connected, it would time out all the time. In some cases it would do this in a single update loop (so connect and disconnect). Depending on the machine of the user, this would either be visible or not at all. --- .../src/UltimakerNetworkedPrinterOutputDevice.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py index 13aa0d7063..c05945c356 100644 --- a/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/UltimakerNetworkedPrinterOutputDevice.py @@ -45,10 +45,6 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): # States indicating if a print job is queued. QUEUED_PRINT_JOBS_STATES = {"queued", "error"} - # Time in seconds since last network response after which we consider this device offline. - # We set this a bit higher than some of the other intervals to make sure they don't overlap. - NETWORK_RESPONSE_CONSIDER_OFFLINE = 10.0 # seconds - def __init__(self, device_id: str, address: str, properties: Dict[bytes, bytes], connection_type: ConnectionType, parent=None) -> None: @@ -87,6 +83,8 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): # The job upload progress message modal. self._progress = PrintJobUploadProgressMessage() + self._timeout_time = 30 + @pyqtProperty(str, constant=True) def address(self) -> str: """The IP address of the printer.""" @@ -213,8 +211,8 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): return Duration(seconds).getDisplayString(DurationFormat.Format.Short) def _update(self) -> None: - self._checkStillConnected() super()._update() + self._checkStillConnected() def _checkStillConnected(self) -> None: """Check if we're still connected by comparing the last timestamps for network response and the current time. @@ -224,7 +222,8 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): TODO: it would be nice to have this logic in the managers, but connecting those with signals causes crashes. """ time_since_last_response = time() - self._time_of_last_response - if time_since_last_response > self.NETWORK_RESPONSE_CONSIDER_OFFLINE: + if time_since_last_response > self._timeout_time: + Logger.log("d", "It has been %s seconds since the last response for outputdevice %s, so assume a timeout", time_since_last_response, self.key) self.setConnectionState(ConnectionState.Closed) if self.key in CuraApplication.getInstance().getOutputDeviceManager().getOutputDeviceIds(): CuraApplication.getInstance().getOutputDeviceManager().removeOutputDevice(self.key) @@ -241,6 +240,7 @@ class UltimakerNetworkedPrinterOutputDevice(NetworkedPrinterOutputDevice): return # Indicate this device is now connected again. + Logger.log("d", "Reconnecting output device after timeout.") self.setConnectionState(ConnectionState.Connected) # If the device was already registered we don't need to register it again. From c04473219392486afaa75130be526fede77e1a3b Mon Sep 17 00:00:00 2001 From: Aleksey Karadzhi Date: Wed, 26 Aug 2020 17:21:32 +0300 Subject: [PATCH 07/17] Fix X0 Y0 being outside the bed after homing --- resources/definitions/flyingbear_ghost_5.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json index 51563d817a..c1cb9b0d5d 100644 --- a/resources/definitions/flyingbear_ghost_5.def.json +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -15,6 +15,7 @@ "overrides": { "machine_name": { "default_value": "Flying Bear Ghost 5" }, + "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\n;Fix X0 Y0 being outside the bed after homing\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1.3 Y4.8 ;Place the nozzle over the bed\nG92 X0 Y0 ;Set new X0 Y0\n\n;Code for nozzle cleaning and flow normalization\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.4 Y20 Z0.28 F5000.0\nG1 X10.4 Y170.0 Z0.28 F1500.0 E15\nG1 X10.1 Y170.0 Z0.28 F5000.0\nG1 X10.1 Y40 Z0.28 F1500.0 E30\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, "machine_width": { "default_value": 255 }, "machine_depth": { "default_value": 210 }, "machine_height": { "default_value": 210 }, From 8c0e21f0d58549b645cbd5e5823acdfee0c44781 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 3 Sep 2020 17:52:44 +0200 Subject: [PATCH 08/17] Don't crash if mesh loading fails Some plug-ins (like the OBJReader) return None then. Fixes Sentry issue CURA-14P. --- cura/CuraApplication.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 0446400362..434841160c 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1799,6 +1799,9 @@ class CuraApplication(QtApplication): return nodes = job.getResult() + if nodes is None: + Logger.error("Read mesh job returned None. Mesh loading must have failed.") + return file_name = job.getFileName() file_name_lower = file_name.lower() file_extension = file_name_lower.split(".")[-1] From 349f3b7e112913b0d3578a730c5402675f50496e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 7 Sep 2020 10:46:17 +0200 Subject: [PATCH 09/17] Force update when changing nozzle size in custom FFF Fixes #8306 --- plugins/MachineSettingsAction/MachineSettingsAction.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py index f3359a1c56..96bfa7062b 100755 --- a/plugins/MachineSettingsAction/MachineSettingsAction.py +++ b/plugins/MachineSettingsAction/MachineSettingsAction.py @@ -104,6 +104,7 @@ class MachineSettingsAction(MachineAction): # Force rebuilding the build volume by reloading the global container stack. # This is a bit of a hack, but it seems quick enough. self._application.getMachineManager().globalContainerChanged.emit() + self._application.getMachineManager().forceUpdateAllSettings() @pyqtSlot() def updateHasMaterialsMetadata(self) -> None: From 49c401590b55a23d418706d8b91ce2ed93ecb294 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 7 Sep 2020 10:47:52 +0200 Subject: [PATCH 10/17] Update bugreport link --- cura/CuraActions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 4f3e842379..d6e5add912 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -40,7 +40,7 @@ class CuraActions(QObject): @pyqtSlot() def openBugReportPage(self) -> None: - event = CallFunctionEvent(self._openUrl, [QUrl("https://github.com/Ultimaker/Cura/issues")], {}) + event = CallFunctionEvent(self._openUrl, [QUrl("https://github.com/Ultimaker/Cura/issues/new/choose")], {}) cura.CuraApplication.CuraApplication.getInstance().functionEvent(event) @pyqtSlot() From ea376c9ee8180b66786cbff36cae8fc5c485d909 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 7 Sep 2020 10:52:45 +0200 Subject: [PATCH 11/17] Update translations based on suggestion from reseller --- resources/i18n/ko_KR/fdmprinter.def.json.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index fc4b18f566..82ecc43f09 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -948,7 +948,7 @@ msgstr "외벽 이동 거리" #: fdmprinter.def.json msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." -msgstr "Z 솔기를 더 잘 숨기기위해 바깥 쪽 벽 뒤에 삽입되어 이동한 거리." +msgstr "Z 층의 경계면을 더 잘 가리기 위해 바깥쪽 벽 뒤에 삽입되어 이동한 거리." #: fdmprinter.def.json msgctxt "roofing_extruder_nr label" @@ -6933,7 +6933,7 @@ msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬 #~ msgctxt "relative_extrusion description" #~ msgid "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the Gcode. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before any Gcode script is output." -#~ msgstr "절대 압출 대신 상대 압출을 사용합니다. 상대적인 E-steps을 사용하면 Gcode를 보다 쉽게 후처리 할 수 있습니다. 그러나 모든 프린터에서 지원되는 것은 아니며 절대 압출의 E 스텝값과 비교할 때 출력된 재료의 양이 근소하게 다를 수 있습니다. 이 설정과 관계없이 압출 모드는 Gcode 스크립트가 출력되기 전에 항상 절대 값으로 설정됩니다." +#~ msgstr "절대 압출 대신 상대 압출을 사용합니다. 상대적인 E-steps을 사용하면 Gcode를 보다 쉽게 후처리 할 수 있습니다. 그러나 모든 프린터에서 지원되는 것은 아니며 절대 압출의 E 스텝값과 비교할 때 출력된 재료의 양이 근소하게 다를 수 있습니다. 이 설정과 관계없이 압출 모드는 Gcode 스크립트가 출력되기 전에 항상 절댓값으로 설정됩니다." #~ msgctxt "infill_offset_x description" #~ msgid "The infill pattern is offset this distance along the X axis." From bde6e1bb97a85863af032d0f39532984794e39d6 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 7 Sep 2020 11:27:36 +0200 Subject: [PATCH 12/17] Fix crash when removing cloud printers CURA-7665 --- .../UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index 508476095d..7a007e3874 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -460,8 +460,8 @@ class CloudOutputDeviceManager: question_title = self.i18n_catalog.i18nc("@title:window", "Remove printers?") question_content = self.i18n_catalog.i18ncp( "@label", - "You are about to remove {num_printers} printer from Cura. This action cannot be undone.\nAre you sure you want to continue?", - "You are about to remove {num_printers} printers from Cura. This action cannot be undone.\nAre you sure you want to continue?", + "You are about to remove {0} printer from Cura. This action cannot be undone.\nAre you sure you want to continue?", + "You are about to remove {0} printers from Cura. This action cannot be undone.\nAre you sure you want to continue?", len(remove_printers_ids) ).format(num_printers = len(remove_printers_ids)) if remove_printers_ids == all_ids: From 66132ef217f1f73c3802d6818446f32f88491d51 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Sun, 6 Sep 2020 22:11:18 +0200 Subject: [PATCH 13/17] Don't use full-width unicode percent as placeholder in zh_CN locale. Fixes #8322 --- resources/i18n/zh_CN/cura.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index a1346ad122..3355e8a00f 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -2468,7 +2468,7 @@ msgstr "在包装更改生效之前，您需要重新启动Cura。" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxFooter.qml:46 msgctxt "@info:button, %1 is the application name" msgid "Quit %1" -msgstr "退出 ％1" +msgstr "退出 %1" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:30 msgctxt "@title:tab" @@ -3145,7 +3145,7 @@ msgstr "检查是否存在帐户更新" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/UserOperations.qml:81 msgctxt "@label The argument is a timestamp" msgid "Last update: %1" -msgstr "上次更新时间：％1" +msgstr "上次更新时间：%1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/UserOperations.qml:99 msgctxt "@button" @@ -3492,13 +3492,13 @@ msgstr "配置文件" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 msgctxt "@title:window %1 is the application name" msgid "Closing %1" -msgstr "正在关闭 ％1" +msgstr "正在关闭 %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" -msgstr "您确定要退出 ％1 吗？" +msgstr "您确定要退出 %1 吗？" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 @@ -3534,7 +3534,7 @@ msgstr "新增功能" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:15 msgctxt "@title:window The argument is the application name." msgid "About %1" -msgstr "关于 ％1" +msgstr "关于 %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:57 msgctxt "@label" @@ -4914,7 +4914,7 @@ msgstr "自定义配置文件" msgctxt "@label %1 is filled in with the type of a profile. %2 is filled with a list of numbers (eg '1' or '1, 2')" msgid "There is no %1 profile for the configuration in extruder %2. The default intent will be used instead" msgid_plural "There is no %1 profile for the configurations in extruders %2. The default intent will be used instead" -msgstr[0] "没有 ％1 配置文件可用于挤出器 ％2 中的配置。将改为使用默认意图" +msgstr[0] "没有 %1 配置文件可用于挤出器 %2 中的配置。将改为使用默认意图" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:21 msgctxt "@label shown when we load a Gcode file" From 17177eccfa3d227b5667fa5a4e198727f4f2979f Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 7 Sep 2020 16:33:16 +0200 Subject: [PATCH 14/17] Remove unused keyword argument I18ncp already puts the number of printers in the text, so the keyword argument is not longer necessary. CURA-7665 --- .../UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index 7a007e3874..586c711de9 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -463,7 +463,7 @@ class CloudOutputDeviceManager: "You are about to remove {0} printer from Cura. This action cannot be undone.\nAre you sure you want to continue?", "You are about to remove {0} printers from Cura. This action cannot be undone.\nAre you sure you want to continue?", len(remove_printers_ids) - ).format(num_printers = len(remove_printers_ids)) + ) if remove_printers_ids == all_ids: question_content = self.i18n_catalog.i18nc("@label", "You are about to remove all printers from Cura. This action cannot be undone.\nAre you sure you want to continue?") result = QMessageBox.question(None, question_title, question_content) From 59669f6bade15f2bc4c7b3c40fd9c9d3d202157c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Sep 2020 02:00:58 +0200 Subject: [PATCH 15/17] Apply bitmask to user scope As discussed, this is a method to prevent leaking personally identifiable information through crash reports, while still keeping the useful information for the developers on how widely spread the crashes are. --- cura/CrashHandler.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index 4c0dd4855b..db44daa77c 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -250,7 +250,10 @@ class CrashHandler: scope.set_context("plugins", self.data["plugins"]) - scope.set_user({"id": str(uuid.getnode())}) + user_id = uuid.getnode() # On all of Cura's supported platforms, this returns the MAC address which is pseudonymical information (!= anonymous). + user_id %= 2 ** 16 # So to make it anonymous, apply a bitmask selecting only the last 16 bits. + # This prevents it from being traceable to a specific user but still gives somewhat of an idea of whether it's just the same user hitting the same crash over and over again, or if it's widespread. + scope.set_user({"id": str(user_id)}) return group From 6e2738a25489f5c38d1177915c1f9d51545c4ac3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Sep 2020 12:53:30 +0200 Subject: [PATCH 16/17] Don't update extruders that Cura doesn't have This is a bit of defensive coding. If the position is out of bounds for Cura it should now ignore those extruders. This could be due to broken firmware, or maybe someone MITM-ing the connection and changing it, or perhaps because the printer was changed while the sync was ongoing? Whatever the cause, it now puts a warning in the log about it and doesn't crash any more. Fixes Sentry issue CURA-156. --- cura/Settings/MachineManager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 5f540fec5c..a4d6237d80 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1396,6 +1396,9 @@ class MachineManager(QObject): for extruder_configuration in configuration.extruderConfigurations: position = str(extruder_configuration.position) + if int(position) >= len(self._global_container_stack.extruderList): + Logger.warning("Received a configuration for extruder {position}, which is out of bounds for this printer.".format(position=position)) + continue # Remote printer gave more extruders than what Cura had locally, e.g. because the user switched to a single-extruder printer while the sync was being processed. # If the machine doesn't have a hotend or material, disable this extruder if int(position) in extruders_to_disable: From 1ce8ef3293d0f5409e01f7bc5f2bd3d89cf7b5d5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 8 Sep 2020 13:01:10 +0200 Subject: [PATCH 17/17] Catch OSError and related errors when saving workspaces This should prevent a crash when saving to a path that the file system doesn't support (because of e.g. disallowed symbols in the file name). Instead it will now show an error message to the user. Fixes Sentry issue CURA-157. --- plugins/3MFWriter/ThreeMFWorkspaceWriter.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py index 69b1e51247..9f4ab8e5fa 100644 --- a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py +++ b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py @@ -92,6 +92,10 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): self.setInformation(catalog.i18nc("@error:zip", "No permission to write the workspace here.")) Logger.error("No permission to write workspace to this stream.") return False + except EnvironmentError as e: + self.setInformation(catalog.i18nc("@error:zip", "The operating system does not allow saving a project file to this location or with this file name.")) + Logger.error("EnvironmentError when writing workspace to this stream: {err}".format(err = str(e))) + return False mesh_writer.setStoreArchive(False) return True