From 21c5469ce21a31229110bef83a5df91ccc7a03b6 Mon Sep 17 00:00:00 2001 From: Demetrius Apostolopoulos <75643490+dapostol73@users.noreply.github.com> Date: Tue, 19 Oct 2021 12:05:56 -0700 Subject: [PATCH] Eryone Thinker Profile Definition & Quality Clean up Move all the Normal settings into the core definitions Move share setting into definition to reduce redundant values for quality profiles Remove values from definition that match the default fdmprinter definition for easier maintence. Change definition to only support Monotonic order on top Roof layer. --- resources/definitions/eryone_thinker.def.json | 292 +++++++++--------- .../eryone_thinker_extra_fast.inst.cfg | 8 - .../eryone_thinker_fast.inst.cfg | 8 - .../eryone_thinker_fine.inst.cfg | 8 - .../eryone_thinker_high.inst.cfg | 8 - .../eryone_thinker_normal.inst.cfg | 17 - 6 files changed, 147 insertions(+), 194 deletions(-) diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json index 1dff099363..c3a929dbda 100644 --- a/resources/definitions/eryone_thinker.def.json +++ b/resources/definitions/eryone_thinker.def.json @@ -54,7 +54,7 @@ "value": 30 }, "machine_gcode_flavor": { - "default_value": "Marlin" + "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z10.0 F600 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y-3 F1200 ;move to prime\nG1 X10 F1200 ;\nG1 Z0.1 F600 ;get ready to prime\nG1 X120 E15 F1200 ;prime nozzle \nG1 X120 F3600 ;quick wipe\nG92 E0 ;zero the extruded length\nM413 S1 ;enable resume from power failure\nM117 Printing..." @@ -62,6 +62,112 @@ "machine_end_gcode": { "default_value": "M104 S0 ;turn off extruder\nM140 S0 ;turn off bed\nM107 ;turn off all fans\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y250 F4800 ; position for easy part removal\nM84 ;steppers off" }, + "layer_height_0": { + "value": "max(0.1, min(extruderValues('layer_height')))" + }, + "layer_height": { + "value": 0.2 + }, + "initial_layer_line_width_factor": { + "value": 120 + }, + "wall_line_count": { + "value": 3 + }, + "wall_thickness": { + "value": "line_width * wall_line_count" + }, + "optimize_wall_printing_order": { + "default_value": true + }, + "outer_inset_first": { + "default_value": false + }, + "z_seam_type": { + "value": "'shortest'" + }, + "z_seam_corner": { + "value": "'z_seam_corner_inner'" + }, + "roofing_layer_count": { + "value": 1 + }, + "top_layers": { + "value": 6 + }, + "top_thickness":{ + "value": "layer_height * top_layers" + }, + "bottom_layers": { + "value": 4 + }, + "bottom_thickness":{ + "value": "layer_height * bottom_layers" + }, + "skin_overlap": { + "value": 10 + }, + "infill_sparse_density": { + "value": 20 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 25 else 'grid'" + }, + "infill_overlap": { + "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" + }, + "infill_before_walls": { + "value": false + }, + "material_print_temperature": { + "value": "default_material_print_temperature", + "maximum_value_warning": 250 + }, + "material_print_temperature_layer_0": { + "value": "material_print_temperature + 5", + "maximum_value_warning": 250 + }, + "material_initial_print_temperature": { + "value": "material_print_temperature", + "maximum_value_warning": 250 + }, + "material_final_print_temperature": { + "value": "material_print_temperature" + }, + "material_bed_temperature": { + "value": "default_material_bed_temperature", + "maximum_value_warning": 100 + }, + "material_bed_temperature_layer_0": { + "value": "material_bed_temperature" + }, + "speed_infill": { + "value": "speed_print" + }, + "speed_wall": { + "value": "speed_print" + }, + "speed_wall_0": { + "value": "math.ceil(speed_print * 30 / 50)" + }, + "speed_wall_x": { + "value": "speed_print" + }, + "speed_topbottom": { + "value": "math.ceil(speed_print * 20 / 50)" + }, + "speed_travel": { + "value": "speed_print if magic_spiralize else 120" + }, + "speed_layer_0": { + "value": "math.ceil(speed_print * 30 / 50)" + }, + "skirt_brim_speed": { + "value": "math.ceil(speed_print * 40 / 60)" + }, + "speed_z_hop": { + "value": "math.ceil(speed_print * 30 / 60)" + }, "acceleration_enabled": { "value": true }, @@ -71,38 +177,6 @@ "acceleration_travel": { "value": 1500 }, - "adhesion_type": { - "value": "'skirt'" - }, - "brim_width": { - "value": 5 - }, - "cool_fan_full_at_height": { - "value": 0.5 - }, - "cool_fan_speed": { - "value": 100 - }, - "cool_fan_speed_0": { - "value": 0 - }, - "infill_overlap": { - "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0", - "maximum_value_warning": 100, - "minimum_value_warning": -50 - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 25 else 'grid'" - }, - "infill_sparse_density": { - "value": 20 - }, - "initial_layer_line_width_factor": { - "value": 120 - }, - "infill_before_walls": { - "value": false - }, "jerk_enabled": { "value": true }, @@ -112,35 +186,11 @@ "jerk_travel": { "value": 15 }, - "material_bed_temperature": { - "maximum_value_warning": 100 - }, - "material_print_temperature": { - "maximum_value_warning": 250 - }, - "optimize_wall_printing_order": { - "default_value": true - }, - "outer_inset_first": { - "default_value": false - }, "retract_at_layer_change": { "value": true }, "retraction_amount": { - "default_value": 4 - }, - "retraction_hop": { - "value": 0.075 - }, - "retraction_hop_enabled": { - "value": false - }, - "retraction_hop_only_when_collides": { - "value": true - }, - "retraction_min_travel": { - "value": 1.5 + "default_value": 4.5 }, "retraction_speed": { "default_value": 85, @@ -153,104 +203,56 @@ "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 }, + "retraction_min_travel": { + "value": "max(line_width * 2, 1.5)" + }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, - "skin_monotonic": { - "value": true - }, - "skin_overlap": { - "value": 10 - }, - "skirt_brim_speed": { - "value": "math.ceil(speed_print * 40 / 60)" - }, - "skirt_gap": { - "value": 5 - }, - "skirt_line_count": { - "value": 3 - }, - "speed_infill": { - "value": "speed_print" - }, - "speed_topbottom": { - "value": "math.ceil(speed_print * 20 / 50)" - }, - "speed_travel": { - "value": "120" - }, - "speed_layer_0": { - "value": "math.ceil(speed_print * 30 / 50)" - }, - "speed_wall": { - "value": "speed_print" - }, - "speed_wall_0": { - "value": "math.ceil(speed_print * 30 / 50)" - }, - "speed_wall_x": { - "value": "speed_print" - }, - "support_angle": { - "value": 50 - }, - "support_enable": { - "default_value": false - }, - "support_interface_enable": { - "value": true - }, - "support_pattern": { - "value": "'triangles'" - }, - "support_roof_enable": { - "value": true - }, - "support_type": { - "value": "'everywhere'" - }, - "support_use_towers": { - "value": false - }, - "support_z_distance": { - "value": 0.3 - }, - "support_xy_distance": { - "value": 0.7 - }, - "support_xy_distance_overhang": { - "value": 0.2 - }, - "smooth_spiralized_contours": { - "value": false - }, "travel_retract_before_outer_wall": { "value": true }, - "wall_line_count": { + "retraction_hop_enabled": { + "value": false + }, + "retraction_hop_only_when_collides": { + "value": true + }, + "retraction_hop": { + "value": 0.1 + }, + "support_pattern": { + "value": "'triangles'" + }, + "support_z_distance": { + "value": 0.3 + }, + "support_interface_enable": { + "value": true + }, + "support_roof_enable": { + "value": true + }, + "support_use_towers": { + "value": false + }, + "adhesion_type": { + "value": "'skirt'" + }, + "skirt_line_count": { "value": 3 - }, - "wall_thickness": { - "value": "line_width * wall_line_count" }, - "bottom_layers": { - "value": "4" + "skirt_gap": { + "value": 5 }, - "bottom_thickness":{ - "value": "layer_height * bottom_layers" + "brim_width": { + "value": 5 }, - "top_layers": { - "value": "6" + "smooth_spiralized_contours": { + "value": false }, - "top_thickness":{ - "value": "layer_height * top_layers" - }, - "z_seam_type": { - "value": "'shortest'" - }, - "z_seam_corner": { - "value": "'z_seam_corner_inner'" + "roofing_monotonic": { + "value": true } } } \ No newline at end of file diff --git a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg index a824d8f84a..28251b77ba 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg @@ -16,13 +16,6 @@ acceleration_travel = 3000 infill_sparse_density = 10 initial_layer_line_width_factor = 100.0 layer_height = 0.3 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) skirt_brim_speed = =math.ceil(speed_print * 40 / 50) speed_print = 100.0 speed_infill = =math.ceil(speed_print * 60 / 50) @@ -31,7 +24,6 @@ speed_travel = =speed_print if magic_spiralize else 150 speed_layer_0 = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_print * 40 / 50) speed_wall_x = =math.ceil(speed_print * 60 / 50) -speed_z_hop = =math.ceil(speed_print * 30 / 60) top_layers = 4 bottom_layers = 2 wall_line_count = 2 diff --git a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg index fcd9f0f7af..1e22aa1139 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg @@ -16,18 +16,10 @@ acceleration_travel = 3000 infill_sparse_density = 15 initial_layer_line_width_factor = 110.0 layer_height = 0.25 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) speed_infill = =math.ceil(speed_print * 80 / 60) speed_topbottom = =math.ceil(speed_print * 40 / 60) speed_travel = =speed_print if magic_spiralize else 150 speed_wall_x = =math.ceil(speed_print * 80 / 60) -speed_z_hop = =math.ceil(speed_print * 30 / 60) top_layers = 5 bottom_layers = 3 wall_line_count = 2 diff --git a/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg index a87524a147..d128ae9f46 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg @@ -15,16 +15,8 @@ alternate_extra_perimeter = true infill_sparse_density = 30 initial_layer_line_width_factor = 130.0 layer_height = 0.1 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) speed_print = 40.0 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_travel = =speed_print if magic_spiralize else 100 -speed_z_hop = =math.ceil(speed_print * 30 / 60) top_layers = 12 bottom_layers = 8 diff --git a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg index df960b4fff..91977c3ac4 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg @@ -15,16 +15,8 @@ alternate_extra_perimeter = true infill_sparse_density = 25 initial_layer_line_width_factor = 125.0 layer_height = 0.15 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) speed_print = 50.0 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_travel = =speed_print if magic_spiralize else 100 -speed_z_hop = =math.ceil(speed_print * 30 / 60) top_layers = 8 bottom_layers = 6 diff --git a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg index 667d72fe09..b4eebe5396 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg @@ -9,20 +9,3 @@ type = quality quality_type = normal weight = 0 global_quality = True - -[values] -infill_sparse_density = 20 -initial_layer_line_width_factor = 120.0 -layer_height = 0.2 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) -speed_travel = =speed_print if magic_spiralize else 120 -speed_z_hop = =math.ceil(speed_print * 30 / 60) -top_layers = 6 -bottom_layers = 4 -