From 528814c9e62ba46cee3ab08462b2873797b8adb8 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 29 Oct 2019 09:33:30 +0100 Subject: [PATCH 01/35] Make jobname less sensitive to being touched --- resources/qml/JobSpecs.qml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index 63ccbc336a..e48d3facda 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -83,10 +83,22 @@ Item text: PrintInformation.jobName horizontalAlignment: TextInput.AlignLeft + property string textBeforeEdit: "" + + onActiveFocusChanged: + { + if (activeFocus) + { + textBeforeEdit = text + } + } + onEditingFinished: { - var new_name = text == "" ? catalog.i18nc("@text Print job name", "Untitled") : text - PrintInformation.setJobName(new_name, true) + if (text != textBeforeEdit) { + var new_name = text == "" ? catalog.i18nc("@text Print job name", "Untitled") : text + PrintInformation.setJobName(new_name, true) + } printJobTextfield.focus = false } From 8a75a5454ba725b3378dfddf403ab04920bfdf3f Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Fri, 15 Nov 2019 16:23:06 +0100 Subject: [PATCH 02/35] Adding_Hips_Profiles --- resources/definitions/strateo3d.def.json | 2 +- .../Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg | 48 +++++++++++++++++++ .../Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg | 48 +++++++++++++++++++ .../Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg | 48 +++++++++++++++++++ .../Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg | 48 +++++++++++++++++++ .../Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg | 48 +++++++++++++++++++ .../Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg | 48 +++++++++++++++++++ 7 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 6e02f882c3..d0ef38fb77 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -15,7 +15,7 @@ "has_variants": true, "preferred_variant_name": "Standard 0.6", "preferred_material": "emotiontech_pla", - "preferred_quality_type": "e", + "preferred_quality_type": "c", "variants_name": "Print Head", "machine_extruder_trains": { diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg new file mode 100644 index 0000000000..d930b03af1 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = a +weight = 1 +material = emotiontech_hips +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg new file mode 100644 index 0000000000..54281ae273 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = b +weight = 0 +material = emotiontech_hips +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = ==line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg new file mode 100644 index 0000000000..84eb14acbe --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = c +weight = -1 +material = emotiontech_hips +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width*3/4 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg new file mode 100644 index 0000000000..00fbeff14b --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = b +weight = 1 +material = emotiontech_hips +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg new file mode 100644 index 0000000000..6b3d39b7ca --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = c +weight = 0 +material = emotiontech_hips +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg new file mode 100644 index 0000000000..72ae576a80 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg @@ -0,0 +1,48 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = d +weight = -1 +material = emotiontech_hips +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.75 +support_xy_distance_overhang = =line_width*0.175/line_width +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file From 631870adcad1fc9e69ed4f49029a09eaeed4950e Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Tue, 19 Nov 2019 17:05:25 +0100 Subject: [PATCH 03/35] Adding_08_Nozzle_&_fine_tuning_profiles --- .../Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg | 6 ++++-- .../Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg | 6 ++++-- .../Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg | 8 ++++--- .../Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg | 12 ++++++----- .../Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg | 12 ++++++----- .../Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg | 8 ++++--- .../s3d_std0.4_PVA-OKS_A.inst.cfg | 12 ++++++----- .../s3d_std0.4_PVA-OKS_B.inst.cfg | 12 ++++++----- .../s3d_std0.4_PVA-OKS_C.inst.cfg | 8 ++++--- .../Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg | 12 ++++++----- .../Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg | 12 ++++++----- .../Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg | 8 ++++--- .../Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg | 8 ++++--- .../Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg | 8 ++++--- .../Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg | 8 ++++--- .../Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg | 12 ++++++----- .../Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg | 10 +++++---- .../Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg | 12 ++++++----- .../s3d_std0.6_PVA-OKS_B.inst.cfg | 12 ++++++----- .../s3d_std0.6_PVA-OKS_C.inst.cfg | 10 +++++---- .../s3d_std0.6_PVA-OKS_D.inst.cfg | 12 ++++++----- .../Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg | 12 ++++++----- .../Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg | 10 +++++---- .../Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg | 12 ++++++----- .../Standard_0.8/s3d_std0.8_ABS_C.inst.cfg | 19 ++++++++--------- .../Standard_0.8/s3d_std0.8_ABS_D.inst.cfg | 21 +++++++++---------- .../Standard_0.8/s3d_std0.8_ABS_E.inst.cfg | 19 ++++++++--------- .../Standard_0.8/s3d_std0.8_PETG_C.inst.cfg | 15 +++++++------ .../Standard_0.8/s3d_std0.8_PETG_D.inst.cfg | 15 +++++++------ .../Standard_0.8/s3d_std0.8_PETG_E.inst.cfg | 11 +++++----- .../Standard_0.8/s3d_std0.8_PLA_C.inst.cfg | 15 +++++++------ .../Standard_0.8/s3d_std0.8_PLA_D.inst.cfg | 15 +++++++------ .../Standard_0.8/s3d_std0.8_PLA_E.inst.cfg | 13 ++++++------ .../s3d_std0.8_PVA-OKS_C.inst.cfg | 19 +++++++++-------- .../s3d_std0.8_PVA-OKS_D.inst.cfg | 21 ++++++++++--------- .../s3d_std0.8_PVA-OKS_E.inst.cfg | 21 ++++++++++--------- .../Standard_0.8/s3d_std0.8_TPU_C.inst.cfg | 7 +++---- .../Standard_0.8/s3d_std0.8_TPU_D.inst.cfg | 7 +++---- .../Standard_0.8/s3d_std0.8_TPU_E.inst.cfg | 7 +++---- .../variants/strateo3d_standard_08.inst.cfg | 20 ++++++++++++++++++ 40 files changed, 273 insertions(+), 214 deletions(-) create mode 100644 resources/variants/strateo3d_standard_08.inst.cfg diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg index d930b03af1..4c56a210fc 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg @@ -38,10 +38,12 @@ retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg index 54281ae273..bcaf489224 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg @@ -38,10 +38,12 @@ retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 15 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = ==line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg index 84eb14acbe..d27d5f0ff4 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg @@ -28,7 +28,7 @@ cool_fan_speed = 50 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature + 5 @@ -38,10 +38,12 @@ retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 20 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg index 19d8247456..b1ad5d72ab 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -28,20 +28,22 @@ cool_fan_speed = 50 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height cool_min_speed = 10 -support_angle = 65 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg index 44e5609b3f..822399fef6 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -28,20 +28,22 @@ cool_fan_speed = 50 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 60 +support_angle = 55 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 15 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg index b4cc317f50..acad5e33e4 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -33,15 +33,17 @@ cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 20 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg index eb8bd0a020..503767b332 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_A.inst.cfg @@ -28,20 +28,22 @@ cool_fan_speed = 50 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height cool_min_speed = 10 -support_angle = 65 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg index a25f57b3e7..5b366651af 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_B.inst.cfg @@ -28,20 +28,22 @@ cool_fan_speed = 50 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 60 +support_angle = 55 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 15 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = ==line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg index 6222d946e0..36080febc5 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-OKS_C.inst.cfg @@ -33,15 +33,17 @@ cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 20 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg index 774a985511..633356b41a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -28,20 +28,22 @@ cool_fan_speed = 50 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height cool_min_speed = 10 -support_angle = 65 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg index 72429d945b..3dc67389b3 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -28,20 +28,22 @@ cool_fan_speed = 50 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 60 +support_angle = 55 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 15 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = ==line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg index 09c540498e..94d1f14c09 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -33,15 +33,17 @@ cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 97 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 20 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width*3/4 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg index 00fbeff14b..2e417e008c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg @@ -30,7 +30,7 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 50 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 95 @@ -38,10 +38,12 @@ retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg index 6b3d39b7ca..166e075a56 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg @@ -30,7 +30,7 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 50 +support_angle = 55 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 95 @@ -38,10 +38,12 @@ retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg index 72ae576a80..69681ea613 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg @@ -30,7 +30,7 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 50 +support_angle = 55 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 95 @@ -38,10 +38,12 @@ retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 3 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg index 05ae1383eb..26f0c64071 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -30,19 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 60 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg index 7507968a69..6aec7956b8 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -33,16 +33,18 @@ cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg index ea68f30f33..852fbb8e0b 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -30,19 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 50 +support_angle = 55 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg index 915e0f3b83..4b3a6c1b6e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_B.inst.cfg @@ -30,19 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 60 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg index b9c260eb2c..1bfeb7b1b9 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_C.inst.cfg @@ -33,16 +33,18 @@ cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg index 7e1237eb55..6deb9705ba 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-OKS_D.inst.cfg @@ -30,19 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 50 +support_angle = 55 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg index f5fed6dc2e..0758a59309 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -30,19 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 60 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg index 033c0e03bd..612b7a2af2 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -33,16 +33,18 @@ cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg index 9e457f7d73..39371d86e8 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -30,19 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 50 +support_angle = 55 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 95 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width -support_offset = 2.5 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg index bf649d61ef..e431ca45db 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -13,14 +13,13 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) speed_topbottom = =math.ceil(speed_print * 35/50) speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 @@ -34,13 +33,13 @@ cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_flow = 97 +retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg index 55d6d20323..6f0970cd5d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -13,14 +13,13 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) speed_topbottom = =math.ceil(speed_print * 35/50) speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 @@ -33,14 +32,14 @@ cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_min_speed = 10 support_angle = 50 material_print_temperature = =default_material_print_temperature + 5 -material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 96 +retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg index 8c3215ebc1..52892f97e0 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -13,14 +13,13 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) speed_topbottom = =math.ceil(speed_print * 35/50) speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 @@ -34,13 +33,13 @@ cool_min_speed = 10 support_angle = 45 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_flow = 95 +retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg index 4a12fffb1e..926096a7d9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 speed_wall = =math.ceil(speed_print * 40/50) @@ -25,17 +24,17 @@ speed_topbottom = =math.ceil(speed_print * 35/50) speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 cool_fan_enabled = True -cool_fan_speed = 50 +cool_fan_speed = 75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_min_speed = 10 -support_angle = 60 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0 +material_flow = 97 +retraction_extra_prime_amount = 0.4 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg index a5f01107f8..b43eeb7864 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 speed_wall = =math.ceil(speed_print * 40/50) @@ -25,7 +24,7 @@ speed_topbottom = =math.ceil(speed_print * 35/50) speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 cool_fan_enabled = True -cool_fan_speed = 50 +cool_fan_speed = 75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 @@ -33,9 +32,9 @@ cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_min_speed = 10 support_angle = 50 material_print_temperature = =default_material_print_temperature + 5 -material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 95 +retraction_extra_prime_amount = 0.4 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg index 6042de9501..4191e2723e 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 speed_wall = =math.ceil(speed_print * 40/50) @@ -25,7 +24,7 @@ speed_topbottom = =math.ceil(speed_print * 35/50) speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 cool_fan_enabled = True -cool_fan_speed = 50 +cool_fan_speed = 75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 @@ -35,7 +34,7 @@ support_angle = 45 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 material_flow = 93 -retraction_extra_prime_amount = 0 +retraction_extra_prime_amount = 0.4 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg index 405bc3db13..27979f443a 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 speed_wall = =math.ceil(speed_print * 40/50) @@ -31,11 +30,11 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_min_speed = 10 -support_angle = 60 -material_print_temperature = =default_material_print_temperature +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_flow = 99 +retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg index b52bd3e5a1..871243e0fd 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 speed_wall = =math.ceil(speed_print * 40/50) @@ -32,10 +31,10 @@ cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_min_speed = 10 support_angle = 50 -material_print_temperature = =default_material_print_temperature + 5 -material_print_temperature_layer_0 = =default_material_print_temperature +3 -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_print_temperature = =default_material_print_temperature + 7 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 98 +retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg index 8b65fa78bd..39a61933c3 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.62 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.65 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.5625 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 50 speed_wall = =math.ceil(speed_print * 40/50) @@ -33,9 +32,9 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_min_speed = 10 support_angle = 45 material_print_temperature = =default_material_print_temperature + 10 -material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 97 +retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True skin_overlap = 5 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg index 5cf1c2c5a9..0736de0994 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) @@ -31,18 +30,20 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 60 +support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_flow = 97 +retraction_extra_prime_amount = 0.3 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 2 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg index e514ce8425..971fe5f76c 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) @@ -31,18 +30,20 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 50 -material_print_temperature = =default_material_print_temperature +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_flow = 97 +retraction_extra_prime_amount = 0.3 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 2 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg index 883c733088..6994af0705 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 wall_0_wipe_dist = =machine_nozzle_size/2 speed_print = 40 speed_wall = =math.ceil(speed_print * 30/40) @@ -31,18 +30,20 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 45 -material_print_temperature = =default_material_print_temperature +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_flow = 97 +retraction_extra_prime_amount = 0.3 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.75 -support_xy_distance_overhang = =line_width*0.175/line_width +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 support_offset = 2 support_pattern = grid support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg index b7ec8a65db..5a0bf18760 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 wall_0_wipe_dist = =machine_nozzle_size speed_print = 35 speed_wall = =math.ceil(speed_print * 35/35) diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg index fcea53fbe5..687afee84e 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 wall_0_wipe_dist = =machine_nozzle_size speed_print = 35 speed_wall = =math.ceil(speed_print * 35/35) diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg index 61a455827c..034a7e0db4 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg @@ -13,10 +13,9 @@ variant = Standard 0.8 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 wall_0_wipe_dist = =machine_nozzle_size speed_print = 35 speed_wall = =math.ceil(speed_print * 35/35) diff --git a/resources/variants/strateo3d_standard_08.inst.cfg b/resources/variants/strateo3d_standard_08.inst.cfg new file mode 100644 index 0000000000..5198f7d1db --- /dev/null +++ b/resources/variants/strateo3d_standard_08.inst.cfg @@ -0,0 +1,20 @@ +[general] +name = Standard 0.8 +version = 4 +definition = strateo3d + +[metadata] +setting_version = 10 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = Standard 0.8 +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 +layer_height = 0.4 +layer_height_0 = 0.5 +prime_tower_enable = True +retract_at_layer_change = True +support_angle = 50 +support_use_towers = True \ No newline at end of file From 7c4eeb3b23491b88e085256579856d84189bbe67 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Thu, 21 Nov 2019 16:42:59 +0100 Subject: [PATCH 04/35] HMS434 update --- resources/definitions/hms434.def.json | 75 ++++++++++++++++----------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index ca031f26bf..ce6031b5a9 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -9,7 +9,7 @@ "file_formats": "text/x-gcode", "has_materials": true, - "preferred_material": "generic_pla", + "has_machine_materials": true, "exclude_materials": [ "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", @@ -17,9 +17,10 @@ "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", - "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pva_175", "generic_tpu_175", - "imade3d_petg_175", "imade3d_pla_175", + "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pla_175", "generic_pva_175", "generic_tpu_175", + "imade3d_generic_petg_175", "imade3d_generic_pla_175", "innofill_innoflex60_175", + "leapfrog_abs_natural", "leapfrog_epla_natural","leapfrog_pva_natural", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", @@ -68,7 +69,7 @@ "material_bed_temp_wait": {"default_value": false }, "machine_max_feedrate_z": {"default_value": 10 }, "machine_acceleration": {"default_value": 1000 }, - "machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" }, + "machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature}\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, "retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" }, @@ -91,13 +92,17 @@ "wall_0_inset": {"value": "0" }, "outer_inset_first": {"value": true }, "alternate_extra_perimeter": {"value": false }, - "filter_out_tiny_gaps": {"value": false }, + "filter_out_tiny_gaps": {"value": true }, "fill_outline_gaps": {"value": true }, + "z_seam_type": {"value": "'back'"}, + "z_seam_x": {"value": "0"}, + "z_seam_y": {"value": "0"}, + "z_seam_corner": {"value": "'z_seam_corner_inner'"}, "skin_outline_count": {"value": "0"}, "ironing_enabled": {"value": true }, - "ironing_line_spacing": {"value": "line_width"}, - "ironing_flow": {"value": "0"}, - "ironing_inset": {"value": "line_width"}, + "ironing_line_spacing": {"value": "line_width / 4 * 3"}, + "ironing_flow": {"value": "0.05"}, + "ironing_inset": {"value": "ironing_line_spacing"}, "speed_ironing": {"value": "150"}, "infill_sparse_density": {"value": 30}, @@ -107,12 +112,14 @@ "infill_wipe_dist": {"value": 0.0}, "infill_before_walls": {"value": false}, - "material_print_temperature_layer_0": {"value": "material_print_temperature + 5"}, + "material_print_temperature_layer_0": {"value": "material_print_temperature"}, "material_initial_print_temperature": {"value": "material_print_temperature", "maximum_value_warning": "material_print_temperature + 15"}, "material_final_print_temperature": {"value": "material_print_temperature"}, - "material_bed_temperature_layer_0": {"value": "material_bed_temperature + 1"}, + "material_bed_temperature_layer_0": {"value": "material_bed_temperature"}, "material_flow": {"value": "100"}, + "retraction_enable": {"value": true }, + "retract_at_layer_change": {"value": true }, "retraction_amount": {"value": "1"}, "retraction_speed": {"value": "20"}, "retraction_prime_speed": {"value": "8"}, @@ -148,14 +155,16 @@ "cool_min_speed": {"value": "10"}, "cool_lift_head": {"value": false}, + "support_infill_rate": {"value": 25}, "support_z_distance": {"value": 0}, - "support_xy_distance": {"value": 1}, + "support_xy_distance": {"value": 0.4}, "support_join_distance": {"value": 10}, + "support_interface_pattern": {"value": "'lines'"}, + "support_roof_pattern": {"value": "'concentric'"}, "support_interface_enable": {"value": true}, "support_interface_height": {"value": 0.5}, - "support_interface_pattern": {"value": "'lines'"}, - "adhesion_type": {"value": "'none'"}, + "adhesion_type": {"value": "'skirt'"}, "skirt_gap": {"value": 1}, "skirt_brim_minimal_length": {"value": 50}, @@ -165,23 +174,27 @@ "prime_tower_position_y": {"value": 70 }, "prime_blob_enable": {"default_value": false }, - "coasting_enable": {"value": true}, - "coasting_volume": {"value": 0.1}, - "coasting_min_volume": {"value": 0.17}, - "coasting_speed": {"value": 90}, - "bridge_settings_enabled": {"value": true}, - "bridge_wall_min_length": {"value": 3}, - "bridge_skin_support_threshold": {"value": 90}, - "bridge_wall_speed": {"value": 15}, - "bridge_wall_material_flow": {"value": 130}, - "bridge_skin_speed": {"value": 15}, - "bridge_skin_material_flow": {"value": 130}, - "bridge_fan_speed": {"value": 0}, - "bridge_skin_density_2": {"value": 100}, - "bridge_skin_density_3": {"value": 100}, - "bridge_skin_material_flow_2": {"value": 110}, - "bridge_skin_material_flow_3": {"value": 100}, - "bridge_skin_speed_2": {"value": 20}, - "bridge_skin_speed_3": {"value": 30} + "minimum_polygon_circumference": {"value": 0.01 }, + "meshfix_maximum_resolution": {"value": 0.01 }, + "meshfix_maximum_travel_resolution":{"value": 0.1 }, + "meshfix_maximum_deviation": {"value": 0.01 }, + "coasting_enable": {"value": true}, + "coasting_volume": {"value": 0.1}, + "coasting_min_volume": {"value": 0.17}, + "coasting_speed": {"value": 90}, + "bridge_settings_enabled": {"value": true}, + "bridge_wall_min_length": {"value": 3}, + "bridge_skin_support_threshold": {"value": 90}, + "bridge_wall_speed": {"value": 15}, + "bridge_wall_material_flow": {"value": 130}, + "bridge_skin_speed": {"value": 15}, + "bridge_skin_material_flow": {"value": 130}, + "bridge_fan_speed": {"value": 0}, + "bridge_skin_density_2": {"value": 100}, + "bridge_skin_density_3": {"value": 100}, + "bridge_skin_material_flow_2": {"value": 110}, + "bridge_skin_material_flow_3": {"value": 100}, + "bridge_skin_speed_2": {"value": 20}, + "bridge_skin_speed_3": {"value": 30} } } From f7d7f53516da6c75ae94e9367810cc00950cb0c1 Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Thu, 21 Nov 2019 16:53:01 +0100 Subject: [PATCH 05/35] Adding_N08_HIPS_PVA_TPU --- .../Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg | 50 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg | 47 +++++++++++++++++ .../Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg | 47 +++++++++++++++++ .../Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg | 47 +++++++++++++++++ 12 files changed, 591 insertions(+) create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg new file mode 100644 index 0000000000..bf543d092c --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = c +weight = 1 +material = emotiontech_hips +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg new file mode 100644 index 0000000000..83832533a7 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = d +weight = 0 +material = emotiontech_hips +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg new file mode 100644 index 0000000000..3d83e02085 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = e +weight = -1 +material = emotiontech_hips +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg new file mode 100644 index 0000000000..3f51624239 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = c +weight = 1 +material = emotiontech_pva-m +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg new file mode 100644 index 0000000000..5da500a88b --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = d +weight = 0 +material = emotiontech_pva-m +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg new file mode 100644 index 0000000000..d8082aad7d --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = e +weight = -1 +material = emotiontech_pva-m +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg new file mode 100644 index 0000000000..739b4ad94b --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = c +weight = 1 +material = emotiontech_pva-s +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg new file mode 100644 index 0000000000..92e0f55aaf --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = d +weight = 0 +material = emotiontech_pva-s +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg new file mode 100644 index 0000000000..4e42dcb139 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = e +weight = -1 +material = emotiontech_pva-s +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg new file mode 100644 index 0000000000..5a2b13297c --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = c +weight = 1 +material = emotiontech_tpu98a +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 105 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg new file mode 100644 index 0000000000..11beb17513 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = d +weight = 0 +material = emotiontech_tpu98a +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 6 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 103 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg new file mode 100644 index 0000000000..04152b5b01 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = e +weight = -1 +material = emotiontech_tpu98a +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 9 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 101 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file From c2efca902560d3f3d99b2e9d969be7516a532151 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Thu, 21 Nov 2019 17:06:28 +0100 Subject: [PATCH 06/35] HMS434 update --- resources/definitions/hms434.def.json | 4 ++-- resources/extruders/hms434_tool_1.def.json | 4 ++-- resources/extruders/hms434_tool_2.def.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index ce6031b5a9..795e0b685d 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -17,8 +17,8 @@ "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", - "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pla_175", "generic_pva_175", "generic_tpu_175", - "imade3d_generic_petg_175", "imade3d_generic_pla_175", + "generic_abs", "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pla_175", "generic_pva_175", "generic_tpu_175", + "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", "leapfrog_abs_natural", "leapfrog_epla_natural","leapfrog_pva_natural", "octofiber_pla", diff --git a/resources/extruders/hms434_tool_1.def.json b/resources/extruders/hms434_tool_1.def.json index 3a1619d98b..ddd46e60f3 100644 --- a/resources/extruders/hms434_tool_1.def.json +++ b/resources/extruders/hms434_tool_1.def.json @@ -16,10 +16,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;changing to tool1\nM109 T0 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n" + "default_value": "\n;changing to tool1\nM109 T0 S{material_print_temperature}\nG1 Y120 F3000\nG1 X10 F12000\n\n" }, "machine_extruder_end_code": { - "default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n; ending tool1\n\n" + "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool1\n\n" } } } diff --git a/resources/extruders/hms434_tool_2.def.json b/resources/extruders/hms434_tool_2.def.json index 3a174f82b9..aec54238f3 100644 --- a/resources/extruders/hms434_tool_2.def.json +++ b/resources/extruders/hms434_tool_2.def.json @@ -16,10 +16,10 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;changing to tool2\nM109 T1 S{material_print_temperature}\nG1 X-18 Y-50 F9000\nG1 X150 Y10 F9000\n\n" + "default_value": "\n;changing to tool2\nM109 T1 S{material_print_temperature}\nG1 Y120 F3000\nG1 X10 F12000\n\n" }, "machine_extruder_end_code": { - "default_value": "\nG1 X150 Y10 F9000\nG1 X-20 Y-50 F9000\nG1 Y-100 F3000\n; ending tool2\n\n" + "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool2\n\n" } } } From 1ef5805baf417524fd058a9283c85114d6ef7ba8 Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Mon, 25 Nov 2019 16:53:42 +0100 Subject: [PATCH 07/35] N08_Nozzle_profile_fine_tune --- .../strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg | 4 ++-- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg | 4 ++-- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg | 6 +++--- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg | 8 ++++---- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg | 8 ++++---- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg | 2 +- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg | 4 ++-- .../strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg index bf543d092c..938fe0ad32 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg @@ -30,7 +30,7 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 55 +support_angle = 50 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg index 83832533a7..4fd317e6db 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg @@ -30,7 +30,7 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 55 +support_angle = 50 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg index 3d83e02085..a3be4ef0b3 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg @@ -30,7 +30,7 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 -support_angle = 55 +support_angle = 50 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg index 3f51624239..2f1e5a72e9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg @@ -30,7 +30,7 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 +support_angle = 50 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg index 5da500a88b..3b81e41671 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg @@ -30,8 +30,8 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 -material_print_temperature = =default_material_print_temperature + 3 +support_angle = 50 +material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 retraction_extra_prime_amount = 0.3 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg index d8082aad7d..ef67be17d2 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg @@ -30,8 +30,8 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 -material_print_temperature = =default_material_print_temperature + 5 +support_angle = 50 +material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 retraction_extra_prime_amount = 0.3 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg index 0736de0994..dc308bcc5c 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_C.inst.cfg @@ -30,21 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 +support_angle = 50 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 retraction_extra_prime_amount = 0.3 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True -skin_overlap = 5 +skin_overlap = 10 support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 0.5 support_xy_distance_overhang = =line_width*0 -support_offset = 2 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg index 971fe5f76c..fc60c3670f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_D.inst.cfg @@ -30,21 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 -material_print_temperature = =default_material_print_temperature + 3 +support_angle = 50 +material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 retraction_extra_prime_amount = 0.3 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True -skin_overlap = 5 +skin_overlap = 10 support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 0.5 support_xy_distance_overhang = =line_width*0 -support_offset = 2 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg index 6994af0705..45d89c6948 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-OKS_E.inst.cfg @@ -30,21 +30,21 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 -material_print_temperature = =default_material_print_temperature + 5 +support_angle = 50 +material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 retraction_extra_prime_amount = 0.3 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True -skin_overlap = 5 +skin_overlap = 10 support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 support_z_distance = =layer_height-layer_height support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 0.5 support_xy_distance_overhang = =line_width*0 -support_offset = 2 +support_offset = 3 support_pattern = grid support_interface_density = 100 prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg index 739b4ad94b..517a3ecb37 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg @@ -30,7 +30,7 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 +support_angle = 50 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg index 92e0f55aaf..78956eb485 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg @@ -30,8 +30,8 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 -material_print_temperature = =default_material_print_temperature + 3 +support_angle = 50 +material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 retraction_extra_prime_amount = 0.3 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg index 4e42dcb139..d4a0c49945 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg @@ -30,8 +30,8 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_min_speed = 10 -support_angle = 55 -material_print_temperature = =default_material_print_temperature + 5 +support_angle = 50 +material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature material_flow = 97 retraction_extra_prime_amount = 0.3 From 070f9e15379d778f97909245469fdf2c219570bc Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Thu, 28 Nov 2019 10:00:53 +0100 Subject: [PATCH 08/35] HMS434 update small changes --- resources/definitions/hms434.def.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 795e0b685d..4723926abd 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -68,7 +68,7 @@ "material_print_temp_wait": {"default_value": false }, "material_bed_temp_wait": {"default_value": false }, "machine_max_feedrate_z": {"default_value": 10 }, - "machine_acceleration": {"default_value": 1000 }, + "machine_acceleration": {"default_value": 300 }, "machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature}\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, @@ -101,7 +101,7 @@ "skin_outline_count": {"value": "0"}, "ironing_enabled": {"value": true }, "ironing_line_spacing": {"value": "line_width / 4 * 3"}, - "ironing_flow": {"value": "0.05"}, + "ironing_flow": {"value": "0"}, "ironing_inset": {"value": "ironing_line_spacing"}, "speed_ironing": {"value": "150"}, @@ -174,14 +174,16 @@ "prime_tower_position_y": {"value": 70 }, "prime_blob_enable": {"default_value": false }, - "minimum_polygon_circumference": {"value": 0.01 }, "meshfix_maximum_resolution": {"value": 0.01 }, "meshfix_maximum_travel_resolution":{"value": 0.1 }, "meshfix_maximum_deviation": {"value": 0.01 }, + + "minimum_polygon_circumference": {"value": 0.05 }, "coasting_enable": {"value": true}, "coasting_volume": {"value": 0.1}, "coasting_min_volume": {"value": 0.17}, "coasting_speed": {"value": 90}, + "wall_overhang_angle": {"value": 60}, "bridge_settings_enabled": {"value": true}, "bridge_wall_min_length": {"value": 3}, "bridge_skin_support_threshold": {"value": 90}, From bdc3ceeb5266e133cddb79c7a2a63974d8c713f2 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Mon, 2 Dec 2019 14:34:36 +0100 Subject: [PATCH 09/35] HMS434 update acceleration and line width --- resources/definitions/hms434.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 4723926abd..707218cb49 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -68,7 +68,7 @@ "material_print_temp_wait": {"default_value": false }, "material_bed_temp_wait": {"default_value": false }, "machine_max_feedrate_z": {"default_value": 10 }, - "machine_acceleration": {"default_value": 300 }, + "machine_acceleration": {"default_value": 500 }, "machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature}\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, @@ -80,7 +80,7 @@ "layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - "line_width": {"value": "(machine_nozzle_size + layer_height)" }, + "line_width": {"value": "(machine_nozzle_size + 0.2)" }, "infill_line_width": {"value": "(line_width)" }, "initial_layer_line_width_factor": {"value": 110 }, From 055fc1450d16a4ed73b5543b954c27a609d85f47 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Mon, 2 Dec 2019 16:13:47 +0100 Subject: [PATCH 10/35] HMS434 update --- resources/definitions/hms434.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 707218cb49..702eef6f4e 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -81,6 +81,7 @@ "layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "line_width": {"value": "(machine_nozzle_size + 0.2)" }, + "wall_line_width_0": {"value": "(machine_nozzle_size - 0.05)" }, "infill_line_width": {"value": "(line_width)" }, "initial_layer_line_width_factor": {"value": 110 }, From 6d8052656c2ebfcff7e47ce07ea657e805921e46 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Wed, 4 Dec 2019 10:10:05 +0100 Subject: [PATCH 11/35] HMS434 update bed temp initial layer --- resources/definitions/hms434.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 702eef6f4e..9040656815 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -69,7 +69,7 @@ "material_bed_temp_wait": {"default_value": false }, "machine_max_feedrate_z": {"default_value": 10 }, "machine_acceleration": {"default_value": 500 }, - "machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature}\nM117 HMS434 Printing ...\n\n" }, + "machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM140 S{material_bed_temperature_layer_0}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature_layer_0}\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, "retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" }, From 950e96da2d76a2610af2409eb9e6d652330f2736 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Fri, 6 Dec 2019 08:54:51 +0100 Subject: [PATCH 12/35] HMS434 update Z seam changed PLA quality profiles deleted --- resources/definitions/hms434.def.json | 4 +- .../hms434/pla/hms434_0.4_pla_high.inst.cfg | 36 ----------------- .../hms434/pla/hms434_0.4_pla_normal.inst.cfg | 36 ----------------- .../hms434/pla/hms434_0.8_pla_coarse.inst.cfg | 36 ----------------- .../hms434/pla/hms434_0.8_pla_normal.inst.cfg | 40 ------------------- 5 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg delete mode 100644 resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg delete mode 100644 resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg delete mode 100644 resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 9040656815..48d4d390d8 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -96,8 +96,8 @@ "filter_out_tiny_gaps": {"value": true }, "fill_outline_gaps": {"value": true }, "z_seam_type": {"value": "'back'"}, - "z_seam_x": {"value": "0"}, - "z_seam_y": {"value": "0"}, + "z_seam_x": {"value": "300"}, + "z_seam_y": {"value": "325"}, "z_seam_corner": {"value": "'z_seam_corner_inner'"}, "skin_outline_count": {"value": "0"}, "ironing_enabled": {"value": true }, diff --git a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg deleted file mode 100644 index 551978870e..0000000000 --- a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg +++ /dev/null @@ -1,36 +0,0 @@ -[general] -version = 4 -name = High -definition = hms434 - -[metadata] -setting_version = 10 -type = quality -quality_type = high -weight = 1 -material = generic_pla -variant = 0.4mm TP extruder - -[values] - -wall_0_wipe_dist = 0.0 - -infill_overlap_mm = -0.1 -infill_wipe_dist = 0 - -default_material_print_temperature = 190 -material_standby_temperature = 160 -default_material_bed_temperature = 45 -build_volume_temperature = 43 -material_flow = 100 -retraction_amount = 1 -retraction_speed = 40 -retraction_prime_speed = 8 -retraction_extra_prime_amount = 0 -switch_extruder_retraction_amount = 2 - -speed_print = 50 - -coasting_volume = 0.05 -coasting_min_volume = 0.17 -coasting_speed = 100 diff --git a/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg b/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg deleted file mode 100644 index 3952acec60..0000000000 --- a/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg +++ /dev/null @@ -1,36 +0,0 @@ -[general] -version = 4 -name = Normal -definition = hms434 - -[metadata] -setting_version = 10 -type = quality -quality_type = normal -weight = 0 -material = generic_pla -variant = 0.4mm TP extruder - -[values] - -wall_0_wipe_dist = 0.0 - -infill_overlap_mm = -0.1 -infill_wipe_dist = 0 - -default_material_print_temperature = 190 -material_standby_temperature = 160 -default_material_bed_temperature = 45 -build_volume_temperature = 43 -material_flow = 100 -retraction_amount = 1 -retraction_speed = 40 -retraction_prime_speed = 8 -retraction_extra_prime_amount = 0 -switch_extruder_retraction_amount = 2 - -speed_print = 50 - -coasting_volume = 0.05 -coasting_min_volume = 0.17 -coasting_speed = 100 diff --git a/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg b/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg deleted file mode 100644 index 897209b098..0000000000 --- a/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg +++ /dev/null @@ -1,36 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = hms434 - -[metadata] -setting_version = 10 -type = quality -quality_type = coarse -weight = -1 -material = generic_pla -variant = 0.8mm TP extruder - -[values] - -wall_0_wipe_dist = 0.0 - -infill_overlap_mm = -0.1 -infill_wipe_dist = 0 - -default_material_print_temperature = 190 -material_standby_temperature = 160 -default_material_bed_temperature = 45 -build_volume_temperature = 43 -material_flow = 100 -retraction_amount = 1 -retraction_speed = 40 -retraction_prime_speed = 8 -retraction_extra_prime_amount = 0 -switch_extruder_retraction_amount = 2 - -speed_print = 50 - -coasting_volume = 0.05 -coasting_min_volume = 0.17 -coasting_speed = 100 diff --git a/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg b/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg deleted file mode 100644 index 53630ffd84..0000000000 --- a/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -version = 4 -name = Normal -definition = hms434 - -[metadata] -setting_version = 10 -type = quality -quality_type = normal -weight = 0 -material = generic_pla -variant = 0.8mm TP extruder - -[values] - -wall_0_wipe_dist = 0.0 - -infill_overlap_mm = -0.1 -infill_sparse_thickness = =0.4 if infill_sparse_density < 90 else 0.2 -infill_wipe_dist = 0 - -default_material_print_temperature = 190 -material_standby_temperature = 160 -default_material_bed_temperature = 45 -build_volume_temperature = 43 -material_flow = 100 -retraction_amount = 1 -retraction_speed = 40 -retraction_prime_speed = 8 -retraction_extra_prime_amount = 0 -switch_extruder_retraction_amount = 2 - -speed_print = 50 -speed_infill = 42 - -support_infill_sparse_thickness = 0.4 - -coasting_volume = 0.05 -coasting_min_volume = 0.17 -coasting_speed = 100 From da1a5d1be649673f922c0c13cd9fdae7caf0395e Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 10 Dec 2019 14:44:31 +0100 Subject: [PATCH 13/35] Log error on failed machine creation An error message will be generated when machine creation fails while switching printer types in the printer configuration menu. CURA-6127 --- cura/Settings/MachineManager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index de6e270a86..f8e609af77 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1241,6 +1241,7 @@ class MachineManager(QObject): if not new_machine: new_machine = CuraStackBuilder.createMachine(machine_definition_id + "_sync", machine_definition_id) if not new_machine: + Logger.log("e", "Failed to create new machine when switching configuration.") return for metadata_key in self._global_container_stack.getMetaData(): From c6cfd12c6f4185784d12b6f11fc8d1c80f9fff13 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Thu, 12 Dec 2019 09:04:41 +0100 Subject: [PATCH 14/35] HMS434 update --- resources/definitions/hms434.def.json | 1 - .../hms434/pla/hms434_0.4_pla_high.inst.cfg | 36 +++++++++++++++++ .../hms434/pla/hms434_0.4_pla_normal.inst.cfg | 36 +++++++++++++++++ .../hms434/pla/hms434_0.8_pla_coarse.inst.cfg | 36 +++++++++++++++++ .../hms434/pla/hms434_0.8_pla_normal.inst.cfg | 40 +++++++++++++++++++ 5 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg create mode 100644 resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg create mode 100644 resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg create mode 100644 resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 48d4d390d8..be78df9daa 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -9,7 +9,6 @@ "file_formats": "text/x-gcode", "has_materials": true, - "has_machine_materials": true, "exclude_materials": [ "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", diff --git a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg new file mode 100644 index 0000000000..551978870e --- /dev/null +++ b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = High +definition = hms434 + +[metadata] +setting_version = 10 +type = quality +quality_type = high +weight = 1 +material = generic_pla +variant = 0.4mm TP extruder + +[values] + +wall_0_wipe_dist = 0.0 + +infill_overlap_mm = -0.1 +infill_wipe_dist = 0 + +default_material_print_temperature = 190 +material_standby_temperature = 160 +default_material_bed_temperature = 45 +build_volume_temperature = 43 +material_flow = 100 +retraction_amount = 1 +retraction_speed = 40 +retraction_prime_speed = 8 +retraction_extra_prime_amount = 0 +switch_extruder_retraction_amount = 2 + +speed_print = 50 + +coasting_volume = 0.05 +coasting_min_volume = 0.17 +coasting_speed = 100 diff --git a/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg b/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg new file mode 100644 index 0000000000..3952acec60 --- /dev/null +++ b/resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = Normal +definition = hms434 + +[metadata] +setting_version = 10 +type = quality +quality_type = normal +weight = 0 +material = generic_pla +variant = 0.4mm TP extruder + +[values] + +wall_0_wipe_dist = 0.0 + +infill_overlap_mm = -0.1 +infill_wipe_dist = 0 + +default_material_print_temperature = 190 +material_standby_temperature = 160 +default_material_bed_temperature = 45 +build_volume_temperature = 43 +material_flow = 100 +retraction_amount = 1 +retraction_speed = 40 +retraction_prime_speed = 8 +retraction_extra_prime_amount = 0 +switch_extruder_retraction_amount = 2 + +speed_print = 50 + +coasting_volume = 0.05 +coasting_min_volume = 0.17 +coasting_speed = 100 diff --git a/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg b/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg new file mode 100644 index 0000000000..897209b098 --- /dev/null +++ b/resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = Coarse +definition = hms434 + +[metadata] +setting_version = 10 +type = quality +quality_type = coarse +weight = -1 +material = generic_pla +variant = 0.8mm TP extruder + +[values] + +wall_0_wipe_dist = 0.0 + +infill_overlap_mm = -0.1 +infill_wipe_dist = 0 + +default_material_print_temperature = 190 +material_standby_temperature = 160 +default_material_bed_temperature = 45 +build_volume_temperature = 43 +material_flow = 100 +retraction_amount = 1 +retraction_speed = 40 +retraction_prime_speed = 8 +retraction_extra_prime_amount = 0 +switch_extruder_retraction_amount = 2 + +speed_print = 50 + +coasting_volume = 0.05 +coasting_min_volume = 0.17 +coasting_speed = 100 diff --git a/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg b/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg new file mode 100644 index 0000000000..53630ffd84 --- /dev/null +++ b/resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg @@ -0,0 +1,40 @@ +[general] +version = 4 +name = Normal +definition = hms434 + +[metadata] +setting_version = 10 +type = quality +quality_type = normal +weight = 0 +material = generic_pla +variant = 0.8mm TP extruder + +[values] + +wall_0_wipe_dist = 0.0 + +infill_overlap_mm = -0.1 +infill_sparse_thickness = =0.4 if infill_sparse_density < 90 else 0.2 +infill_wipe_dist = 0 + +default_material_print_temperature = 190 +material_standby_temperature = 160 +default_material_bed_temperature = 45 +build_volume_temperature = 43 +material_flow = 100 +retraction_amount = 1 +retraction_speed = 40 +retraction_prime_speed = 8 +retraction_extra_prime_amount = 0 +switch_extruder_retraction_amount = 2 + +speed_print = 50 +speed_infill = 42 + +support_infill_sparse_thickness = 0.4 + +coasting_volume = 0.05 +coasting_min_volume = 0.17 +coasting_speed = 100 From 2b6b7a1f815212b1bf022a1cbbf5f1401704799c Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 13 Dec 2019 11:30:34 +0100 Subject: [PATCH 15/35] Fix lost settings on sync to diff printer type When syncing to a different printer type only the global user changes where kept, while the per-extruder user changes were not copied at all, since the extruder list is empty before the new machine becomes active. This commit fixes this problem by keeping a copy of the per-extruder user changes before the new machine (of different type) is activated. The copied user changes are then transfered to the new global stack after the new machine is set as active. CURA-6127 --- cura/Settings/MachineManager.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index f8e609af77..ece3e1ce92 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1257,8 +1257,19 @@ class MachineManager(QObject): new_machine.setMetaDataEntry("hidden", False) self._global_container_stack.setMetaDataEntry("hidden", True) + # The new_machine only has the global user changes and not the per-extruder user changes (since it has an empty + # extruderList before it becomes active). Keep a temporary copy of the per-extruder user changes and transfer + # it to the user changes of the new machine after the new_machine becomes active. + per_extruder_user_changes = {} + for extruder_name, extruder_stack in self._global_container_stack.extruders.items(): + per_extruder_user_changes[extruder_name] = extruder_stack.userChanges + self.setActiveMachine(new_machine.getId()) + # Apply the per-extruder userChanges to the new_machine (which is of different type than the previous one). + for extruder_name in self._global_container_stack.extruders.keys(): + self._global_container_stack.extruders[extruder_name].setUserChanges(per_extruder_user_changes[extruder_name]) + @pyqtSlot(QObject) def applyRemoteConfiguration(self, configuration: PrinterConfigurationModel) -> None: if self._global_container_stack is None: From 409dc98299d15960df42c801e3ac3ae58a6e109a Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Fri, 13 Dec 2019 15:00:22 +0100 Subject: [PATCH 16/35] Keep global settings on sync to diff printer type In addition to the per-extruder user changes, copy the global user changes to the new_machine. CURA-6127 --- cura/Settings/MachineManager.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ece3e1ce92..989a92d8f9 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1257,16 +1257,19 @@ class MachineManager(QObject): new_machine.setMetaDataEntry("hidden", False) self._global_container_stack.setMetaDataEntry("hidden", True) - # The new_machine only has the global user changes and not the per-extruder user changes (since it has an empty - # extruderList before it becomes active). Keep a temporary copy of the per-extruder user changes and transfer - # it to the user changes of the new machine after the new_machine becomes active. + # The new_machine does not contain user changes (global or per-extruder user changes). + # Keep a temporary copy of the global and per-extruder user changes and transfer them to the user changes + # of the new machine after the new_machine becomes active. + global_user_changes = self._global_container_stack.userChanges per_extruder_user_changes = {} for extruder_name, extruder_stack in self._global_container_stack.extruders.items(): per_extruder_user_changes[extruder_name] = extruder_stack.userChanges self.setActiveMachine(new_machine.getId()) - # Apply the per-extruder userChanges to the new_machine (which is of different type than the previous one). + # Apply the global and per-extruder userChanges to the new_machine (which is of different type than the + # previous one). + self._global_container_stack.setUserChanges(global_user_changes) for extruder_name in self._global_container_stack.extruders.keys(): self._global_container_stack.extruders[extruder_name].setUserChanges(per_extruder_user_changes[extruder_name]) From eb54a62eca56b33e864c35ef1ebaac4ab72adc2b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Dec 2019 12:51:14 +0100 Subject: [PATCH 17/35] Add minima for retraction prime speed Otherwise the automated inheritance function makes it negative sometimes. Contributes to issue #6806. --- resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg | 2 +- resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg | 2 +- resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg | 2 +- .../quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index ddbbe9c585..8c6ef45e14 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -35,7 +35,7 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =retraction_speed - 30 +retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index 70975ee918..4a24435343 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -35,7 +35,7 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =retraction_speed - 30 +retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index 99c782dd72..2aa011b3a7 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -35,7 +35,7 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =retraction_speed - 30 +retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index bf01f11518..0faf4ba24d 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -35,7 +35,7 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =retraction_speed - 30 +retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 From a9849be1b22447efc2cab0770856191070641b56 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Dec 2019 12:58:33 +0100 Subject: [PATCH 18/35] Code style: Space around binary operators --- cura/Machines/MaterialNode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index fe20af2cd5..8f04a90204 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -68,13 +68,13 @@ class MaterialNode(ContainerNode): # Need to find the qualities that specify a material profile with the same material type. qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.container_id) # First try by exact material ID. else: - qualities = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition, material=self.container_id) + qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, material = self.container_id) if not qualities: my_material_type = self.material_type if self.variant.machine.has_variants: qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name) else: - qualities_any_material = container_registry.findInstanceContainersMetadata(type="quality", definition = self.variant.machine.quality_definition) + qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition) for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): qualities.extend((quality for quality in qualities_any_material if quality.get("material") == material_metadata["id"])) From d85dcf0d8f0b28aa3ba4f3e579670eb2d31c87b7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Dec 2019 13:00:31 +0100 Subject: [PATCH 19/35] Also set a limit to retraction prime speed for original Jellybox --- .../quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg | 2 +- .../quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg | 2 +- .../quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg | 2 +- .../imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index 572ac9faf5..ef45502137 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -35,7 +35,7 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =retraction_speed - 30 +retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index b9ee4a7ff6..0f02c8936b 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -35,7 +35,7 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =retraction_speed - 30 +retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index ba645b29ae..a32b10b6f0 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -35,7 +35,7 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =retraction_speed - 30 +retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index 8f88311c0f..fcb09608a5 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -35,7 +35,7 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =retraction_speed - 30 +retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 From 1dc39dba71585df90b65e4c77f12a5a889eaa5c0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Dec 2019 13:15:24 +0100 Subject: [PATCH 20/35] Move prime speed override to definition file To reduce the number of overrides. You'd only need to change it in one place, next time. It was being overridden in the quality profile in every supported configuration. --- resources/definitions/imade3d_jellybox.def.json | 4 ++++ resources/definitions/imade3d_jellybox_2.def.json | 4 ++++ .../quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg | 1 - .../quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg | 1 - .../quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg | 1 - .../imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg | 1 - .../quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg | 1 - resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg | 1 - .../quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg | 1 - .../quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg | 1 - 10 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index 635cb1fdd0..87f9155974 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -28,6 +28,10 @@ }, "machine_end_gcode": { "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" + }, + + "retraction_prime_speed": { + "value": "max(retraction_speed - 30, 5)" } } } diff --git a/resources/definitions/imade3d_jellybox_2.def.json b/resources/definitions/imade3d_jellybox_2.def.json index 7d7b82e194..5fddf4e80d 100644 --- a/resources/definitions/imade3d_jellybox_2.def.json +++ b/resources/definitions/imade3d_jellybox_2.def.json @@ -31,6 +31,10 @@ }, "machine_end_gcode": { "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" + }, + + "retraction_prime_speed": { + "value": "max(retraction_speed - 30, 5)" } } } diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index ef45502137..e16c7742a7 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index 0f02c8936b..720ac1bc21 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index a32b10b6f0..1b21e17bb0 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index fcb09608a5..5cc0d2891f 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index 8c6ef45e14..8480d89044 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index 4a24435343..35764ec9e6 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index 2aa011b3a7..984bdad44f 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index 0faf4ba24d..dec5ec9af0 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 From a7e4d76d05e9ac7d9088ac882d15221936052010 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 24 Oct 2019 18:36:25 +0200 Subject: [PATCH 21/35] make lithophane alpha channel control total final width multiplier. That way the picture is not always square. We can use the alpha channel to encode the actual shape --- plugins/ImageReader/ImageReader.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index d6c2827d16..7fb13e915c 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -5,7 +5,7 @@ import numpy import math -from PyQt5.QtGui import QImage, qRed, qGreen, qBlue +from PyQt5.QtGui import QImage, qRed, qGreen, qBlue, qAlpha from PyQt5.QtCore import Qt from UM.Mesh.MeshReader import MeshReader @@ -138,6 +138,11 @@ class ImageReader(MeshReader): height_data *= scale_vector.y height_data += base_height + if img.hasAlphaChannel(): + for x in range(0, width): + for y in range(0, height): + height_data[y, x] *= qAlpha(img.pixel(x, y)) / 255.0 + heightmap_face_count = 2 * height_minus_one * width_minus_one total_face_count = heightmap_face_count + (width_minus_one * 2) * (height_minus_one * 2) + 2 From 678ba61bca569325322ad68d399927675073c7a9 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Mon, 16 Dec 2019 12:55:08 +0000 Subject: [PATCH 22/35] Add brim gap setting (#6279) Added brim_gap setting to space brim away from edge of model. --- resources/definitions/fdmprinter.def.json | 14 ++++++++++++++ resources/setting_visibility/expert.cfg | 1 + 2 files changed, 15 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 394342a316..7b878a3ea2 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5154,6 +5154,20 @@ } } }, + "brim_gap": + { + "label": "Brim Distance", + "description": "The horizontal distance between the first brim line and the outline of the first layer of the print. A small gap can make the brim easier to remove while still providing the thermal benefits.", + "unit": "mm", + "type": "float", + "default_value": 0, + "minimum_value": "0", + "maximum_value_warning": "skirt_brim_line_width", + "enabled": "resolveOrValue('adhesion_type') == 'brim'", + "settable_per_mesh": true, + "settable_per_extruder": true, + "limit_to_extruder": "adhesion_extruder_nr" + }, "brim_replaces_support": { "label": "Brim Replaces Support", diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 7b24934b0d..76f8d5dd1f 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -285,6 +285,7 @@ skirt_line_count skirt_gap skirt_brim_minimal_length brim_width +brim_gap brim_line_count brim_outside_only raft_margin From 3ddc2466f8b961c902f2c5da2895ab8433dff6db Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 10:26:43 +0100 Subject: [PATCH 23/35] Fix typing --- plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py index bfc2725fb0..466638d99e 100644 --- a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py +++ b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py @@ -123,7 +123,9 @@ class ZeroConfClient: # Request more data if info is not complete if not info.address: - info = zero_conf.get_service_info(service_type, name) + new_info = zero_conf.get_service_info(service_type, name) + if new_info is not None: + info = new_info if info and info.address: type_of_device = info.properties.get(b"type", None) From dd5c6c892c88f9e673017c9c3c97af3bc176dcb5 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 10:35:23 +0100 Subject: [PATCH 24/35] chmod 644 for def.json files --- resources/definitions/deltacomb.def.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 resources/definitions/deltacomb.def.json diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json old mode 100755 new mode 100644 From bec513aa8a8c408cc7c9301659d7e846b581d3eb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Dec 2019 10:35:34 +0100 Subject: [PATCH 25/35] Alternatively allow backspace to delete selection I thought we already had this? Fixes #6475. --- resources/qml/Actions.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 7e6afa813d..e5b39c6ba5 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -258,7 +258,7 @@ Item text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete Selected Model", "Delete Selected Models", UM.Selection.selectionCount); enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection; iconName: "edit-delete"; - shortcut: StandardKey.Delete; + shortcut: StandardKey.Delete | "Backspace" onTriggered: CuraActions.deleteSelection(); } From 1e851647bef1d297ea2955e9c524f9c34b3ee58d Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Tue, 17 Dec 2019 10:57:57 +0100 Subject: [PATCH 26/35] ABS_04&06_support_tuning --- .../strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg | 8 ++++---- .../strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg | 8 ++++---- .../strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg | 6 +++--- .../strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg | 6 +++--- .../strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg | 6 +++--- .../strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index a3260a32f4..fa243ce947 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -28,18 +28,18 @@ cool_fan_speed = 35 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height cool_min_speed = 10 support_angle = 65 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 98 +material_flow = 100 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 10 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 1.7 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index 648ec5520c..2758c3714e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -28,18 +28,18 @@ cool_fan_speed = 35 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height cool_min_speed = 10 support_angle = 60 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +material_flow = 96 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 15 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 1.7 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index e3fe5f49fc..3928ddf541 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -28,7 +28,7 @@ cool_fan_speed = 35 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature + 10 @@ -38,8 +38,8 @@ retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 20 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 1.7 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index 517a0d9943..e8a638130e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -33,13 +33,13 @@ cool_min_speed = 10 support_angle = 55 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 100 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 1.7 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index 0a55c5fef6..9aafd905a0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -33,13 +33,13 @@ cool_min_speed = 10 support_angle = 50 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +material_flow = 98 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 1.7 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 6128889e8c..99216e271e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -33,13 +33,13 @@ cool_min_speed = 10 support_angle = 45 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 93 +material_flow = 96 retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 1.7 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 From 97d21a80133c2220d286b2dfe567e4e099f60956 Mon Sep 17 00:00:00 2001 From: KOUBeMT <51325289+KOUBeMT@users.noreply.github.com> Date: Tue, 17 Dec 2019 11:07:15 +0100 Subject: [PATCH 27/35] Adding_ASA-X_profiles --- .../Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg | 47 +++++++++++++++++++ .../Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg | 47 +++++++++++++++++++ .../Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg | 47 +++++++++++++++++++ .../Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg | 14 +++--- .../Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg | 14 +++--- .../Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg | 16 +++---- .../Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg | 47 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg | 47 +++++++++++++++++++ .../Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg | 47 +++++++++++++++++++ 9 files changed, 304 insertions(+), 22 deletions(-) create mode 100644 resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg create mode 100644 resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg new file mode 100644 index 0000000000..d21fb10dfc --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = a +weight = 1 +material = emotiontech_asax +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg new file mode 100644 index 0000000000..53e509f1aa --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = b +weight = 0 +material = emotiontech_asax +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 96 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg new file mode 100644 index 0000000000..4085bf9386 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = c +weight = -1 +material = emotiontech_asax +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 7 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg index af9b874470..d9426a5fab 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -25,22 +25,22 @@ speed_layer_0 = =math.ceil(speed_print * 25/50) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 40 -cool_fan_speed_max = 100 +cool_fan_speed_max = 75 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_min_speed = 10 support_angle = 60 -material_print_temperature = =default_material_print_temperature + 2 -material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 101 +retraction_extra_prime_amount = 0.2 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 support_z_distance = =layer_height support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 1.7 +support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 support_interface_density = 100 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg index 1ee8fcd291..b6d253cae1 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -21,20 +21,20 @@ speed_print = 55 speed_wall = =math.ceil(speed_print * 40/55) speed_wall_0 = =math.ceil(speed_wall * 33/40) speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 40 -cool_fan_speed_max = 100 +cool_fan_speed_max = 75 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_min_speed = 10 support_angle = 55 -material_print_temperature = =default_material_print_temperature + 5 -material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 99 +retraction_extra_prime_amount = 0.2 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg index 9922045d01..80caf07684 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -6,7 +6,7 @@ definition = strateo3d [metadata] setting_version = 10 type = quality -quality_type = d +quality_type = d weight = -1 material = emotiontech_asax variant = Standard 0.6 @@ -21,20 +21,20 @@ speed_print = 60 speed_wall = =math.ceil(speed_print * 43/60) speed_wall_0 = =math.ceil(speed_wall * 35/45) speed_topbottom = =math.ceil(speed_print * 40/60) -speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_layer_0 = =math.ceil(speed_print * 25/60) speed_slowdown_layers = 2 cool_fan_enabled = True cool_fan_speed = 40 -cool_fan_speed_max = 100 +cool_fan_speed_max = 75 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_min_speed = 10 support_angle = 50 -material_print_temperature = =default_material_print_temperature + 8 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 93 -retraction_extra_prime_amount = 0.1 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 7 +material_flow = 97 +retraction_extra_prime_amount = 0.2 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True skin_overlap = 5 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg new file mode 100644 index 0000000000..a6d7f320f9 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = c +weight = 1 +material = emotiontech_asax +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 33/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg new file mode 100644 index 0000000000..01f668d41f --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = d +weight = 0 +material = emotiontech_asax +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 33/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 96 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg new file mode 100644 index 0000000000..367da4f58a --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 10 +type = quality +quality_type = e +weight = -1 +material = emotiontech_asax +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 33/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 7 +material_flow = 95 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file From c1aa556a591cbcd712285c6a7cea98da8cec0eed Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 11:21:19 +0100 Subject: [PATCH 28/35] chmod 644 *.inst.cfg --- resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg | 0 .../quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg | 0 .../quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg | 0 .../quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg | 0 .../quality/deltacomb/deltacomb_global_High_Quality.inst.cfg | 0 .../quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg | 0 .../quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg | 0 .../quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg | 0 resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg | 0 .../quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg | 0 resources/variants/deltacomb_025_e3d.inst.cfg | 0 resources/variants/deltacomb_040_e3d.inst.cfg | 0 resources/variants/deltacomb_080_e3d.inst.cfg | 0 23 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg mode change 100755 => 100644 resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg mode change 100755 => 100644 resources/variants/deltacomb_025_e3d.inst.cfg mode change 100755 => 100644 resources/variants/deltacomb_040_e3d.inst.cfg mode change 100755 => 100644 resources/variants/deltacomb_080_e3d.inst.cfg diff --git a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/variants/deltacomb_025_e3d.inst.cfg b/resources/variants/deltacomb_025_e3d.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/variants/deltacomb_040_e3d.inst.cfg b/resources/variants/deltacomb_040_e3d.inst.cfg old mode 100755 new mode 100644 diff --git a/resources/variants/deltacomb_080_e3d.inst.cfg b/resources/variants/deltacomb_080_e3d.inst.cfg old mode 100755 new mode 100644 From 88196fa62bae3ebec563d6df625edb84bbb334dc Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 11:36:42 +0100 Subject: [PATCH 29/35] Correct GH Actions steps name --- .github/workflows/cicd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 3a0b57d714..54747e55af 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest container: ultimaker/cura-build-environment steps: - - name: Checkout master + - name: Checkout code uses: actions/checkout@v1.2.0 - name: Build and test run: docker/build.sh From 208ab6421f76fdb5f98d5e3b256b9ead4ab92fbf Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 11:49:24 +0100 Subject: [PATCH 30/35] WIP: Fix fetching Uranium --- .github/workflows/cicd.yml | 23 ++++++++++++++++++++--- docker/build.sh | 3 ++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 54747e55af..7029475573 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -1,6 +1,6 @@ --- -name: CI/CD -on: [push, pull_request] +name: CI/CD for push +on: push jobs: build: name: Build and test @@ -8,6 +8,23 @@ jobs: container: ultimaker/cura-build-environment steps: - name: Checkout code - uses: actions/checkout@v1.2.0 + uses: actions/checkout@v1 - name: Build and test + env: + GIT_REF_NAME: github.ref + run: docker/build.sh + +name: CI/CD for pull_request +on: pull_request +jobs: + build: + name: Build and test + runs-on: ubuntu-latest + container: ultimaker/cura-build-environment + steps: + - name: Checkout code + uses: actions/checkout@v1 + - name: Build and test + env: + GIT_REF_NAME: github.base_ref run: docker/build.sh diff --git a/docker/build.sh b/docker/build.sh index eb20b18c0d..a772c00509 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -20,7 +20,8 @@ cd "${PROJECT_DIR}" # Check the branch to use: # 1. Use the Uranium branch with the branch same if it exists. # 2. Otherwise, use the default branch name "master" -URANIUM_BRANCH="${CI_COMMIT_REF_NAME:-master}" +echo "GIT_REF_NAME: ${GIT_REF_NAME}" +URANIUM_BRANCH="${GIT_REF_NAME:-master}" output="$(git ls-remote --heads https://github.com/Ultimaker/Uranium.git "${URANIUM_BRANCH}")" if [ -z "${output}" ]; then echo "Could not find Uranium banch ${URANIUM_BRANCH}, fallback to use master." From dc7ec41b12732b5ff8c0d02e4df7ca37e84a9069 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 11:55:06 +0100 Subject: [PATCH 31/35] WIP: Fix fetching Uranium --- .github/workflows/cicd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 7029475573..50e38ac319 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -1,6 +1,6 @@ --- name: CI/CD for push -on: push +on: [push] jobs: build: name: Build and test @@ -15,7 +15,7 @@ jobs: run: docker/build.sh name: CI/CD for pull_request -on: pull_request +on: [pull_request] jobs: build: name: Build and test From d12edaff10212d61e8f9aab749738da3b75a1db4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 11:57:36 +0100 Subject: [PATCH 32/35] WIP: Fix fetching Uranium --- .github/workflows/cicd.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 50e38ac319..dbc247c94c 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -1,30 +1,15 @@ --- -name: CI/CD for push -on: [push] +name: CI/CD +on: [push, pull_request] jobs: build: name: Build and test runs-on: ubuntu-latest container: ultimaker/cura-build-environment steps: - - name: Checkout code + - name: Checkout master uses: actions/checkout@v1 - name: Build and test env: GIT_REF_NAME: github.ref run: docker/build.sh - -name: CI/CD for pull_request -on: [pull_request] -jobs: - build: - name: Build and test - runs-on: ubuntu-latest - container: ultimaker/cura-build-environment - steps: - - name: Checkout code - uses: actions/checkout@v1 - - name: Build and test - env: - GIT_REF_NAME: github.base_ref - run: docker/build.sh From de9a07e6c1721130fe48ae3a0205395ad5998b31 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 12:22:24 +0100 Subject: [PATCH 33/35] WIP: Fix GH Actions for Uranium fetching --- .github/workflows/cicd.yml | 6 ++---- docker/build.sh | 9 ++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index dbc247c94c..5e1e5aa6bb 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -7,9 +7,7 @@ jobs: runs-on: ubuntu-latest container: ultimaker/cura-build-environment steps: - - name: Checkout master - uses: actions/checkout@v1 + - name: Checkout Cura + uses: actions/checkout@v2 - name: Build and test - env: - GIT_REF_NAME: github.ref run: docker/build.sh diff --git a/docker/build.sh b/docker/build.sh index a772c00509..4510692bf2 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -20,7 +20,14 @@ cd "${PROJECT_DIR}" # Check the branch to use: # 1. Use the Uranium branch with the branch same if it exists. # 2. Otherwise, use the default branch name "master" -echo "GIT_REF_NAME: ${GIT_REF_NAME}" +echo "GITHUB_REF: ${GITHUB_REF}" +echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" + +GIT_REF_NAME="${GITHUB_REF}" +if [ -n "${GITHUB_BASE_REF}" ]; then + GIT_REF_NAME="${GITHUB_BASE_REF}" +fi + URANIUM_BRANCH="${GIT_REF_NAME:-master}" output="$(git ls-remote --heads https://github.com/Ultimaker/Uranium.git "${URANIUM_BRANCH}")" if [ -z "${output}" ]; then From 7f053c8d2a7104b6ed255c8dc933b66c22cd28e0 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 12:35:41 +0100 Subject: [PATCH 34/35] WIP: Fix git ref --- docker/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/build.sh b/docker/build.sh index 4510692bf2..6aa0678ca3 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -27,6 +27,7 @@ GIT_REF_NAME="${GITHUB_REF}" if [ -n "${GITHUB_BASE_REF}" ]; then GIT_REF_NAME="${GITHUB_BASE_REF}" fi +GIT_REF_NAME="$(basename "${GIT_REF_NAME}")" URANIUM_BRANCH="${GIT_REF_NAME:-master}" output="$(git ls-remote --heads https://github.com/Ultimaker/Uranium.git "${URANIUM_BRANCH}")" From 1eada1dc9b45593b5672630355c81c3ccde59c85 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 17 Dec 2019 15:26:14 +0100 Subject: [PATCH 35/35] Update setting_version to 11 for Strateo3d CURA-7064 --- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg | 2 +- .../quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg | 2 +- resources/variants/strateo3d_standard_08.inst.cfg | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg index d21fb10dfc..c7b9601440 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg index 53e509f1aa..7d2c005f28 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg index 4085bf9386..d592765117 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg index 4c56a210fc..328f04fec1 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg index bcaf489224..a048c11fdd 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg index d27d5f0ff4..01bb49f618 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg index 2e417e008c..147834624c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg index 166e075a56..4f6311060c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg index 69681ea613..2da232d025 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg index a6d7f320f9..e13913f419 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg index 01f668d41f..a613887dc2 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg index 367da4f58a..a80f8bb385 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg index 938fe0ad32..9e4e41ae27 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg index 4fd317e6db..f04fcffc72 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg index a3be4ef0b3..667dc5729f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg index 2f1e5a72e9..e24349e951 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg index 3b81e41671..eba42df137 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg index ef67be17d2..89a72ef41b 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg index 517a3ecb37..fbc0327d8a 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg index 78956eb485..9cda918354 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg index d4a0c49945..ac3773e194 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg index 5a2b13297c..c2e9f81da1 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg index 11beb17513..6881b7deff 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg index 04152b5b01..7e604c7705 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = quality quality_type = e weight = -1 diff --git a/resources/variants/strateo3d_standard_08.inst.cfg b/resources/variants/strateo3d_standard_08.inst.cfg index 5198f7d1db..886babdc5e 100644 --- a/resources/variants/strateo3d_standard_08.inst.cfg +++ b/resources/variants/strateo3d_standard_08.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 10 +setting_version = 11 type = variant hardware_type = nozzle