Updating profiles

24 files changed, 97 insertions, 236 deletions

diff --git a/resources/definitions/dagoma_pro_430_base.def.json b/resources/definitions/dagoma_pro_430_base.def.json
index 2562576d7b..10bf846f03 100644
--- a/resources/definitions/dagoma_pro_430_base.def.json
+++ b/resources/definitions/dagoma_pro_430_base.def.json
@@ -15,6 +15,7 @@
         "has_variants": true,
         "variants_name": "Steel Nozzle Size",
         "preferred_material": "dagoma_generic_pla",
+        "preferred_quality_type": "high",
         "preferred_variant_name": "0.4",
         "exclude_materials": 
         [
@@ -74,34 +75,10 @@
             "filo3d_pla",
             "filo3d_pla_green",
             "filo3d_pla_red",
-            "generic_abs",
-            "generic_abs_175",
-            "generic_asa_175",
-            "generic_bam",
             "generic_bvoh_175",
-            "generic_cffcpe",
-            "generic_cffpa",
-            "generic_cpe",
-            "generic_cpe_175",
-            "generic_cpe_plus",
-            "generic_gffcpe",
-            "generic_gffpa",
-            "generic_hips",
             "generic_hips_175",
-            "generic_nylon",
-            "generic_nylon_175",
-            "generic_pc",
-            "generic_pc_175",
-            "generic_petg",
-            "generic_petg_175",
-            "generic_pla",
-            "generic_pla_175",
-            "generic_pp",
-            "generic_pva",
             "generic_pva_175",
             "generic_tough_pla",
-            "generic_tpu",
-            "generic_tpu_175",
             "goofoo_abs",
             "goofoo_asa",
             "goofoo_bronze_pla",
@@ -172,8 +149,19 @@
             "volumic_pp_ultra",
             "volumic_strong_ultra",
             "volumic_support_ultra",
+            "xyzprinting_abs",
+            "xyzprinting_antibact_pla",
+            "xyzprinting_carbon_fiber",
+            "xyzprinting_colorinkjet_pla",
+            "xyzprinting_flexible",
+            "xyzprinting_metallic_pla",
+            "xyzprinting_nylon",
+            "xyzprinting_petg",
+            "xyzprinting_pla",
+            "xyzprinting_tough_pla",
             "zyyx_pro_flex",
-            "zyyx_pro_pla"
+            "zyyx_pro_pla",
+            "xyzprinting_tpu"
         ]
     },
 
diff --git a/resources/definitions/dagoma_pro_430_bowden.def.json b/resources/definitions/dagoma_pro_430_bowden.def.json
index 15e3986e48..7ed1adb0b7 100644
--- a/resources/definitions/dagoma_pro_430_bowden.def.json
+++ b/resources/definitions/dagoma_pro_430_bowden.def.json
@@ -1,6 +1,6 @@
 {
     "version": 2,
-    "name": "PRO 430B",
+    "name": "Dagoma PRO 430B",
     "inherits": "dagoma_pro_430_base",
     "metadata": 
     {
@@ -17,13 +17,24 @@
         "machine_height": { "default_value": 360 },
         "machine_head_with_fans_polygon": { "default_value": [ [-22.5, -22.5], [-22.5, 22.5], [22.5, 22.5], [22.5, -22.5] ] },
         "gantry_height": { "value": "35" },
-        "machine_start_gcode": { "default_value": "\n;Start Gcode for {machine_name}\n;Author: Dagoma PROFESSIONNEL\n;Contact: contact-pro@dagoma3d.com\n\n;Sliced: {date} {time}\n\n;Estimated print time: {print_time}\n\n;Print speed: {speed_print}mm/s\n;Layer height: {layer_height}mm\n;Wall thickness: {wall_thickness}mm\n;Infill density: {infill_sparse_density}%\n;Infill pattern: {infill_pattern}\n;Support: {support_enable}\n;Print temperature: {material_print_temperature}°\n;Flow: {material_flow}%\n;Retraction amount: {retraction_amount}mm\n;Retraction speed: {retraction_retract_speed}mm/s\n\nG21 ;Set units to millimeters\nG90 ;Set all axes to absolute\nM140 S{material_bed_temperature} ;Preheat hotbed\nM117 Nozzle preheating ;Set message\nM109 R{material_standby_temperature} ;Preheat hotend before bed leveling\nM117 Hotbed preheating ;Set message\nM190 S{material_bed_temperature} ;Preheat hotbed before bed leveling\nG28 ;Go to origin on all axes\nG29 ; Bed Leveling\nG0 X215 Y1 Z0.4 ;Move XYZ axis before purge\nM117 Wait for print temp ;Set message\nM109 S{material_print_temperature_layer_0} ;Wait for initial print temp\nM83 ;Set E to relative positioning\nG1 E{retraction_amount} F200 ;Purge\nG0 Z3 ;Move Z axis before print start\nM82 ;Set E to absolute positioning\nG92 E0 ;Set E position\nG1 F{travel_speed} ;Set the feedrate to {travel_speed}mm/s\nM117 Print in progress ;Set message\n" },
-        "machine_end_gcode": { "default_value": "\n;End Gcode for {machine_name}\n;Author: Dagoma PROFESSIONNEL\n\nM104 S0 ;Set hotend temperature for cooldown\nM140 S0 ;Set hotbed temperature for cooldown\nG91 ;Set all axes to relative\nG0 Z+3 ;Move Z axis after print end\nG1 E-{retraction_amount} F5000 ;Retract filament to stop oozing\nG90 ;Set all axes to absolute\nG28 X Y ;Home the X and Y axes\nM18 ;Disable steppers motors\nM117 Print end ;Set message\n" },
+        "machine_start_gcode": { "default_value": "\n;Start Gcode for {machine_name}\n;Author: Dagoma\n;Contact: contact-pro@dagoma3d.com\n\n;Sliced: {date} {time}\n\n;Estimated print time: {print_time}\n\n;Print speed: {speed_print}mm/s\n;Layer height: {layer_height}mm\n;Wall thickness: {wall_thickness}mm\n;Infill density: {infill_sparse_density}%\n;Infill pattern: {infill_pattern}\n;Support: {support_enable}\n;Print temperature: {material_print_temperature}°\n;Flow: {material_flow}%\n;Retraction amount: {retraction_amount}mm\n;Retraction speed: {retraction_retract_speed}mm/s\n\nG21 ;Set units to millimeters\nG90 ;Set all axes to absolute\nM140 S{material_bed_temperature} ;Preheat hotbed\nM117 Nozzle preheating ;Set message\nM109 R{material_standby_temperature} ;Preheat hotend before bed leveling\nM117 Hotbed preheating ;Set message\nM190 S{material_bed_temperature} ;Preheat hotbed before bed leveling\nG28 ;Go to origin on all axes\nG29 ; Bed Leveling\nG0 X215 Y1 Z0.4 ;Move XYZ axis before purge\nM117 Wait for print temp ;Set message\nM109 S{material_print_temperature_layer_0} ;Wait for initial print temp\nM83 ;Set E to relative positioning\nG1 E{retraction_amount} F200 ;Purge\nG0 Z3 ;Move Z axis before print start\nM82 ;Set E to absolute positioning\nG92 E0 ;Set E position\nG1 F{travel_speed} ;Set the feedrate to {travel_speed}mm/s\nM117 Print in progress ;Set message\n" },
+        "machine_end_gcode": { "default_value": "\n;End Gcode for {machine_name}\n;Author: Dagoma\n\nM104 S0 ;Set hotend temperature for cooldown\nM140 S0 ;Set hotbed temperature for cooldown\nG91 ;Set all axes to relative\nG0 Z+3 ;Move Z axis after print end\nG1 E-{retraction_amount} F5000 ;Retract filament to stop oozing\nG90 ;Set all axes to absolute\nG28 X Y ;Home the X and Y axes\nM18 ;Disable steppers motors\nM117 Print end ;Set message\n" },
         "machine_acceleration": { "value": 1250 },
         "machine_max_jerk_xy": { "value": 10 },
         "machine_max_jerk_z": { "value": 0.3 },
         "machine_max_jerk_e": { "value": 5 },
         "machine_max_feedrate_e": { "default_value": 200 },
-        "machine_steps_per_mm_e": { "default_value": 139.5 }
+        "machine_steps_per_mm_e": { "default_value": 139.5 },
+        "acceleration_enabled": { "value": "True" },
+        "acceleration_print": { "value": "1250", "maximum_value": 1500 },
+        "acceleration_layer_0": { "value": "acceleration_topbottom", "maximum_value": 1500 },
+        "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 1250)", "maximum_value": 1500 },
+        "acceleration_travel": { "value": "acceleration_print", "maximum_value": 1500 },
+        "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 1250)", "maximum_value": 1500 },
+        "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 800 / 1250)", "maximum_value": 1500 },
+        "jerk_enabled": { "value": "True" },
+        "jerk_print": { "value": "8", "minimum_value_warning": 8 },
+        "jerk_travel": {"value": "10", "minimum_value_warning": 8 },
+        "optimize_wall_printing_order": { "value": "True" }
     }
 }
\ No newline at end of file
diff --git a/resources/extruders/dagoma_pro_430_bowden_extruder_0.def.json b/resources/extruders/dagoma_pro_430_bowden_extruder_0.def.json
index 38bea99e71..eeba40cb05 100644
--- a/resources/extruders/dagoma_pro_430_bowden_extruder_0.def.json
+++ b/resources/extruders/dagoma_pro_430_bowden_extruder_0.def.json
@@ -15,4 +15,4 @@
             "default_value": 1.75
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_abs_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_abs_high_quality.inst.cfg
index ef1e95da1d..3fdc37a980 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_abs_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_abs_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
-material = dagoma_generic_abs
+material = generic_abs_175
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 2
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,9 +23,8 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 5
-material_print_temperature_layer_0 = =material_print_temperature + 10
-material_bed_temperature = =default_material_bed_temperature + 50
+material_print_temperature = =default_material_print_temperature + 20
+material_bed_temperature = =default_material_bed_temperature
 
 speed_print = 40.0
 speed_infill = =speed_print
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_asa_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_asa_high_quality.inst.cfg
index 24772cbffb..197a76f253 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_asa_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_asa_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
-material = dagoma_generic_asa
+material = generic_asa_175
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 2
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,9 +23,8 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 5
-material_print_temperature_layer_0 = =material_print_temperature + 10
-material_bed_temperature = =default_material_bed_temperature + 40
+material_print_temperature = =default_material_print_temperature + 20
+material_bed_temperature = =default_material_bed_temperature
 
 speed_print = 40.0
 speed_infill = =speed_print
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_nylon_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_nylon_high_quality.inst.cfg
index 55cf7cb5fb..8250e803e8 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_nylon_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_nylon_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
-material = dagoma_generic_nylon
+material = generic_nylon_175
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 2
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,9 +23,8 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 5
-material_print_temperature_layer_0 = =material_print_temperature + 10
-material_bed_temperature = =default_material_bed_temperature + 20
+material_print_temperature = =default_material_print_temperature + 20
+material_bed_temperature = =default_material_bed_temperature
 
 speed_print = 40.0
 speed_infill = =speed_print
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pc_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pc_high_quality.inst.cfg
index 63f067523e..22e5f50eeb 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pc_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pc_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
-material = dagoma_generic_pc
+material = generic_pc_175
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 2
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,8 +23,8 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 25
-material_bed_temperature = =default_material_bed_temperature + 50
+material_print_temperature = =default_material_print_temperature + 10
+material_bed_temperature = =default_material_bed_temperature
 
 speed_print = 40.0
 speed_infill = =speed_print
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pe_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pe_high_quality.inst.cfg
index ba280bc5db..dae5bf6ecc 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pe_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pe_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
-material = dagoma_generic_pe
+material = generic_cpe_175
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 2
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -27,7 +24,7 @@ infill_sparse_density = 15
 infill_before_walls = False
 
 material_print_temperature = =default_material_print_temperature + 20
-material_bed_temperature = =default_material_bed_temperature + 30
+material_bed_temperature = =default_material_bed_temperature
 
 speed_print = 40.0
 speed_infill = =speed_print
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_petg_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_petg_high_quality.inst.cfg
index 5f292d6ba8..d0d0b21667 100755
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_petg_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_petg_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 

 setting_version = 19

 type = quality

-quality_type = high_quality

+quality_type = high

 weight = -1

-material = dagoma_generic_petg

+material = generic_petg_175

 variant = 0.4

 

 [values]

 

-wall_thickness = =machine_nozzle_size * 2

-optimize_wall_printing_order = True

-skin_no_small_gaps_heuristic = True

-fill_outline_gaps = True

+wall_thickness = =line_width * 2

 z_seam_type = sharpest_corner

 z_seam_corner = z_seam_corner_weighted

 skin_outline_count = 0

@@ -26,8 +23,8 @@ skin_outline_count = 0
 infill_sparse_density = 15

 infill_before_walls = False

 

-material_print_temperature = =default_material_print_temperature + 25

-material_bed_temperature = =default_material_bed_temperature + 20

+material_print_temperature = =default_material_print_temperature + 20

+material_bed_temperature = =default_material_bed_temperature

 

 speed_print = 40.0

 speed_infill = =speed_print

diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_fine_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_fine_quality.inst.cfg
index d6851b7440..180a3098a1 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_fine_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_fine_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = fine_quality
+quality_type = fine
 weight = 0
-material = dagoma_generic_pla
+material = generic_pla_175
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 3
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,7 +23,7 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 20
+material_print_temperature = =default_material_print_temperature
 
 speed_print = 60.0
 speed_infill = =speed_print
@@ -47,7 +44,6 @@ retraction_combing_max_distance = 10
 support_interface_enable = True
 support_interface_pattern = zigzag
 
-cool_fan_enabled = True
 cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_fan_speed_max = =cool_fan_speed
 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_high_quality.inst.cfg
index 26b61738e5..64d1525595 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
-material = dagoma_generic_pla
+material = generic_pla_175
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 2
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,7 +23,7 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 25
+material_print_temperature = =default_material_print_temperature
 
 speed_print = 80.0
 speed_infill = =speed_print
@@ -35,20 +32,18 @@ speed_wall_0 = =math.ceil(speed_print * 50 / 80)
 speed_wall_x = =speed_wall
 speed_topbottom = =speed_wall_0
 speed_travel = =math.ceil(speed_print * 125 / 80)
-speed_layer_0 = =math.ceil(speed_print * 15 / 80)
-speed_travel_layer_0 = =math.ceil(speed_print * 30 / 80)
+speed_layer_0 = =math.ceil(speed_print * 25 / 80)
+speed_travel_layer_0 = =math.ceil(speed_print * 100 / 80)
 speed_support_interface = =math.ceil(speed_print * 50 / 80)
 speed_slowdown_layers = 1
 
 retraction_combing = noskin
 travel_avoid_distance = 1.2
 retraction_combing_max_distance = 10
-retraction_hop_enabled = True
 
 support_interface_enable = True
 support_interface_pattern = zigzag
 
-cool_fan_enabled = True
 cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_fan_speed_max = =cool_fan_speed
 cool_fan_full_at_height = =layer_height_0 + 5 * layer_height
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_medium_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_medium_quality.inst.cfg
index 2e3db245c6..5280a7455d 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_medium_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pla_medium_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = medium_quality
+quality_type = medium
 weight = -2
-material = dagoma_generic_pla
+material = generic_pla_175
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 2
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,7 +23,7 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 30
+material_print_temperature = =default_material_print_temperature
 
 speed_print = 90.0
 speed_infill = =speed_print
@@ -47,7 +44,6 @@ retraction_combing_max_distance = 10
 support_interface_enable = True
 support_interface_pattern = zigzag
 
-cool_fan_enabled = True
 cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_fan_speed_max = =cool_fan_speed
 cool_fan_full_at_height = =layer_height_0 + 3 * layer_height
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pp_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pp_high_quality.inst.cfg
index bf4cc6ef40..a12fdd46bd 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pp_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_pp_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
 material = dagoma_generic_pp
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 2
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness = =line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,8 +23,8 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 20
-material_bed_temperature = =default_material_bed_temperature + 50
+material_print_temperature = =default_material_print_temperature
+material_bed_temperature = =default_material_bed_temperature
 
 speed_print = 40.0
 speed_infill = =speed_print
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_tpe_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_tpe_high_quality.inst.cfg
index 2d372ddef8..b21452094b 100644
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_tpe_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_tpe_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
 material = dagoma_generic_tpe
 variant = 0.4
 
 [values]
 
-wall_thickness = =machine_nozzle_size * 3
-optimize_wall_printing_order = True
-skin_no_small_gaps_heuristic = True
-fill_outline_gaps = True
+wall_thickness ==line_width * 2
 z_seam_type = sharpest_corner
 z_seam_corner = z_seam_corner_weighted
 skin_outline_count = 0
@@ -26,8 +23,8 @@ skin_outline_count = 0
 infill_sparse_density = 15
 infill_before_walls = False
 
-material_print_temperature = =default_material_print_temperature + 15
-material_bed_temperature = =default_material_bed_temperature - 10
+material_print_temperature = =default_material_print_temperature
+material_bed_temperature = =default_material_bed_temperature
 
 speed_print = 30.0
 speed_infill = =speed_print
@@ -48,7 +45,6 @@ retraction_combing_max_distance = 10
 support_interface_enable = True
 support_interface_pattern = zigzag
 
-cool_fan_enabled = True
 cool_fan_speed_min = =cool_fan_speed * 0.8
 cool_fan_speed_max = =cool_fan_speed
 cool_fan_full_at_height = =layer_height_0 + 5 * layer_height
diff --git a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_tpu_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_tpu_high_quality.inst.cfg
index aad74ef70e..762ae2672e 100755
--- a/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_tpu_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/Steel nozzle 0.4/dagoma_pro_430_bowden_0.4_tpu_high_quality.inst.cfg
@@ -8,17 +8,14 @@ definition = dagoma_pro_430_bowden
 

 setting_version = 19

 type = quality

-quality_type = high_quality

+quality_type = high

 weight = -1

-material = dagoma_generic_tpu

+material = generic_tpu_175

 variant = 0.4

 

 [values]

 

-wall_thickness = =machine_nozzle_size * 3

-optimize_wall_printing_order = True

-skin_no_small_gaps_heuristic = True

-fill_outline_gaps = True

+wall_thickness = =line_width * 2

 z_seam_type = sharpest_corner

 z_seam_corner = z_seam_corner_weighted

 skin_outline_count = 0

@@ -26,8 +23,8 @@ skin_outline_count = 0
 infill_sparse_density = 15

 infill_before_walls = False

 

-material_print_temperature = =default_material_print_temperature + 15

-material_bed_temperature = =default_material_bed_temperature - 10

+material_print_temperature = =default_material_print_temperature

+material_bed_temperature = =default_material_bed_temperature

 

 speed_print = 30.0

 speed_infill = =speed_print

@@ -48,7 +45,6 @@ retraction_combing_max_distance = 10
 support_interface_enable = True

 support_interface_pattern = zigzag

 

-cool_fan_enabled = True

 cool_fan_speed_min = =cool_fan_speed * 0.8

 cool_fan_speed_max = =cool_fan_speed

 cool_fan_full_at_height = =layer_height_0 + 5 * layer_height

diff --git a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_coarse_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_coarse_quality.inst.cfg
index 3b8e85115f..7a3c4a2add 100644
--- a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_coarse_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_coarse_quality.inst.cfg
@@ -8,7 +8,7 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = coarse_quality
+quality_type = coarse
 weight = -4
 global_quality = True
 
@@ -17,12 +17,4 @@ global_quality = True
 layer_height = 0.6
 layer_height_0 = =round(0.38 * machine_nozzle_size, 2)
 
-top_bottom_thickness = =2 * layer_height
-
-acceleration_enabled = True
-acceleration_print = 1000.0
-acceleration_travel = 1250.0
-
-jerk_enabled = True
-jerk_print = 8.0
-jerk_travel = 10.0
\ No newline at end of file
+top_bottom_thickness = =2 * layer_height
\ No newline at end of file
diff --git a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_extra_fine_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_extra_fine_quality.inst.cfg
index f8d5df5ef4..9808f96c5c 100644
--- a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_extra_fine_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_extra_fine_quality.inst.cfg
@@ -8,7 +8,7 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = extra_fine_quality
+quality_type = extra_fine
 weight = 1
 global_quality = True
 
@@ -17,12 +17,4 @@ global_quality = True
 layer_height = 0.05
 layer_height_0 = =round(0.55 * machine_nozzle_size, 2)
 
-top_bottom_thickness = =16 * layer_height
-
-acceleration_enabled = True
-acceleration_print = 1000.0
-acceleration_travel = 1250.0
-
-jerk_enabled = True
-jerk_print = 8.0
-jerk_travel = 10.0
\ No newline at end of file
+top_bottom_thickness = =16 * layer_height
\ No newline at end of file
diff --git a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_fine_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_fine_quality.inst.cfg
index aaded20919..e966469cbb 100644
--- a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_fine_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_fine_quality.inst.cfg
@@ -8,7 +8,7 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = fine_quality
+quality_type = fine
 weight = 0
 global_quality = True
 
@@ -17,12 +17,4 @@ global_quality = True
 layer_height = 0.1
 layer_height_0 = =round(0.38 * machine_nozzle_size, 2)
 
-top_bottom_thickness = =8 * layer_height
-
-acceleration_enabled = True
-acceleration_print = 1000.0
-acceleration_travel = 1250.0
-
-jerk_enabled = True
-jerk_print = 8.0
-jerk_travel = 10.0
\ No newline at end of file
+top_bottom_thickness = =8 * layer_height
\ No newline at end of file
diff --git a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_high_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_high_quality.inst.cfg
index 3341c56d36..a10ba13d42 100644
--- a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_high_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_high_quality.inst.cfg
@@ -8,7 +8,7 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = high_quality
+quality_type = high
 weight = -1
 global_quality = True
 
@@ -17,12 +17,4 @@ global_quality = True
 layer_height = 0.2
 layer_height_0 = =round(0.38 * machine_nozzle_size, 2)
 
-top_bottom_thickness = =6 * layer_height
-
-acceleration_enabled = True
-acceleration_print = 1000.0
-acceleration_travel = 1250.0
-
-jerk_enabled = True
-jerk_print = 8.0
-jerk_travel = 10.0
\ No newline at end of file
+top_bottom_thickness = =6 * layer_height
\ No newline at end of file
diff --git a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_low_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_low_quality.inst.cfg
index 12e7912a87..c427cd70e5 100644
--- a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_low_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_low_quality.inst.cfg
@@ -8,7 +8,7 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = low_quality
+quality_type = low
 weight = -3
 global_quality = True
 
@@ -17,12 +17,4 @@ global_quality = True
 layer_height = 0.4
 layer_height_0 = =round(0.38 * machine_nozzle_size, 2)
 
-top_bottom_thickness = =3 * layer_height
-
-acceleration_enabled = True
-acceleration_print = 1000.0
-acceleration_travel = 1250.0
-
-jerk_enabled = True
-jerk_print = 8.0
-jerk_travel = 10.0
\ No newline at end of file
+top_bottom_thickness = =3 * layer_height
\ No newline at end of file
diff --git a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_medium_quality.inst.cfg b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_medium_quality.inst.cfg
index af38b98cea..9ab7f33bd6 100644
--- a/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_medium_quality.inst.cfg
+++ b/resources/quality/dagoma_pro_430_bowden/dagoma_pro_430_bowden_global_medium_quality.inst.cfg
@@ -8,7 +8,7 @@ definition = dagoma_pro_430_bowden
 
 setting_version = 19
 type = quality
-quality_type = medium_quality
+quality_type = medium
 weight = -2
 global_quality = True
 
@@ -17,12 +17,4 @@ global_quality = True
 layer_height = 0.3
 layer_height_0 = =round(0.38 * machine_nozzle_size, 2)
 
-top_bottom_thickness = =4 * layer_height
-
-acceleration_enabled = True
-acceleration_print = 1000.0
-acceleration_travel = 1250.0
-
-jerk_enabled = True
-jerk_print = 8.0
-jerk_travel = 10.0
\ No newline at end of file
+top_bottom_thickness = =4 * layer_height
\ No newline at end of file
diff --git a/resources/variants/dagoma_pro_430_bowden_steel_0.2.inst.cfg b/resources/variants/dagoma_pro_430_bowden_steel_0.2.inst.cfg
deleted file mode 100644
index dda12e947a..0000000000
--- a/resources/variants/dagoma_pro_430_bowden_steel_0.2.inst.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[general]
-name = 0.2
-version = 4
-definition = dagoma_pro_430_bowden
-
-[metadata]
-setting_version = 19
-type = variant
-hardware_type = nozzle
-
-[values]
-machine_nozzle_id = 0.2
-machine_nozzle_size = 0.2
-machine_nozzle_head_distance = 5
-machine_nozzle_tip_outer_diameter = 0.33
diff --git a/resources/variants/dagoma_pro_430_bowden_steel_0.6.inst.cfg b/resources/variants/dagoma_pro_430_bowden_steel_0.6.inst.cfg
deleted file mode 100644
index b8f02d299e..0000000000
--- a/resources/variants/dagoma_pro_430_bowden_steel_0.6.inst.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[general]
-name = 0.6
-version = 4
-definition = dagoma_pro_430_bowden
-
-[metadata]
-setting_version = 19
-type = variant
-hardware_type = nozzle
-
-[values]
-machine_nozzle_id = 0.6
-machine_nozzle_size = 0.6
-machine_nozzle_head_distance = 5
-machine_nozzle_tip_outer_diameter = 1.5
diff --git a/resources/variants/dagoma_pro_430_bowden_steel_0.8.inst.cfg b/resources/variants/dagoma_pro_430_bowden_steel_0.8.inst.cfg
deleted file mode 100644
index 135b370374..0000000000
--- a/resources/variants/dagoma_pro_430_bowden_steel_0.8.inst.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[general]
-name = 0.8
-version = 4
-definition = dagoma_pro_430_bowden
-
-[metadata]
-setting_version = 19
-type = variant
-hardware_type = nozzle
-
-[values]
-machine_nozzle_id = 0.8
-machine_nozzle_size = 0.8
-machine_nozzle_head_distance = 5
-machine_nozzle_tip_outer_diameter = 2