Improved the setting

4 files changed, 212 insertions, 159 deletions

diff --git a/resources/definitions/eryone_er20.def.json b/resources/definitions/eryone_er20.def.json
index 66182790ef..b1349edc0c 100644
--- a/resources/definitions/eryone_er20.def.json
+++ b/resources/definitions/eryone_er20.def.json
@@ -17,13 +17,27 @@
     },
 
     "overrides": {
-        "machine_name": { "default_value": "Eryone ER20" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_width": { "default_value": 250 },
-        "machine_height": { "default_value": 200 },
-        "machine_depth": { "default_value": 220 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_name": { 
+            "default_value": "Eryone ER20" 
+        },
+        "machine_heated_bed": { 
+            "default_value": true 
+        },
+        "machine_width": { 
+            "default_value": 250 
+        },
+        "machine_height": { 
+            "default_value": 200 
+        },
+        "machine_depth": { 
+            "default_value": 220 
+        },
+        "machine_center_is_zero": { 
+            "default_value": false 
+        },
+        "machine_gcode_flavor": { 
+            "default_value": "RepRap (Marlin/Sprinter)" 
+        },
         "machine_head_with_fans_polygon": {
             "default_value": [
                 [-10, -10],
@@ -38,6 +52,190 @@
         },
         "machine_end_gcode": {
             "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\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 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
+        },
+        "material_print_temperature": {
+            "value": 205
+        },
+        "material_print_temperature_layer_0": {
+            "value": 215
+        },
+        "material_initial_print_temperature": {
+            "value": 205
+        },
+        "material_final_print_temperature": {
+            "value": 205
+        },
+        "acceleration_enabled": {
+            "value": true
+        },
+        "acceleration_travel": {
+            "value": 1800
+        },
+        "adhesion_type": { 
+            "value": "'brim'"
+        },
+        "brim_width": {
+            "value": 5
+        },
+        "cool_fan_full_at_height": {
+            "value": 0.5
+        },
+        "cool_fan_speed": {
+            "value": 100
+        },
+        "cool_fan_speed_0": {
+            "value": 100
+        },
+        "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": "'grid'"
+        },
+        "infill_sparse_density": {
+            "value": 20
+        },
+        "initial_layer_line_width_factor": {
+            "value": 105
+        },
+        "infill_before_walls": {
+            "value": false
+        },
+        "material_bed_temperature": {
+            "value": 60
+        },
+        "material_bed_temperature_layer_0": {
+            "value": 65
+        },
+        "optimize_wall_printing_order": {
+            "default_value": true 
+        },
+        "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
+        },
+        "retraction_speed": {
+            "default_value": 85,
+            "maximum_value_warning": 100
+        },
+        "retraction_retract_speed": {
+            "maximum_value_warning": 130
+        },
+        "retraction_prime_speed": {
+            "value": "math.ceil(retraction_speed * 0.4)",
+            "maximum_value_warning": 130
+        },
+        "retraction_combing": {
+            "value": "'noskin'"
+        },
+        "skin_overlap": {
+            "value": 10
+        },
+        "skirt_brim_speed": {
+            "value": 40
+        },
+        "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": "150"
+        },
+        "speed_layer_0": {
+            "value": "20"
+        },
+        "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": {
+            "value": 3
+          },
+        "wall_thickness": {
+            "value": "1.2"
+        },
+        "bottom_layers": {
+            "value": "4"
+        },
+        "bottom_thickness":{
+            "value": "layer_height * 4"
+        },
+        "top_thickness":{
+            "value": "layer_height * 5"
+        },
+        "top_layers": {
+            "value": "5"
+        },
+        "z_seam_type": {
+            "value": "'shortest'"
+        },
+        "z_seam_corner": {
+            "value": "'z_seam_corner_inner'"
         }
     }
 }
diff --git a/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg b/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg
index 008ed519a7..6ba6af5aec 100644
--- a/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg
+++ b/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg
@@ -11,56 +11,8 @@ weight = -2
 global_quality = True
 
 [values]
-acceleration_enabled = True
 acceleration_print = 1500
-acceleration_travel = 3000
-adhesion_type = brim
-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 = 105
-jerk_enabled = True
-jerk_print = 10
-jerk_travel = 12
 layer_height = 0.3
 layer_height_0 = 0.3
-material_bed_temperature = 60
-material_diameter = 1.75
-default_material_print_temperature = 205
-material_print_temperature = 205
-material_print_temperature_layer_0 = 205
-material_initial_print_temperature = 205
-material_final_print_temperature = 205
-retract_at_layer_change = False
-retraction_amount = 6
-retraction_hop = 0.075
-retraction_hop_enabled = True
-retraction_hop_only_when_collides = True
-retraction_min_travel = 1.5
-retraction_speed = 55
-skirt_brim_speed = 40
-skirt_gap = 5
-skirt_line_count = 3
-speed_infill = =speed_print
 speed_print = 80
 speed_support = 60
-speed_topbottom = =math.ceil(speed_print * 30 / 60)
-speed_travel = 150
-speed_wall = =speed_print
-speed_wall_x = =speed_print
-support_angle = 50
-support_enable = True
-support_interface_enable = True
-support_pattern = triangles
-support_roof_enable = True
-support_type = everywhere
-support_use_towers = False
-support_z_distance = 0.3
-support_xy_distance = 0.7
-support_xy_distance_overhang = 0.2
-top_bottom_thickness = 1.2
-wall_thickness = 1.2
diff --git a/resources/quality/eryone_er20/eryone_er20_high.inst.cfg b/resources/quality/eryone_er20/eryone_er20_high.inst.cfg
index d504bb5acd..04822040a5 100644
--- a/resources/quality/eryone_er20/eryone_er20_high.inst.cfg
+++ b/resources/quality/eryone_er20/eryone_er20_high.inst.cfg
@@ -11,67 +11,12 @@ weight = 1
 global_quality = True
 
 [values]
-acceleration_enabled = True
 acceleration_print = 500
-acceleration_travel = 3000
-adhesion_type = brim
-brim_width = 6.0
-cool_fan_full_at_height = 0.5
-cool_fan_speed = 100
-cool_fan_speed_0 = 100
-infill_overlap = 25
-infill_pattern = zigzag
-infill_sparse_density = 25
-initial_layer_line_width_factor = 105
-jerk_enabled = True
-jerk_print = 8
-jerk_travel = 10
 layer_height = 0.15
 layer_height_0 = 0.2
-line_width = 0.42
-material_bed_temperature = 60
-material_diameter = 1.75
-default_material_print_temperature = 205
-material_print_temperature = 205
-material_print_temperature_layer_0 = 205
-material_initial_print_temperature = 205
-material_final_print_temperature = 205
-optimize_wall_printing_order = True
-outer_inset_first = True
-retract_at_layer_change = False
-retraction_amount = 6
-retraction_hop = 0.075
-retraction_hop_enabled = True
-retraction_hop_only_when_collides = True
-retraction_min_travel = 1.5
-retraction_speed = 55
-retraction_combing = noskin
-skin_overlap = 10
-skirt_brim_speed = 40
-skirt_gap = 5
-skirt_line_count = 3
-speed_infill = =speed_print
 speed_print = 50
 speed_support = 30
-speed_topbottom = =math.ceil(speed_print * 20 / 50)
-speed_travel = 150
-speed_wall = =speed_print
-speed_wall_x = =speed_print
-support_angle = 50
-support_enable = True
-support_interface_enable = True
-support_pattern = triangles
-support_roof_enable = True
-support_type = everywhere
-support_use_towers = False
-support_z_distance = 0.3
-support_xy_distance = 0.7
-support_xy_distance_overhang = 0.2
-smooth_spiralized_contours = False
-top_bottom_thickness = 1.2
-travel_retract_before_outer_wall = True
-wall_thickness = 1.2
-z_seam_corner = z_seam_corner_weighted
+
 
 
 
diff --git a/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg b/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg
index 33f7a4b619..1c29936cc0 100644
--- a/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg
+++ b/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg
@@ -11,56 +11,14 @@ weight = 0
 global_quality = True
 
 [values]
-acceleration_enabled = True
 acceleration_print = 1000
-acceleration_travel = 3000
-adhesion_type = brim
-brim_width = 5
-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 = 105
-jerk_enabled = True
-jerk_print = 8
-jerk_travel = 10
 layer_height = 0.2
 layer_height_0 = 0.2
-material_bed_temperature = 60
-material_diameter = 1.75
-default_material_print_temperature = 205
-material_print_temperature = 205
-material_print_temperature_layer_0 = 205
-material_initial_print_temperature = 205
-material_final_print_temperature = 205
-retract_at_layer_change = False
-retraction_amount = 6
-retraction_hop = 0.075
-retraction_hop_enabled = True
-retraction_hop_only_when_collides = True
-retraction_min_travel = 1.5
-retraction_speed = 55
-skirt_brim_speed = 40
-skirt_gap = 5
-skirt_line_count = 3
-speed_infill = =speed_print
 speed_print = 50
 speed_support = 30
-speed_topbottom = =math.ceil(speed_print * 20 / 50)
-speed_travel = 150
-speed_wall = =speed_print
-speed_wall_x = =speed_print
-support_angle = 50
-support_enable = True
-support_interface_enable = True
-support_pattern = triangles
-support_roof_enable = True
-support_type = everywhere
-support_use_towers = False
-support_z_distance = 0.3
-support_xy_distance = 0.7
-support_xy_distance_overhang = 0.2
-top_bottom_thickness = 1.2
-wall_thickness = 1.2
+
+
+
+
+
+