diff --git a/resources/definitions/anycubic_i3_mega.def.json b/resources/definitions/anycubic_i3_mega.def.json index cdf29ef4c1..a0bd0efb7c 100644 --- a/resources/definitions/anycubic_i3_mega.def.json +++ b/resources/definitions/anycubic_i3_mega.def.json @@ -9,7 +9,7 @@ "file_formats":"text/x-gcode", "icon":"icon_ultimaker2", "platform":"anycubic_i3_mega_platform.stl", - "has_materials": true, + "has_materials": false, "has_machine_quality": true, "preferred_quality": "*normal*" }, @@ -40,7 +40,7 @@ "default_value":1.75 }, "gantry_height":{ - "default_value":0 + "default_value":0 }, "machine_gcode_flavor":{ "default_value":"RepRap (Marlin/Sprinter)" diff --git a/resources/definitions/tevo_blackwidow.def.json b/resources/definitions/tevo_blackwidow.def.json index f31bbcff23..19ef2a45e2 100644 --- a/resources/definitions/tevo_blackwidow.def.json +++ b/resources/definitions/tevo_blackwidow.def.json @@ -8,7 +8,10 @@ "manufacturer": "Tevo", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", - "platform": "prusai3_platform.stl" + "has_materials": false, + "has_machine_quality": true, + "platform": "prusai3_platform.stl", + "preferred_quality": "*normal*" }, "overrides": { "machine_name": { @@ -33,7 +36,7 @@ "default_value": 0.4 }, "material_diameter": { - "default_value": 1.75 + "default_value": 1.75 }, "gantry_height": { "default_value": 0 @@ -41,12 +44,6 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "speed_travel": { - "default_value": 70 - }, - "speed_print": { - "default_value": 60 - }, "machine_start_gcode": { "default_value": "M280 P0 S160 ; release BLTouch alarm (OK to send for Non BLTouch)\M420 Z2 ; set fade leveling at 2mm for BLTouch (OK to send for Non BLTouch)\G28 ; home all\G29 ; probe bed\G92 E0 ;zero the extruded length\G1 X0.0 Y50.0 Z10.0 F3600\; perform wipe and prime\G1 Z0.0 F1000\G1 Z0.2 Y70.0 E9.0 F1000.0 ; prime\G1 Y100.0 E12.5 F1000.0 ; prime\G92 E0 ; zero extruder again\M117 Printing..." }, diff --git a/resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_coarse.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg similarity index 83% rename from resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_coarse.inst.cfg rename to resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg index c4f6f5ecae..e46fb38e57 100644 --- a/resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_coarse.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg @@ -1,12 +1,11 @@ [general] version = 2 -name = Coarse +name = Draft definition = anycubic_i3_mega [metadata] type = quality -quality_type = coarse -material = generic_pla_175 +quality_type = draft weight = 0 setting_version = 4 @@ -15,16 +14,19 @@ acceleration_enabled = True acceleration_print = 2000 acceleration_travel = 3500 adhesion_type = skirt +brim_width = 4.0 cool_fan_full_at_height = 0.5 cool_fan_speed = 100 cool_fan_speed_0 = 100 infill_overlap = 15 +infill_pattern = zigzag infill_sparse_density = 25 initial_layer_line_width_factor = 140 jerk_enabled = True jerk_print = 13 jerk_travel = 13 -layer_height_0 = 0.3 +layer_height = 0.4 +layer_height_0 = 0.4 material_bed_temperature = 60 material_diameter = 1.7 material_print_temperature = 200 @@ -47,13 +49,12 @@ speed_travel = 100 speed_wall = 60 speed_wall_x = 60 support_angle = 60 -support_enable = False -support_interface_enable = False +support_enable = True +support_interface_enable = True support_pattern = triangles -support_roof_enable = False +support_roof_enable = True support_type = everywhere +support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 -wall_thickness = 1.2 -infill_pattern = zigzag -support_use_towers = False \ No newline at end of file +wall_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_Coarse_Quality.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_Coarse_Quality.inst.cfg deleted file mode 100644 index 721aa4f25b..0000000000 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_Coarse_Quality.inst.cfg +++ /dev/null @@ -1,43 +0,0 @@ -[general] -version = 2 -name = Coarse -definition = anycubic_i3_mega - -[metadata] -type = quality -quality_type = coarse -global_quality = True -weight = -3 -setting_version = 4 - -[values] -layer_height = 0.4 -layer_height_0 = =layer_height - -skin_angles = [0,90] - -infill_before_walls = False -infill_angles = [0,90] - -speed_slowdown_layers = 1 -acceleration_print = 2000 -acceleration_travel = 3000 -jerk_print = 13 -jerk_travel = 13 - -retraction_combing = off - -support_z_distance = 0 -support_xy_distance = 0.7 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = triangles - -adhesion_type = skirt -skirt_gap = 1 -speed_infill = 50 -speed_print = 50 -speed_support = 30 -speed_topbottom = 20 -speed_travel = 100 -speed_wall = 50 \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_High_Quality.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_High_Quality.inst.cfg deleted file mode 100644 index e69d70828d..0000000000 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_High_Quality.inst.cfg +++ /dev/null @@ -1,43 +0,0 @@ -[general] -version = 2 -name = High -definition = anycubic_i3_mega - -[metadata] -type = quality -quality_type = high -global_quality = True -weight = 1 -setting_version = 4 - -[values] -layer_height = 0.1 -layer_height_0 = =0.2 if min(extruderValues('machine_nozzle_size')) < 0.3 else 0.3 - -skin_angles = [0,90] - -infill_before_walls = False -infill_angles = [0,90] - -speed_slowdown_layers = 1 -acceleration_print = 2000 -acceleration_travel = 3000 -jerk_print = 13 -jerk_travel = 13 - -retraction_combing = off - -support_z_distance = 0 -support_xy_distance = 0.7 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = triangles - -adhesion_type = skirt -skirt_gap = 1 -speed_infill = 50 -speed_print = 50 -speed_support = 30 -speed_topbottom = 20 -speed_travel = 50 -speed_wall = 50 \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_Normal_Quality.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_Normal_Quality.inst.cfg deleted file mode 100644 index bab515eae4..0000000000 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_global_Normal_Quality.inst.cfg +++ /dev/null @@ -1,43 +0,0 @@ -[general] -version = 2 -name = Normal -definition = anycubic_i3_mega - -[metadata] -type = quality -quality_type = normal -global_quality = True -weight = 0 -setting_version = 4 - -[values] -layer_height = 0.2 -layer_height_0 = =0.2 if min(extruderValues('machine_nozzle_size')) < 0.3 else 0.3 - -skin_angles = [0,90] - -infill_before_walls = False -infill_angles = [0,90] - -speed_slowdown_layers = 1 -acceleration_print = 2000 -acceleration_travel = 3000 -jerk_print = 13 -jerk_travel = 13 - -retraction_combing = off - -support_z_distance = 0 -support_xy_distance = 0.7 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = triangles - -adhesion_type = skirt -skirt_gap = 1 -speed_infill = 60 -speed_print = 60 -speed_support = 60 -speed_topbottom = 30 -speed_travel = 60 -speed_wall = 60 \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_high.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg similarity index 85% rename from resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_high.inst.cfg rename to resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg index 009bd89c16..0dcedf664e 100644 --- a/resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_high.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg @@ -6,7 +6,6 @@ definition = anycubic_i3_mega [metadata] type = quality quality_type = high -material = generic_pla_175 weight = 2 setting_version = 4 @@ -15,16 +14,19 @@ acceleration_enabled = True acceleration_print = 2000 acceleration_travel = 3500 adhesion_type = skirt +brim_width = 4.0 cool_fan_full_at_height = 0.5 cool_fan_speed = 100 cool_fan_speed_0 = 100 infill_overlap = 15 +infill_pattern = zigzag infill_sparse_density = 25 initial_layer_line_width_factor = 140 jerk_enabled = True jerk_print = 13 jerk_travel = 13 -layer_height_0 = 0.3 +layer_height = 0.1 +layer_height_0 = 0.1 material_bed_temperature = 60 material_diameter = 1.7 material_print_temperature = 200 @@ -47,13 +49,12 @@ speed_travel = 50 speed_wall = 50 speed_wall_x = 50 support_angle = 60 -support_enable = False -support_interface_enable = False +support_enable = True +support_interface_enable = True support_pattern = triangles -support_roof_enable = False +support_roof_enable = True support_type = everywhere +support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 -wall_thickness = 1.2 -infill_pattern = zigzag -support_use_towers = False \ No newline at end of file +wall_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_normal.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg similarity index 85% rename from resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_normal.inst.cfg rename to resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg index 907b95fb71..d528e5f86f 100644 --- a/resources/quality/anycubic_i3_mega/pla/anycubic_i3_mega_pla_normal.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg @@ -6,7 +6,6 @@ definition = anycubic_i3_mega [metadata] type = quality quality_type = normal -material = generic_pla_175 weight = 1 setting_version = 4 @@ -15,16 +14,19 @@ acceleration_enabled = True acceleration_print = 2000 acceleration_travel = 3500 adhesion_type = skirt +brim_width = 4.0 cool_fan_full_at_height = 0.5 cool_fan_speed = 100 cool_fan_speed_0 = 100 infill_overlap = 15 +infill_pattern = zigzag infill_sparse_density = 25 initial_layer_line_width_factor = 140 jerk_enabled = True jerk_print = 13 jerk_travel = 13 -layer_height_0 = 0.3 +layer_height = 0.2 +layer_height_0 = 0.2 material_bed_temperature = 60 material_diameter = 1.7 material_print_temperature = 200 @@ -47,13 +49,12 @@ speed_travel = 100 speed_wall = 50 speed_wall_x = 50 support_angle = 60 -support_enable = False -support_interface_enable = False +support_enable = True +support_interface_enable = True support_pattern = triangles -support_roof_enable = False +support_roof_enable = True support_type = everywhere +support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 -wall_thickness = 1.2 -infill_pattern = zigzag -support_use_towers = False \ No newline at end of file +wall_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_coarse.inst.cfg b/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_coarse.inst.cfg deleted file mode 100644 index 682e198f78..0000000000 --- a/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_coarse.inst.cfg +++ /dev/null @@ -1,59 +0,0 @@ -[general] -version = 2 -name = Coarse -definition = anycubic_i3_mega - -[metadata] -type = quality -quality_type = coarse -material = generic_petg_175 -weight = 1 -setting_version = 4 - -[values] -acceleration_enabled = True -acceleration_print = 2000 -acceleration_travel = 3500 -adhesion_type = skirt -cool_fan_full_at_height = 0.5 -cool_fan_speed = 50 -cool_fan_speed_0 = 50 -infill_overlap = 15 -infill_sparse_density = 25 -initial_layer_line_width_factor = 140 -jerk_enabled = True -jerk_print = 13 -jerk_travel = 13 -layer_height_0 = 0.2 -material_bed_temperature = 80 -material_diameter = 1.7 -material_print_temperature = 230 -material_print_temperature_layer_0 = 0 -retract_at_layer_change = False -retraction_amount = 4.5 -retraction_hop = 0.075 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 1.5 -retraction_speed = 60 -skirt_brim_speed = 40 -skirt_gap = 5 -skirt_line_count = 3 -speed_infill = 60 -speed_print = 60 -speed_support = 30 -speed_topbottom = 30 -speed_travel = 100 -speed_wall = 60 -speed_wall_x = 60 -support_angle = 60 -support_enable = False -support_interface_enable = False -support_pattern = triangles -support_roof_enable = False -support_type = everywhere -support_xy_distance = 0.7 -top_bottom_thickness = 1.2 -wall_thickness = 1.2 -infill_pattern = zigzag -support_use_towers = False \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_high.inst.cfg b/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_high.inst.cfg deleted file mode 100644 index 5a22a4c0b2..0000000000 --- a/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_high.inst.cfg +++ /dev/null @@ -1,59 +0,0 @@ -[general] -version = 2 -name = High -definition = anycubic_i3_mega - -[metadata] -type = quality -quality_type = high -material = generic_petg_175 -weight = 3 -setting_version = 4 - -[values] -acceleration_enabled = True -acceleration_print = 2000 -acceleration_travel = 3500 -adhesion_type = skirt -cool_fan_full_at_height = 0.5 -cool_fan_speed = 50 -cool_fan_speed_0 = 50 -infill_overlap = 15 -infill_sparse_density = 25 -initial_layer_line_width_factor = 140 -jerk_enabled = True -jerk_print = 13 -jerk_travel = 13 -layer_height_0 = 0.2 -material_bed_temperature = 80 -material_diameter = 1.7 -material_print_temperature = 230 -material_print_temperature_layer_0 = 0 -retract_at_layer_change = False -retraction_amount = 4.5 -retraction_hop = 0.075 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 1.5 -retraction_speed = 60 -skirt_brim_speed = 40 -skirt_gap = 5 -skirt_line_count = 3 -speed_infill = 50 -speed_print = 50 -speed_support = 30 -speed_topbottom = 20 -speed_travel = 50 -speed_wall = 50 -speed_wall_x = 50 -support_angle = 60 -support_enable = False -support_interface_enable = False -support_pattern = triangles -support_roof_enable = False -support_type = everywhere -support_xy_distance = 0.7 -top_bottom_thickness = 1.2 -wall_thickness = 1.2 -infill_pattern = zigzag -support_use_towers = False \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_normal.inst.cfg b/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_normal.inst.cfg deleted file mode 100644 index dfe39f87f2..0000000000 --- a/resources/quality/anycubic_i3_mega/petg/anycubic_i3_mega_petg_normal.inst.cfg +++ /dev/null @@ -1,59 +0,0 @@ -[general] -version = 2 -name = Normal -definition = anycubic_i3_mega - -[metadata] -type = quality -quality_type = normal -material = generic_petg_175 -weight = 2 -setting_version = 4 - -[values] -acceleration_enabled = True -acceleration_print = 2000 -acceleration_travel = 3500 -adhesion_type = skirt -cool_fan_full_at_height = 0.5 -cool_fan_speed = 50 -cool_fan_speed_0 = 50 -infill_overlap = 15 -infill_sparse_density = 25 -initial_layer_line_width_factor = 140 -jerk_enabled = True -jerk_print = 13 -jerk_travel = 13 -layer_height_0 = 0.2 -material_bed_temperature = 80 -material_diameter = 1.7 -material_print_temperature = 230 -material_print_temperature_layer_0 = 0 -retract_at_layer_change = False -retraction_amount = 4.5 -retraction_hop = 0.075 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 1.5 -retraction_speed = 60 -skirt_brim_speed = 40 -skirt_gap = 5 -skirt_line_count = 3 -speed_infill = 60 -speed_print = 60 -speed_support = 30 -speed_topbottom = 30 -speed_travel = 100 -speed_wall = 60 -speed_wall_x = 60 -support_angle = 60 -support_enable = False -support_interface_enable = False -support_pattern = triangles -support_roof_enable = False -support_type = everywhere -support_xy_distance = 0.7 -top_bottom_thickness = 1.2 -wall_thickness = 1.2 -infill_pattern = zigzag -support_use_towers = False \ No newline at end of file diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg new file mode 100644 index 0000000000..21169e428b --- /dev/null +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 2 +name = Draft +definition = tevo_blackwidow + +[metadata] +type = quality +quality_type = draft +weight = -2 +setting_version = 4 + +[values] +brim_width = 4.0 +infill_pattern = zigzag +layer_height = 0.4 +material_diameter = 1.7 +speed_infill = 50 +speed_print = 50 +speed_support = 30 +speed_topbottom = 20 +speed_travel = 100 +speed_wall = 50 +speed_wall_x = 50 +support_angle = 60 +support_enable = True +support_interface_enable = True +support_pattern = triangles +support_roof_enable = True +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.7 +top_bottom_thickness = 1.2 +wall_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg new file mode 100644 index 0000000000..60f51b6826 --- /dev/null +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 2 +name = High +definition = tevo_blackwidow + +[metadata] +type = quality +quality_type = high +weight = 1 +setting_version = 4 + +[values] +brim_width = 4.0 +infill_pattern = zigzag +layer_height = 0.1 +material_diameter = 1.7 +speed_infill = 50 +speed_print = 50 +speed_support = 30 +speed_topbottom = 15 +speed_travel = 100 +speed_wall = 50 +speed_wall_x = 50 +support_angle = 60 +support_enable = True +support_interface_enable = True +support_pattern = triangles +support_roof_enable = True +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.7 +top_bottom_thickness = 1.2 +wall_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg new file mode 100644 index 0000000000..51f5894885 --- /dev/null +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg @@ -0,0 +1,33 @@ +[general] +version = 2 +name = Normal +definition = tevo_blackwidow + +[metadata] +type = quality +quality_type = normal +weight = 0 +setting_version = 4 + +[values] +brim_width = 4.0 +infill_pattern = zigzag +layer_height = 0.2 +material_diameter = 1.7 +speed_infill = 60 +speed_print = 50 +speed_support = 30 +speed_topbottom = 20 +speed_travel = 100 +speed_wall = 50 +speed_wall_x = 50 +support_angle = 60 +support_enable = True +support_interface_enable = True +support_pattern = triangles +support_roof_enable = True +support_type = everywhere +support_use_towers = False +support_xy_distance = 0.7 +top_bottom_thickness = 1.2 +wall_thickness = 1.2 \ No newline at end of file