Merge pull request #1 from Ultimaker/ed/sovol-rework

Ed/sovol rework

.github/workflows/printer-linter-format.yml

@@ -3,7 +3,11 @@ name: printer-linter-format
 on:
     push:
         paths:
-            - 'resources/**'
+            - 'resources/definitions/**'
+            - 'resources/extruders/**'
+            - 'resources/intent/**'
+            - 'resources/quality/**'
+            - 'resources/variants/**'
 
 jobs:
     printer-linter-format:

UltiMaker-Cura.spec.jinja

@@ -16,9 +16,9 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 # Add dynamic libs in the venv bin/Script Path. This is needed because we might copy some additional libs
 # e.q.: OpenSSL 1.1.1l in that directory with a separate:
 # `conan install openssl@1.1.1l -g deploy && cp openssl/bin/*.so cura_inst/bin`
-binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.so*")])
+binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.so*")])
-binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dll")])
+binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dll")])
-binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dylib")])
+binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dylib")])
 
 block_cipher = None
 

plugins/PostProcessingPlugin/scripts/FilamentChange.py

@@ -24,20 +24,29 @@ class FilamentChange(Script):
             "version": 2,
             "settings":
             {
+                "enabled":
+                {
+                    "label": "Enable",
+                    "description": "Uncheck to temporarily disable this feature.",
+                    "type": "bool",
+                    "default_value": true
+                },
                 "layer_number":
                 {
                     "label": "Layer",
                     "description": "At what layer should color change occur. This will be before the layer starts printing. Specify multiple color changes with a comma.",
                     "unit": "",
                     "type": "str",
-                    "default_value": "1"
+                    "default_value": "1",
+                    "enabled": "enabled"
                 },
                 "firmware_config":
                 {
                     "label": "Use Firmware Configuration",
                     "description": "Use the settings in your firmware, or customise the parameters of the filament change here.",
                     "type": "bool",
-                    "default_value": false
+                    "default_value": false,
+                    "enabled": "enabled"
                 },
                 "initial_retract":
                 {
@@ -46,7 +55,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 30.0,
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },
                 "later_retract":
                 {
@@ -55,7 +64,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 300.0,
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },
                 "x_position":
                 {
@@ -64,7 +73,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0,
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },
                 "y_position":
                 {
@@ -73,7 +82,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0,
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },
                 "z_position":
                 {
@@ -82,7 +91,8 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0,
-                    "minimum_value": 0
+                    "minimum_value": 0,
+                    "enabled": "enabled"
                 },
                 "retract_method":
                 {
@@ -92,7 +102,7 @@ class FilamentChange(Script):
                     "options": {"U": "Marlin (M600 U)", "L": "Reprap (M600 L)"},
                     "default_value": "U",
                     "value": "\\\"L\\\" if machine_gcode_flavor==\\\"RepRap (RepRap)\\\" else \\\"U\\\"",
-                    "enabled": "not firmware_config"
+                    "enabled": "enabled and not firmware_config"
                 },                    
                 "machine_gcode_flavor":
                 {
@@ -113,6 +123,40 @@ class FilamentChange(Script):
                     },
                     "default_value": "RepRap (Marlin/Sprinter)",
                     "enabled": "false"
+                },
+                "enable_before_macro":
+                {
+                    "label": "Enable G-code Before",
+                    "description": "Use this to insert a custom G-code macro before the filament change happens",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "enabled"
+                },
+                "before_macro":
+                {
+                    "label": "G-code Before",
+                    "description": "Any custom G-code to run before the filament change happens, for example, M300 S1000 P10000 for a long beep.",
+                    "unit": "",
+                    "type": "str",
+                    "default_value": "M300 S1000 P10000",
+                    "enabled": "enabled and enable_before_macro"
+                },
+                "enable_after_macro":
+                {
+                    "label": "Enable G-code After",
+                    "description": "Use this to insert a custom G-code macro after the filament change",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "enabled"
+                },
+                "after_macro":
+                {
+                    "label": "G-code After",
+                    "description": "Any custom G-code to run after the filament has been changed right before continuing the print, for example, you can add a sequence to purge filament and wipe the nozzle.",
+                    "unit": "",
+                    "type": "str",
+                    "default_value": "M300 S440 P500",
+                    "enabled": "enabled and enable_after_macro"
                 }
             }
         }"""
@@ -134,6 +178,7 @@ class FilamentChange(Script):
         :param data: A list of layers of g-code.
         :return: A similar list, with filament change commands inserted.
         """
+        enabled = self.getSettingValueByKey("enabled")
         layer_nums = self.getSettingValueByKey("layer_number")
         initial_retract = self.getSettingValueByKey("initial_retract")
         later_retract = self.getSettingValueByKey("later_retract")
@@ -141,8 +186,20 @@ class FilamentChange(Script):
         y_pos = self.getSettingValueByKey("y_position")
         z_pos = self.getSettingValueByKey("z_position")
         firmware_config = self.getSettingValueByKey("firmware_config")
+        enable_before_macro = self.getSettingValueByKey("enable_before_macro")
+        before_macro = self.getSettingValueByKey("before_macro")
+        enable_after_macro = self.getSettingValueByKey("enable_after_macro")
+        after_macro = self.getSettingValueByKey("after_macro")
 
-        color_change = "M600"
+        if not enabled:
+            return data
+
+        color_change = ";BEGIN FilamentChange plugin\n"
+
+        if enable_before_macro:
+            color_change = color_change + before_macro + "\n"
+
+        color_change = color_change + "M600\n"
 
         if not firmware_config:
             if initial_retract is not None and initial_retract > 0.:
@@ -163,7 +220,10 @@ class FilamentChange(Script):
             if z_pos is not None and z_pos > 0.:
                 color_change = color_change + (" Z%.2f" % z_pos)
 
-        color_change = color_change + " ; Generated by FilamentChange plugin\n"
+        if enable_after_macro:
+            color_change = color_change + after_macro + "\n"
+
+        color_change = color_change + ";END FilamentChange plugin\n"
 
         layer_targets = layer_nums.split(",")
         if len(layer_targets) > 0:

printer-linter/src/printerlinter/linters/meshes.py

@@ -4,12 +4,14 @@ from typing import Iterator
 from ..diagnostic import Diagnostic
 from .linter import Linter
 
+MAX_MESH_FILE_SIZE = 1 * 1024 * 1024  # 1MB
+
 
 class Meshes(Linter):
     def __init__(self, file: Path, settings: dict) -> None:
         """ Finds issues in model files, such as incorrect file format or too large size """
         super().__init__(file, settings)
-        self._max_file_size = self._settings.get("diagnostic-mesh-file-size", 1e6)
+        self._max_file_size = self._settings.get("diagnostic-mesh-file-size", MAX_MESH_FILE_SIZE)
 
     def check(self) -> Iterator[Diagnostic]:
         if self._settings["checks"].get("diagnostic-mesh-file-extension", False):

resources/definitions/dagoma_sigma.def.json

@@ -8,7 +8,7 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "platform": "dagoma_sigma.obj",
+        "platform": "dagoma_sigma.stl",
         "has_machine_quality": true,
         "has_materials": true,
         "has_variants": true,

resources/definitions/modix_v3_base.def.json

@@ -0,0 +1,88 @@
+{
+    "version": 2,
+    "name": "Modix Base Printer",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "author": "Modix",
+        "manufacturer": "Modix",
+        "file_formats": "text/x-gcode",
+        "has_variants": true,
+        "machine_extruder_trains":
+        {
+            "0": "modix_v3_extruder_0",
+            "1": "modix_v3_extruder_1"
+        },
+        "preferred_variant_name": "0.4 mm Nozzle",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "fill_outline_gaps": { "value": false },
+        "gantry_height": { "value": "90.0" },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'cubic'" },
+        "infill_sparse_density": { "value": "15" },
+        "layer_height_0": { "value": "round(machine_nozzle_size / 2, 1)" },
+        "line_width": { "value": "machine_nozzle_size * 1.05" },
+        "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nG10 P1 S0 R0 ; turn off extruder 1 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors" },
+        "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-100, 30],
+                [-100, 65],
+                [30, -105],
+                [-31, -100]
+            ]
+        },
+        "machine_name": { "default_value": "Modix Base Printer" },
+        "machine_start_gcode": { "default_value": "G28 ; home all axes" },
+        "material_diameter": { "default_value": 1.75 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "minimum_interface_area": { "value": 10 },
+        "minimum_support_area": { "value": 2 },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 1 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" },
+        "retraction_combing_max_distance": { "value": 5 },
+        "retraction_count_max": { "value": 50 },
+        "retraction_extrusion_window": { "value": 1 },
+        "retraction_hop": { "value": "layer_height*4" },
+        "retraction_hop_enabled": { "value": "support_enable" },
+        "retraction_prime_speed": { "value": 40 },
+        "retraction_retract_speed": { "value": 40 },
+        "retraction_speed": { "default_value": 40 },
+        "skin_overlap": { "value": 10.0 },
+        "skirt_brim_minimal_length": { "default_value": 200 },
+        "skirt_gap": { "value": 5.0 },
+        "skirt_line_count": { "value": 3 },
+        "speed_layer_0": { "value": 20.0 },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_travel": { "value": 110.0 },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_z_hop": { "value": 5 },
+        "support_angle": { "value": 55 },
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 5 },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 15" },
+        "support_interface_density": { "value": 40 },
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 3" },
+        "support_use_towers": { "value": false },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.2 else layer_height * 2" },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": true },
+        "wall_thickness": { "value": "line_width * 2" },
+        "z_seam_corner": { "value": "z_seam_corner_weighted" }
+    }
+}

resources/definitions/modix_v3_big120X.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V3 BIG-120X",
+    "inherits": "modix_v3_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 640 },
+        "machine_name": { "default_value": "Modix BIG-120X V3" },
+        "machine_width": { "default_value": 1200 }
+    }
+}

resources/definitions/modix_v3_big120Z.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V3 BIG-120Z",
+    "inherits": "modix_v3_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 1200 },
+        "machine_name": { "default_value": "Modix BIG-120Z V3" },
+        "machine_width": { "default_value": 600 }
+    }
+}

resources/definitions/modix_v3_big180X.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V3 BIG-180X",
+    "inherits": "modix_v3_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 600 },
+        "machine_name": { "default_value": "Modix BIG-180X V3" },
+        "machine_width": { "default_value": 1800 }
+    }
+}

resources/definitions/modix_v3_big40.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V3 BIG-40",
+    "inherits": "modix_v3_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 400 },
+        "machine_height": { "default_value": 800 },
+        "machine_name": { "default_value": "Modix BIG-40 V3" },
+        "machine_width": { "default_value": 400 }
+    }
+}

resources/definitions/modix_v3_big60.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V3 BIG-60",
+    "inherits": "modix_v3_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 660 },
+        "machine_name": { "default_value": "Modix BIG-60 V3" },
+        "machine_width": { "default_value": 600 }
+    }
+}

resources/definitions/modix_v3_big_meter.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V3 BIG-Meter",
+    "inherits": "modix_v3_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 1000 },
+        "machine_height": { "default_value": 1000 },
+        "machine_name": { "default_value": "Modix BIG-METER V3" },
+        "machine_width": { "default_value": 1000 }
+    }
+}

resources/definitions/modix_v4_base.def.json

@@ -0,0 +1,88 @@
+{
+    "version": 2,
+    "name": "Modix Base Printer",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "author": "Modix",
+        "manufacturer": "Modix",
+        "file_formats": "text/x-gcode",
+        "has_variants": true,
+        "machine_extruder_trains":
+        {
+            "0": "modix_v4_extruder_0",
+            "1": "modix_v4_extruder_1"
+        },
+        "preferred_variant_name": "0.4 mm Nozzle",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "fill_outline_gaps": { "value": false },
+        "gantry_height": { "value": "90.0" },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'cubic'" },
+        "infill_sparse_density": { "value": "15" },
+        "layer_height_0": { "value": "round(machine_nozzle_size / 2, 1)" },
+        "line_width": { "value": "machine_nozzle_size * 1.05" },
+        "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors" },
+        "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-100, 30],
+                [-100, 65],
+                [30, -105],
+                [-31, -100]
+            ]
+        },
+        "machine_name": { "default_value": "Modix Base Printer" },
+        "machine_start_gcode": { "default_value": "G28 ; home all axes" },
+        "material_diameter": { "default_value": 1.75 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "minimum_interface_area": { "value": 10 },
+        "minimum_support_area": { "value": 2 },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 1 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" },
+        "retraction_combing_max_distance": { "value": 5 },
+        "retraction_count_max": { "value": 50 },
+        "retraction_extrusion_window": { "value": 1 },
+        "retraction_hop": { "value": 2 },
+        "retraction_hop_enabled": { "value": "support_enable" },
+        "retraction_prime_speed": { "value": 40 },
+        "retraction_retract_speed": { "value": 40 },
+        "retraction_speed": { "default_value": 40 },
+        "skin_overlap": { "value": 10.0 },
+        "skirt_brim_minimal_length": { "default_value": 200 },
+        "skirt_gap": { "value": 5.0 },
+        "skirt_line_count": { "value": 3 },
+        "speed_layer_0": { "value": 20.0 },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_travel": { "value": 250.0 },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_z_hop": { "value": 5 },
+        "support_angle": { "value": 55 },
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 5 },
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 15" },
+        "support_interface_density": { "value": 40 },
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 3" },
+        "support_use_towers": { "value": false },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.2 else layer_height * 2" },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": true },
+        "wall_thickness": { "value": "line_width * 2" },
+        "z_seam_corner": { "value": "z_seam_corner_weighted" }
+    }
+}

resources/definitions/modix_v4_big120X.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V4 BIG-120X",
+    "inherits": "modix_v4_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 640 },
+        "machine_name": { "default_value": "Modix BIG-120X V4" },
+        "machine_width": { "default_value": 1200 }
+    }
+}

resources/definitions/modix_v4_big120Z.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V4 BIG-120Z",
+    "inherits": "modix_v4_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 1200 },
+        "machine_name": { "default_value": "Modix BIG-120Z V4" },
+        "machine_width": { "default_value": 600 }
+    }
+}

resources/definitions/modix_v4_big180X.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V4 BIG-180X",
+    "inherits": "modix_v4_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 600 },
+        "machine_name": { "default_value": "Modix BIG-180X V4" },
+        "machine_width": { "default_value": 1800 }
+    }
+}

resources/definitions/modix_v4_big60.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V4 BIG-60",
+    "inherits": "modix_v4_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 600 },
+        "machine_height": { "default_value": 660 },
+        "machine_name": { "default_value": "Modix BIG-60 V4" },
+        "machine_width": { "default_value": 600 }
+    }
+}

resources/definitions/modix_v4_big_meter.def.json

@@ -0,0 +1,13 @@
+{
+    "version": 2,
+    "name": "Modix V4 BIG-Meter",
+    "inherits": "modix_v4_base",
+    "metadata": { "visible": true },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 1000 },
+        "machine_height": { "default_value": 1000 },
+        "machine_name": { "default_value": "Modix BIG-METER V4" },
+        "machine_width": { "default_value": 1000 }
+    }
+}

resources/definitions/sovol_base.def.json

@@ -2,20 +2,12 @@
     "version": 2,
     "name": "Sovol Base Printer",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": false,
         "author": "ed3d.net",
         "manufacturer": "Sovol 3D",
         "file_formats": "text/x-gcode",
-        "first_start_actions": ["MachineSettingsAction"],
-        
-        "has_materials": true,
-        "has_variants": true,
-        "has_machine_quality": true,
-        "variants_name": "Nozzle Size",
-
-        "preferred_variant_name": "0.4mm Nozzle",
-        "preferred_quality_type": "standard",
         "exclude_materials": [
             "Vertex_Delta_ABS",
             "Vertex_Delta_PET",
@@ -66,72 +58,60 @@
             "verbatim_bvoh_175",
             "zyyx_pro_flex",
             "zyyx_pro_pla"
-        ]
+        ],
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle",
+        "variants_name": "Nozzle Size"
     },
-
+    "overrides":
-    "overrides": {
+    {
-        
-        "machine_max_feedrate_x": { "value": 500 },
-        "machine_max_feedrate_y": { "value": 500 },
-        "machine_max_feedrate_z": { "value": 10 },
-        "machine_max_feedrate_e": { "value": 50 },
-        "machine_max_acceleration_x": { "value": 500 },
-        "machine_max_acceleration_y": { "value": 500 },
-        
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
-        "machine_max_jerk_xy": { "value": 8 },
-        
-        
-        "machine_heated_bed": { "default_value": true },
-        
-
-        "material_diameter": { "default_value": 1.75 },
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "material_final_print_temperature": { "value": "material_print_temperature" },
-
-        "adhesion_type": { "value": "'skirt'" },
-        
-        "adaptive_layer_height_variation": { "value": 0.04 },
-        "adaptive_layer_height_variation_step": { "value": 0.04 },
-        
-        "retraction_amount": { "default_value": 0.5 },
-        "retraction_speed": { "default_value": 40 },
-
         "acceleration_enabled": { "value": true },
         "acceleration_print": { "value": 500 },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
         "acceleration_travel": { "value": 500 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },
-        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
+        "adaptive_layer_height_variation": { "value": 0.04 },
-
+        "adaptive_layer_height_variation_step": { "value": 0.04 },
+        "adhesion_type": { "value": "'skirt'" },
+        "infill_before_walls": { "value": false },
+        "infill_line_distance": { "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))" },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 89 else 'cubic'" },
+        "infill_sparse_density": { "value": 10.0 },
+        "infill_wipe_dist": { "value": 0.0 },
         "jerk_enabled": { "value": true },
         "jerk_print": { "value": 8 },
         "jerk_travel": { "value": "jerk_print * 2" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-        
+        "machine_acceleration": { "value": 500 },
-        "speed_print": { "value": 50.0 } ,
+        "machine_heated_bed": { "default_value": true },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_feedrate_e": { "value": 50 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 10 },
+        "machine_max_jerk_xy": { "value": 8 },
+        "material_diameter": { "default_value": 1.75 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "default_value": 0.5 },
+        "retraction_speed": { "default_value": 40 },
+        "skin_monotonic": { "value": true },
+        "skin_overlap": { "value": 10.0 },
         "speed_layer_0": { "value": 20.0 },
+        "speed_print": { "value": 50.0 },
         "speed_topbottom": { "value": "math.ceil(speed_print * (50 / 100))" },
         "speed_wall": { "value": "math.ceil(speed_print * (50 / 100))" },
-        
+        "wall_0_wipe_dist": { "value": 0.0 },
-
-        "skin_monotonic": { "value": true },
-        
-        "z_seam_type": { "value": "'sharpest_corner'" },
-        "z_seam_corner": { "value": "'z_seam_corner_inner'" },
-        
         "wall_thickness": { "value": "line_width * 2" },
-        "optimize_wall_printing_order": { "value": "True" },
+        "z_seam_corner": { "value": "'z_seam_corner_inner'" },
-
+        "z_seam_type": { "value": "'sharpest_corner'" }
-        "infill_sparse_density": { "value": 10.0 },
-        
-        "infill_line_distance": { "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))" },
-        "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 89 else 'cubic'" },
-        "infill_before_walls": { "value": false },
-        "infill_overlap": { "value": 30.0 },
-
-        "skin_overlap": { "value": 10.0 },
-        "infill_wipe_dist": { "value": 0.0 },
-        "wall_0_wipe_dist": { "value": 0.0 }
     }
 }

resources/definitions/sovol_base_bowden.def.json

@@ -10,6 +10,6 @@
     "overrides":
     {
         "retraction_amount": { "default_value": 5 },
-        "retraction_speed": { "default_value": 70 }
+        "retraction_speed": { "value": "machine_max_feedrate_e" }
     }
 }

resources/definitions/sovol_base_planetary.def.json

@@ -2,13 +2,11 @@
     "version": 2,
     "name": "Sovol Base Planetary Printer",
     "inherits": "sovol_base",
-    "metadata": {
+    "metadata":
-        "quality_definition": "sovol_base_planetary",
+    {
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "sovol_planetary_extruder_0" },
-            "0": "sovol_planetary_extruder_0"
+        "quality_definition": "sovol_base_planetary"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {}
-    }
 }

resources/definitions/sovol_base_titan.def.json

@@ -2,13 +2,11 @@
     "version": 2,
     "name": "Sovol Base Titan Printer",
     "inherits": "sovol_base",
-    "metadata": {
+    "metadata":
-        "quality_definition": "sovol_base_titan",
+    {
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "sovol_titan_extruder_0" },
-            "0": "sovol_titan_extruder_0"
+        "quality_definition": "sovol_base_titan"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {}
-    }
 }

resources/definitions/sovol_sv01.def.json

@@ -1,30 +1,29 @@
-{
+{
-    "version": 2,
+    "version": 2,
-    "name": "Sovol SV01",
+    "name": "Sovol SV01",
-    "inherits": "sovol_base_bowden",
+    "inherits": "sovol_base_bowden",
-    "metadata": {
+    "metadata":
-        "visible": true,
+    {
-        "quality_definition": "sovol_base_bowden"
+        "visible": true,
-    },
+        "quality_definition": "sovol_base_bowden"
-
+    },
-    "overrides": {
+    "overrides":
-        "machine_name": { "default_value": "SV01" },
+    {
-        
+        "gantry_height": { "value": 33 },
-        "machine_width": { "default_value": 280 },
+        "machine_depth": { "default_value": 240 },
-        "machine_depth": { "default_value": 240 },
+        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
-        "machine_height": { "default_value": 300 },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": {
+        {
-            "default_value": [
+            "default_value": [
-                [-44, 16],
+                [-44, 16],
-                [-44, -60],
+                [-44, -60],
-                [44, -60],
+                [44, -60],
-                [44, 16]
+                [44, 16]
-            ]
+            ]
-        },
+        },
-    
+        "machine_height": { "default_value": 300 },
-        "gantry_height": { "value": 33 },
+        "machine_name": { "default_value": "SV01" },
-        
+        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
-        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
+        "machine_width": { "default_value": 280 }
-        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }
+    }
-    }
+}
-}

resources/definitions/sovol_sv01pro.def.json

@@ -1,30 +1,29 @@
-{
+{
-    "version": 2,
+    "version": 2,
-    "name": "Sovol SV01PRO",
+    "name": "Sovol SV01PRO",
-    "inherits": "sovol_base_titan",
+    "inherits": "sovol_base_titan",
-    "metadata": {
+    "metadata":
-        "visible": true,
+    {
-        "quality_definition": "sovol_base_titan"
+        "visible": true,
-    },
+        "quality_definition": "sovol_base_titan"
-
+    },
-    "overrides": {
+    "overrides":
-        "machine_name": { "default_value": "SV01PRO" },
+    {
-
+        "gantry_height": { "value": 33 },
-        "machine_width": { "default_value": 280 },
+        "machine_depth": { "default_value": 240 },
-        "machine_depth": { "default_value": 240 },
+        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
-        "machine_height": { "default_value": 300 },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": {
+        {
-            "default_value": [
+            "default_value": [
-                [-44, 16],
+                [-44, 16],
-                [-44, -60],
+                [-44, -60],
-                [44, -60],
+                [44, -60],
-                [44, 16]
+                [44, 16]
-            ]
+            ]
-        },
+        },
-
+        "machine_height": { "default_value": 300 },
-        "gantry_height": { "value": 33 },
+        "machine_name": { "default_value": "SV01PRO" },
-
+        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 ;use bed mesh, must have used G29 previously\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
-        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 ;use bed mesh, must have used G29 previously\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
+        "machine_width": { "default_value": 280 }
-        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }
+    }
-    }
+}
-}

resources/definitions/sovol_sv03.def.json

@@ -1,30 +1,29 @@
-{
+{
-    "version": 2,
+    "version": 2,
-    "name": "Sovol SV03",
+    "name": "Sovol SV03",
-    "inherits": "sovol_base_titan",
+    "inherits": "sovol_base_titan",
-    "metadata": {
+    "metadata":
-        "visible": true,
+    {
-        "quality_definition": "sovol_base_titan"
+        "visible": true,
-    },
+        "quality_definition": "sovol_base_titan"
-
+    },
-    "overrides": {
+    "overrides":
-        "machine_name": { "default_value": "SV03" },
+    {
-
+        "gantry_height": { "value": 33 },
-        "machine_width": { "default_value": 350 },
+        "machine_depth": { "default_value": 350 },
-        "machine_depth": { "default_value": 350 },
+        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
-        "machine_height": { "default_value": 400 },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": {
+        {
-            "default_value": [
+            "default_value": [
-                [-44, 16],
+                [-44, 16],
-                [-44, -60],
+                [-44, -60],
-                [44, -60],
+                [44, -60],
-                [44, 16]
+                [44, 16]
-            ]
+            ]
-        },
+        },
-    
+        "machine_height": { "default_value": 400 },
-        "gantry_height": { "value": 33 },
+        "machine_name": { "default_value": "SV03" },
-
+        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 ;use bed mesh, must have used G29 previously\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
-        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 ;use bed mesh, must have used G29 previously\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
+        "machine_width": { "default_value": 350 }
-        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }
+    }
-    }
+}
-}

resources/definitions/sovol_sv05.def.json

@@ -1,30 +1,29 @@
-{
+{
-    "version": 2,
+    "version": 2,
-    "name": "Sovol SV05",
+    "name": "Sovol SV05",
-    "inherits": "sovol_base_titan",
+    "inherits": "sovol_base_titan",
-    "metadata": {
+    "metadata":
-        "visible": true,
+    {
-        "quality_definition": "sovol_base_titan"
+        "visible": true,
-    },
+        "quality_definition": "sovol_base_titan"
-
+    },
-    "overrides": {
+    "overrides":
-        "machine_name": { "default_value": "SV05" },
+    {
-
+        "gantry_height": { "value": 25 },
-        "machine_width": { "default_value": 220 },
+        "machine_depth": { "default_value": 220 },
-        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
-        "machine_height": { "default_value": 300 },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": {
+        {
-            "default_value": [
+            "default_value": [
-                [-44, 16],
+                [-44, 16],
-                [-44, -60],
+                [-44, -60],
-                [44, -60],
+                [44, -60],
-                [44, 16]
+                [44, 16]
-            ]
+            ]
-        },
+        },
-    
+        "machine_height": { "default_value": 300 },
-        "gantry_height": { "value": 25 },
+        "machine_name": { "default_value": "SV05" },
-
+        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 ;use bed mesh, must have used G29 previously\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
-        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 ;use bed mesh, must have used G29 previously\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
+        "machine_width": { "default_value": 220 }
-        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }
+    }
-    }
+}
-}

resources/definitions/sovol_sv06.def.json

@@ -1,30 +1,29 @@
-{
+{
-    "version": 2,
+    "version": 2,
-    "name": "Sovol SV06",
+    "name": "Sovol SV06",
-    "inherits": "sovol_base_planetary",
+    "inherits": "sovol_base_planetary",
-    "metadata": {
+    "metadata":
-        "visible": true,
+    {
-        "quality_definition": "sovol_base_planetary"
+        "visible": true,
-    },
+        "quality_definition": "sovol_base_planetary"
-
+    },
-    "overrides": {
+    "overrides":
-        "machine_name": { "default_value": "SV06" },
+    {
-
+        "gantry_height": { "value": 25 },
-        "machine_width": { "default_value": 220 },
+        "machine_depth": { "default_value": 220 },
-        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
-        "machine_height": { "default_value": 250 },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": {
+        {
-            "default_value": [
+            "default_value": [
-                [-44, 16],
+                [-44, 16],
-                [-44, -60],
+                [-44, -60],
-                [44, -60],
+                [44, -60],
-                [44, 16]
+                [44, 16]
-            ]
+            ]
-        },
+        },
-    
+        "machine_height": { "default_value": 250 },
-        "gantry_height": { "value": 25 },
+        "machine_name": { "default_value": "SV06" },
-
+        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 ;use bed mesh, must have used G29 previously\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
-        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 ;use bed mesh, must have used G29 previously\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
+        "machine_width": { "default_value": 220 }
-        "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }
+    }
-    }
+}
-}

resources/extruders/modix_v3_extruder_0.def.json

@@ -0,0 +1,19 @@
+{
+    "version": 2,
+    "name": "Left Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "modix_v3_base",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr":
+        {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/modix_v3_extruder_1.def.json

@@ -0,0 +1,19 @@
+{
+    "version": 2,
+    "name": "Right Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "modix_v3_base",
+        "position": "1"
+    },
+    "overrides":
+    {
+        "extruder_nr":
+        {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/modix_v4_extruder_0.def.json

@@ -0,0 +1,19 @@
+{
+    "version": 2,
+    "name": "Left Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "modix_v4_base",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr":
+        {
+            "default_value": 0,
+            "maximum_value": "1"
+        },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/modix_v4_extruder_1.def.json

@@ -0,0 +1,19 @@
+{
+    "version": 2,
+    "name": "Right Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "modix_v4_base",
+        "position": "1"
+    },
+    "overrides":
+    {
+        "extruder_nr":
+        {
+            "default_value": 1,
+            "maximum_value": "1"
+        },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/sovol_bowden_extruder_0.def.json

@@ -2,15 +2,14 @@
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
-    "metadata": {
+    "metadata":
-        "machine": "sovol_base",
+    {
+        "machine": "sovol_base_bowden",
         "position": "0"
     },
-
+    "overrides":
-    "overrides": {
+    {
         "extruder_nr": { "default_value": 0 },
-        
         "material_diameter": { "default_value": 1.75 }
-        
     }
-}
+}

resources/extruders/sovol_planetary_extruder_0.def.json

@@ -2,15 +2,14 @@
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
-    "metadata": {
+    "metadata":
-        "machine": "sovol_base",
+    {
+        "machine": "sovol_base_planetary",
         "position": "0"
     },
-
+    "overrides":
-    "overrides": {
+    {
         "extruder_nr": { "default_value": 0 },
-        
         "material_diameter": { "default_value": 1.75 }
-        
     }
-}
+}

resources/extruders/sovol_titan_extruder_0.def.json

@@ -2,15 +2,14 @@
     "version": 2,
     "name": "Extruder 1",
     "inherits": "fdmextruder",
-    "metadata": {
+    "metadata":
-        "machine": "sovol_base",
+    {
+        "machine": "sovol_base_titan",
         "position": "0"
     },
-
+    "overrides":
-    "overrides": {
+    {
         "extruder_nr": { "default_value": 0 },
-        
         "material_diameter": { "default_value": 1.75 }
-        
     }
-}
+}

resources/qml/Cura.qml

@@ -17,6 +17,12 @@ UM.MainWindow
 {
     id: base
 
+    Item
+    {
+        id: mainWindow
+        anchors.fill: parent
+    }
+
     // Cura application window title
     title:
     {

resources/qml/Menus/MaterialBrandMenu.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
@@ -36,6 +36,7 @@ Cura.MenuItem
 
             UM.Label
             {
+                id: brandLabelText
                 text: replaceText(materialBrandMenu.text)
                 Layout.fillWidth: true
                 Layout.fillHeight:true
@@ -84,33 +85,15 @@ Cura.MenuItem
         onTriggered: menuPopup.close()
     }
 
-    Popup
+    MaterialBrandSubMenu
     {
         id: menuPopup
-        width: materialTypesList.width + padding * 2
-        height: materialTypesList.height + padding * 2
 
-        property var flipped: false
-
-        x: parent.width - UM.Theme.getSize("default_lining").width
-        y: {
-            // Checks if popup is more than halfway down the screen AND further than 400 down (this avoids popup going off the top of screen)
-            // If it is then the popup will push up instead of down
-            // This fixes the popups appearing bellow the bottom of the screen.
-
-            if (materialBrandMenu.parent.height / 2 < parent.y && parent.y > 400) {
-                flipped = true
-                return -UM.Theme.getSize("default_lining").width - height + UM.Theme.getSize("menu").height
-            }
-            flipped = false
-            return -UM.Theme.getSize("default_lining").width
-        }
-
-        padding: background.border.width
         // Nasty hack to ensure that we can keep track if the popup contains the mouse.
         // Since we also want a hover for the sub items (and these events are sent async)
         // We have to keep a count of itemHovered (instead of just a bool)
         property int itemHovered: 0
+
         MouseArea
         {
             id: submenuArea
@@ -120,16 +103,11 @@ Cura.MenuItem
             onEntered: hideTimer.restartTimer()
         }
 
-        background: Rectangle
-        {
-            color: UM.Theme.getColor("main_background")
-            border.color: UM.Theme.getColor("lining")
-            border.width: UM.Theme.getSize("default_lining").width
-        }
-
         Column
         {
             id: materialTypesList
+            width: UM.Theme.getSize("menu").width
+            height: childrenRect.height
             spacing: 0
 
             property var brandMaterials: materialTypesModel.material_types
@@ -146,9 +124,7 @@ Cura.MenuItem
                     height: UM.Theme.getSize("menu").height
                     width: UM.Theme.getSize("menu").width
 
-                    color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1")
+                    color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : "transparent"
-
-                    property var isFlipped:  menuPopup.flipped
 
                     RowLayout
                     {
@@ -185,7 +161,7 @@ Cura.MenuItem
                             source: UM.Theme.getIcon("ChevronSingleRight")
                         }
 
-                                                Item
+                        Item
                         {
                             // Right side margin
                             width: UM.Theme.getSize("default_margin").width
@@ -236,34 +212,17 @@ Cura.MenuItem
                         onTriggered: colorPopup.close()
                     }
 
-                    Popup
+                    MaterialBrandSubMenu
                     {
                         id: colorPopup
-                        width: materialColorsList.width + padding * 2
-                        height: materialColorsList.height + padding * 2
-                        x: parent.width
-                        y: {
-                            // If flipped the popup should push up rather than down from the parent
-                            if (brandMaterialBase.isFlipped) {
-                                return -height + UM.Theme.getSize("menu").height + UM.Theme.getSize("default_lining").width
-                            }
-                            return -UM.Theme.getSize("default_lining").width
-                        }
-
                         property int itemHovered: 0
-                        padding: background.border.width
-
-                        background: Rectangle
-                        {
-                            color: UM.Theme.getColor("main_background")
-                            border.color: UM.Theme.getColor("lining")
-                            border.width: UM.Theme.getSize("default_lining").width
-                        }
 
                         Column
                         {
                             id: materialColorsList
                             property var brandColors: model.colors
+                            width: UM.Theme.getSize("menu").width
+                            height: childrenRect.height
                             spacing: 0
 
                             Repeater
@@ -273,12 +232,38 @@ Cura.MenuItem
                                 delegate: Rectangle
                                 {
                                     height: UM.Theme.getSize("menu").height
-                                    width: UM.Theme.getSize("menu").width
+                                    width: parent.width
 
-                                    color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1")
+                                    color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("main_background")
+
+                                    MouseArea
+                                    {
+                                        id: materialColorButton
+                                        anchors.fill: parent
+                                        hoverEnabled: true
+                                        onClicked:
+                                        {
+                                            Cura.MachineManager.setMaterial(extruderIndex, model.container_node);
+                                            menuPopup.close();
+                                            colorPopup.close();
+                                            materialMenu.close();
+                                        }
+                                        onEntered:
+                                        {
+                                            menuPopup.itemHovered += 1;
+                                            colorPopup.itemHovered += 1;
+                                        }
+                                        onExited:
+                                        {
+                                            menuPopup.itemHovered -= 1;
+                                            colorPopup.itemHovered -= 1;
+                                        }
+                                    }
 
                                     Item
                                     {
+                                        height: parent.height
+                                        width: parent.width
                                         opacity: materialBrandMenu.enabled ? 1 : 0.5
                                         anchors.fill: parent
 
@@ -309,31 +294,6 @@ Cura.MenuItem
                                             wrapMode: Text.NoWrap
                                         }
                                     }
-
-                                    MouseArea
-                                    {
-                                        id: materialColorButton
-                                        anchors.fill: parent
-
-                                        hoverEnabled: true
-                                        onClicked:
-                                        {
-                                            Cura.MachineManager.setMaterial(extruderIndex, model.container_node);
-                                            menuPopup.close();
-                                            colorPopup.close();
-                                            materialMenu.close();
-                                        }
-                                        onEntered:
-                                        {
-                                            menuPopup.itemHovered += 1;
-                                            colorPopup.itemHovered += 1;
-                                        }
-                                        onExited:
-                                        {
-                                            menuPopup.itemHovered -= 1;
-                                            colorPopup.itemHovered -= 1;
-                                        }
-                                    }
                                 }
                             }
                         }

resources/qml/Menus/MaterialBrandSubMenu.qml

@@ -0,0 +1,118 @@
+// Copyright (c) 2022 UltiMaker
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.7
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 2.7
+
+import UM 1.5 as UM
+import Cura 1.7 as Cura
+
+Popup
+{
+    id: materialBrandSubMenu
+
+    bottomPadding: UM.Theme.getSize("thin_margin").height
+    topPadding: UM.Theme.getSize("thin_margin").height
+
+    implicitWidth: scrollViewContent.width + scrollbar.width + leftPadding + rightPadding
+    implicitHeight: scrollViewContent.height + bottomPadding + topPadding
+
+    // offset position relative to the parent
+    property int implicitX: parent.width
+    property int implicitY: -UM.Theme.getSize("thin_margin").height
+
+    default property alias contents: scrollViewContent.children
+
+    x: implicitX
+    y: implicitY
+
+    // needed for the `mapToItem` function to work; apparently a Popup is not an Item
+    Item
+    {
+        id: materialBrandSubMenuItem
+        anchors.fill: parent
+    }
+
+    onOpened:
+    {
+        // we want to make sure here that the popup never goes out side the window so we adjust the x and y position
+        // based on the width/height of the mainWindow/popup. QML is a bit weird here though, as the globalPosition
+        // is in absolute coordinates relative to the origin of the mainWindow while setting the x and y coordinates
+        // of the popup only changes the position relative to the parent.
+
+        // reset position, the remainder of the function asumes this position and size
+        materialBrandSubMenu.x = implicitX;
+        materialBrandSubMenu.y = implicitY;
+        materialBrandSubMenu.width = implicitWidth;
+        materialBrandSubMenu.height = implicitHeight;
+
+        const globalPosition = materialBrandSubMenuItem.mapToItem(null, 0, 0);
+
+        if (globalPosition.y > mainWindow.height - materialBrandSubMenu.height)
+        {
+            if (mainWindow.height > materialBrandSubMenu.height)
+            {
+                const targetY = mainWindow.height - materialBrandSubMenu.height;
+                const deltaY = globalPosition.y - targetY;
+                materialBrandSubMenu.y = implicitY - deltaY;
+            }
+            else
+            {
+                // if popup is taller then the the component, limit
+                // the components height and set the position to
+                // y = 0 (in absolute coordinates)
+                materialBrandSubMenu.y = implicitY - globalPosition.y;
+                materialBrandSubMenu.height = mainWindow.height;
+            }
+        }
+
+        if (globalPosition.x > mainWindow.width - materialBrandSubMenu.width)
+        {
+            if (mainWindow.width > materialBrandSubMenu.width)
+            {
+                const targetX = mainWindow.width - materialBrandSubMenu.width;
+                const deltaX = globalPosition.x - targetX;
+                materialBrandSubMenu.x = implicitX - deltaX;
+            }
+            else
+            {
+                materialBrandSubMenu.x = implicitX - globalPosition.x;
+                materialBrandSubMenu.width = mainWindow.width;
+            }
+        }
+    }
+
+    padding: background.border.width
+
+    background: Rectangle
+    {
+        color: UM.Theme.getColor("main_background")
+        border.color: UM.Theme.getColor("lining")
+        border.width: UM.Theme.getSize("default_lining").width
+    }
+
+    ScrollView
+    {
+        id: scrollView
+        anchors.fill: parent
+        contentHeight: scrollViewContent.height
+        clip: true
+
+        ScrollBar.vertical: UM.ScrollBar
+        {
+            id: scrollbar
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+        }
+
+        Rectangle
+        {
+            id: scrollViewContent
+            width: childrenRect.width
+            height: childrenRect.height
+            color: UM.Theme.getColor("main_background")
+        }
+    }
+}

resources/quality/sovol/ABS/sovol_bowden_0.2_ABS_super.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_bowden
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_abs
 variant = 0.2mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.2_ABS_ultra.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Ultra Quality
 definition = sovol_base_bowden
+name = Ultra Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = ultra
 setting_version = 20
 type = quality
-quality_type = ultra
-material = generic_abs
 variant = 0.2mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_adaptive.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_bowden
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_abs
 variant = 0.3mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_low.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_bowden
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_abs
 variant = 0.3mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_standard.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_bowden
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_abs
 variant = 0.3mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_super.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_bowden
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_abs
 variant = 0.3mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_adaptive.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_bowden
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_abs
 variant = 0.4mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_low.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_bowden
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_abs
 variant = 0.4mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_standard.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_bowden
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_abs
 variant = 0.4mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_super.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_bowden
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_abs
 variant = 0.4mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_adaptive.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_bowden
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_low.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_bowden
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_standard.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_bowden
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_super.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_bowden
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_adaptive.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_bowden
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_abs
 variant = 0.6mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_draft.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_bowden
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_abs
 variant = 0.6mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_low.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_bowden
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_standard.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_bowden
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_abs
 variant = 0.6mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_0.8_ABS_draft.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_bowden
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_abs
 variant = 0.8mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_bowden_1.0_ABS_draft.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_bowden
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_abs
 variant = 1.0mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.2_ABS_super.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_planetary
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_abs
 variant = 0.2mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.2_ABS_ultra.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Ultra Quality
 definition = sovol_base_planetary
+name = Ultra Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = ultra
 setting_version = 20
 type = quality
-quality_type = ultra
-material = generic_abs
 variant = 0.2mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_adaptive.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_planetary
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_abs
 variant = 0.3mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_low.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_planetary
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_abs
 variant = 0.3mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_standard.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_planetary
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_abs
 variant = 0.3mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_super.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_planetary
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_abs
 variant = 0.3mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_adaptive.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_planetary
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_abs
 variant = 0.4mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_low.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_planetary
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_abs
 variant = 0.4mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_standard.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_planetary
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_abs
 variant = 0.4mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_super.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_planetary
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_abs
 variant = 0.4mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_adaptive.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_planetary
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_low.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_planetary
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_standard.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_planetary
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_super.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_planetary
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_adaptive.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_planetary
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_abs
 variant = 0.6mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_draft.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_planetary
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_abs
 variant = 0.6mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_low.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_planetary
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_abs
 variant = 0.5mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_standard.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_planetary
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_abs
 variant = 0.6mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_0.8_ABS_draft.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_planetary
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_abs
 variant = 0.8mm Nozzle
 
 [values]
+

resources/quality/sovol/ABS/sovol_planetary_1.0_ABS_draft.inst.cfg

@@ -1,13 +1,14 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_planetary
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_abs
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_abs
 variant = 1.0mm Nozzle
 
 [values]
+

resources/quality/sovol/PETG/sovol_bowden_0.2_PETG_super.inst.cfg

@@ -1,17 +1,17 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_bowden
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_petg
 variant = 0.2mm Nozzle
 
 [values]
+retraction_amount = 7
+retraction_speed = 25
 speed_layer_0 = 15
 
-retraction_amount = 7
-retraction_speed = 25

resources/quality/sovol/PETG/sovol_bowden_0.2_PETG_ultra.inst.cfg

@@ -1,17 +1,17 @@
 [general]
-version = 4
-name = Ultra Quality
 definition = sovol_base_bowden
+name = Ultra Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = ultra
 setting_version = 20
 type = quality
-quality_type = ultra
-material = generic_petg
 variant = 0.2mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
+

resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_adaptive.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_bowden
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_petg
 variant = 0.3mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_low.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_bowden
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_petg
 variant = 0.3mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_standard.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_bowden
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_petg
 variant = 0.3mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_super.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_bowden
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_petg
 variant = 0.3mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_adaptive.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_bowden
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_petg
 variant = 0.4mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_low.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_bowden
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_petg
 variant = 0.4mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_standard.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_bowden
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_petg
 variant = 0.4mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_super.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_bowden
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_petg
 variant = 0.4mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_adaptive.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_bowden
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_petg
 variant = 0.5mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_low.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_bowden
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_petg
 variant = 0.5mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_standard.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_bowden
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_petg
 variant = 0.5mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_super.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_bowden
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_petg
 variant = 0.5mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_adaptive.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Dynamic Quality
 definition = sovol_base_bowden
+name = Dynamic Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = adaptive
 setting_version = 20
 type = quality
-quality_type = adaptive
-material = generic_petg
 variant = 0.6mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_draft.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_bowden
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_petg
 variant = 0.6mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_low.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Low Quality
 definition = sovol_base_bowden
+name = Low Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = low
 setting_version = 20
 type = quality
-quality_type = low
-material = generic_petg
 variant = 0.6mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_standard.inst.cfg

@@ -1,18 +1,17 @@
 [general]
-version = 4
-name = Standard Quality
 definition = sovol_base_bowden
+name = Standard Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = standard
 setting_version = 20
 type = quality
-quality_type = standard
-material = generic_petg
 variant = 0.6mm Nozzle
 
 [values]
-speed_layer_0 = 15
-
 retraction_amount = 7
 retraction_speed = 25
+speed_layer_0 = 15
 

resources/quality/sovol/PETG/sovol_bowden_0.8_PETG_draft.inst.cfg

@@ -1,17 +1,16 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_bowden
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_petg
 variant = 0.8mm Nozzle
 
 [values]
+retraction_amount = 0.8
 speed_layer_0 = 15
 
-retraction_amount = 0.8
-

resources/quality/sovol/PETG/sovol_bowden_1.0_PETG_draft.inst.cfg

@@ -1,17 +1,16 @@
 [general]
-version = 4
-name = Draft Quality
 definition = sovol_base_bowden
+name = Draft Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = draft
 setting_version = 20
 type = quality
-quality_type = draft
-material = generic_petg
 variant = 1.0mm Nozzle
 
 [values]
+retraction_amount = 0.8
 speed_layer_0 = 15
 
-retraction_amount = 0.8
-

resources/quality/sovol/PETG/sovol_planetary_0.2_PETG_super.inst.cfg

@@ -1,17 +1,17 @@
 [general]
-version = 4
-name = Super Quality
 definition = sovol_base_planetary
+name = Super Quality
+version = 4
 
 [metadata]
+material = generic_petg
+quality_type = super
 setting_version = 20
 type = quality
-quality_type = super
-material = generic_petg
 variant = 0.2mm Nozzle
 
 [values]
+retraction_amount = 2
+retraction_speed = 40
 speed_layer_0 = 15
 
-retraction_amount = 2
-retraction_speed = 40