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.

1 files changed, 121 insertions, 119 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,85 +62,135 @@
         "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" 
         },
-        "acceleration_enabled": {
-            "value": true
+        "layer_height_0": {
+            "value": "max(0.1, min(extruderValues('layer_height')))"
         },
-        "acceleration_print": {
-            "value": 750
+        "layer_height": {
+            "value": 0.2
         },
-        "acceleration_travel": {
-            "value": 1500
+        "initial_layer_line_width_factor": {
+            "value": 120
         },
-        "adhesion_type": { 
-            "value": "'skirt'"
+        "wall_line_count": {
+            "value": 3
         },
-        "brim_width": {
-            "value": 5
+        "wall_thickness": {
+            "value": "line_width * wall_line_count"
         },
-        "cool_fan_full_at_height": {
-            "value": 0.5
+        "optimize_wall_printing_order": {
+            "default_value": true 
         },
-        "cool_fan_speed": {
-            "value": 100
+        "outer_inset_first": {
+            "default_value": false 
         },
-        "cool_fan_speed_0": {
-            "value": 0
+        "z_seam_type": {
+            "value": "'shortest'"
         },
-        "infill_overlap": {
-            "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0",
-            "maximum_value_warning": 100,
-            "minimum_value_warning": -50
+        "z_seam_corner": {
+            "value": "'z_seam_corner_inner'"
         },
-        "infill_pattern": {
-            "value": "'lines' if infill_sparse_density > 25 else 'grid'"
+        "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
         },
-        "initial_layer_line_width_factor": {
-            "value": 120
+        "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
         },
-        "jerk_enabled": {
-            "value": true
+        "material_print_temperature": {
+            "value": "default_material_print_temperature",
+            "maximum_value_warning": 250
         },
-        "jerk_print": {
-            "value": 10
+        "material_print_temperature_layer_0": {
+            "value": "material_print_temperature + 5",
+            "maximum_value_warning": 250
         },
-        "jerk_travel": {
-            "value": 15
+        "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_print_temperature": {
-            "maximum_value_warning": 250
+        "material_bed_temperature_layer_0": {
+            "value": "material_bed_temperature"
         },
-        "optimize_wall_printing_order": {
-            "default_value": true 
+        "speed_infill": {
+            "value": "speed_print"
         },
-        "outer_inset_first": {
-            "default_value": false 
+        "speed_wall": {
+            "value": "speed_print"
         },
-        "retract_at_layer_change": {
+        "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
         },
-        "retraction_amount": {
-            "default_value": 4
+        "acceleration_print": {
+            "value": 750
         },
-        "retraction_hop": {
-            "value": 0.075
+        "acceleration_travel": {
+            "value": 1500
         },
-        "retraction_hop_enabled": {
-            "value": false
+        "jerk_enabled": {
+            "value": true
         },
-        "retraction_hop_only_when_collides": {
+        "jerk_print": {
+            "value": 10
+        },
+        "jerk_travel": {
+            "value": 15
+        },
+        "retract_at_layer_change": {
             "value": true
         },
-        "retraction_min_travel": {
-            "value": 1.5
+        "retraction_amount": {
+            "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": {
+        "travel_retract_before_outer_wall": {
             "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"
+        "retraction_hop_enabled": {
+            "value": false
         },
-        "speed_wall_0": {
-            "value": "math.ceil(speed_print * 30 / 50)"
+        "retraction_hop_only_when_collides": {
+            "value": true
         },
-        "speed_wall_x": {
-            "value": "speed_print"
+        "retraction_hop": {
+            "value": 0.1
         },
-        "support_angle": {
-            "value": 50
+        "support_pattern": {
+            "value": "'triangles'"
         },
-        "support_enable": {
-            "default_value": false
+        "support_z_distance": {
+            "value": 0.3
         },
         "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
+        "adhesion_type": { 
+            "value": "'skirt'"
         },
-        "support_xy_distance": {
-            "value": 0.7
+        "skirt_line_count": {
+            "value": 3
         },
-        "support_xy_distance_overhang": {
-            "value": 0.2
+        "skirt_gap": {
+            "value": 5
+        },
+        "brim_width": {
+            "value": 5
         },
         "smooth_spiralized_contours": {
             "value": false
         },
-        "travel_retract_before_outer_wall": {
+        "roofing_monotonic": {
             "value": true
-        },
-        "wall_line_count": {
-            "value": 3
-          },
-        "wall_thickness": {
-            "value": "line_width * wall_line_count"
-        },
-        "bottom_layers": {
-            "value": "4"
-        },
-        "bottom_thickness":{
-            "value": "layer_height * bottom_layers"
-        },
-        "top_layers": {
-            "value": "6"
-        },
-        "top_thickness":{
-            "value": "layer_height * top_layers"
-        },
-        "z_seam_type": {
-            "value": "'shortest'"
-        },
-        "z_seam_corner": {
-            "value": "'z_seam_corner_inner'"
         }
     }
 }
\ No newline at end of file