Merge remote-tracking branch 'origin/main' into CURA-9157_msi_installer

conandata.yml

@@ -12,10 +12,10 @@
 # Subject to change in the future!
 "5.3.0-alpha":
     requirements:
-        - "pyarcus/(latest)@ultimaker/testing"
+        - "pyarcus/5.2.2"
         - "curaengine/(latest)@ultimaker/testing"
-        - "pysavitar/(latest)@ultimaker/testing"
+        - "pysavitar/5.2.2"
-        - "pynest2d/(latest)@ultimaker/testing"
+        - "pynest2d/5.2.2"
         - "uranium/(latest)@ultimaker/testing"
         - "fdm_materials/(latest)@ultimaker/testing"
         - "cura_binary_data/(latest)@ultimaker/testing"
@@ -225,216 +225,6 @@
             Windows: "./icons/Cura.ico"
             Macos: "./icons/cura.icns"
             Linux: "./icons/cura-128.png"
-"5.2.0-beta.2":
-    requirements:
-        - "pyarcus/(latest)@ultimaker/stable"
-        - "curaengine/(latest)@ultimaker/stable"
-        - "pysavitar/(latest)@ultimaker/stable"
-        - "pynest2d/(latest)@ultimaker/stable"
-        - "uranium/(latest)@ultimaker/stable"
-        - "fdm_materials/(latest)@ultimaker/stable"
-        - "cura_binary_data/(latest)@ultimaker/stable"
-        - "cpython/3.10.4"
-    internal_requirements:
-        - "fdm_materials_private/(latest)@ultimaker/testing"
-        - "cura_private_data/(latest)@ultimaker/testing"
-    runinfo:
-        entrypoint: "cura_app.py"
-    pyinstaller:
-        datas:
-            cura_plugins:
-                package: "cura"
-                src: "plugins"
-                dst: "share/cura/plugins"
-            cura_resources:
-                package: "cura"
-                src: "resources"
-                dst: "share/cura/resources"
-            cura_private_data:
-                package: "cura_private_data"
-                src: "resources"
-                dst: "share/cura/resources"
-                internal: true
-            uranium_plugins:
-                package: "uranium"
-                src: "plugins"
-                dst: "share/uranium/plugins"
-            uranium_resources:
-                package: "uranium"
-                src: "resources"
-                dst: "share/uranium/resources"
-            uranium_um_qt_qml_um:
-                package: "uranium"
-                src: "site-packages/UM/Qt/qml/UM"
-                dst: "PyQt6/Qt6/qml/UM"
-            cura_binary_data:
-                package: "cura_binary_data"
-                src: "resources/cura/resources"
-                dst: "share/cura/resources"
-            uranium_binary_data:
-                package: "cura_binary_data"
-                src: "resources/uranium/resources"
-                dst: "share/uranium/resources"
-            windows_binary_data:
-                package: "cura_binary_data"
-                src: "windows"
-                dst: "share/windows"
-            fdm_materials:
-                package: "fdm_materials"
-                src: "materials"
-                dst: "share/cura/resources/materials"
-            fdm_materials_private:
-                package: "fdm_materials_private"
-                src: "resources/materials"
-                dst: "share/cura/resources/materials"
-                internal: true
-            tcl:
-                package: "tcl"
-                src: "lib/tcl8.6"
-                dst: "tcl"
-            tk:
-                package: "tk"
-                src: "lib/tk8.6"
-                dst: "tk"
-        binaries:
-            curaengine:
-                package: "curaengine"
-                src: "bin"
-                dst: "."
-                binary: "CuraEngine"
-        hiddenimports:
-            - "pySavitar"
-            - "pyArcus"
-            - "pynest2d"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "logging.handlers"
-            - "zeroconf"
-            - "fcntl"
-            - "stl"
-            - "serial"
-        collect_all:
-            - "cura"
-            - "UM"
-            - "serial"
-            - "Charon"
-            - "sqlite3"
-            - "trimesh"
-            - "win32ctypes"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "stl"
-        icon:
-            Windows: "./icons/Cura.ico"
-            Macos: "./icons/cura.icns"
-            Linux: "./icons/cura-128.png"
-"5.2.0-beta.1":
-    requirements:
-        - "pyarcus/5.2.0-beta.1"
-        - "curaengine/5.2.0-beta.1"
-        - "pysavitar/5.2.0-beta.1"
-        - "pynest2d/5.2.0-beta.1"
-        - "uranium/5.2.0-beta.1"
-        - "fdm_materials/5.2.0-beta.1"
-        - "cura_binary_data/5.2.0-beta.1"
-        - "cpython/3.10.4"
-    internal_requirements:
-        - "fdm_materials_private/(latest)@ultimaker/testing"
-        - "cura_private_data/(latest)@ultimaker/testing"
-    runinfo:
-        entrypoint: "cura_app.py"
-    pyinstaller:
-        datas:
-            cura_plugins:
-                package: "cura"
-                src: "plugins"
-                dst: "share/cura/plugins"
-            cura_resources:
-                package: "cura"
-                src: "resources"
-                dst: "share/cura/resources"
-            cura_private_data:
-                package: "cura_private_data"
-                src: "resources"
-                dst: "share/cura/resources"
-                internal: true
-            uranium_plugins:
-                package: "uranium"
-                src: "plugins"
-                dst: "share/uranium/plugins"
-            uranium_resources:
-                package: "uranium"
-                src: "resources"
-                dst: "share/uranium/resources"
-            uranium_um_qt_qml_um:
-                package: "uranium"
-                src: "site-packages/UM/Qt/qml/UM"
-                dst: "PyQt6/Qt6/qml/UM"
-            cura_binary_data:
-                package: "cura_binary_data"
-                src: "resources/cura/resources"
-                dst: "share/cura/resources"
-            uranium_binary_data:
-                package: "cura_binary_data"
-                src: "resources/uranium/resources"
-                dst: "share/uranium/resources"
-            windows_binary_data:
-                package: "cura_binary_data"
-                src: "windows"
-                dst: "share/windows"
-            fdm_materials:
-                package: "fdm_materials"
-                src: "materials"
-                dst: "share/cura/resources/materials"
-            fdm_materials_private:
-                package: "fdm_materials_private"
-                src: "resources/materials"
-                dst: "share/cura/resources/materials"
-                internal: true
-            tcl:
-                package: "tcl"
-                src: "lib/tcl8.6"
-                dst: "tcl"
-            tk:
-                package: "tk"
-                src: "lib/tk8.6"
-                dst: "tk"
-        binaries:
-            curaengine:
-                package: "curaengine"
-                src: "bin"
-                dst: "."
-                binary: "CuraEngine"
-        hiddenimports:
-            - "pySavitar"
-            - "pyArcus"
-            - "pynest2d"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "logging.handlers"
-            - "zeroconf"
-            - "fcntl"
-            - "stl"
-            - "serial"
-        collect_all:
-            - "cura"
-            - "UM"
-            - "serial"
-            - "Charon"
-            - "sqlite3"
-            - "trimesh"
-            - "win32ctypes"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "stl"
-        icon:
-            Windows: "./icons/Cura.ico"
-            Macos: "./icons/cura.icns"
-            Linux: "./icons/cura-128.png"
 "5.2.0":
     requirements:
         - "pyarcus/5.2.0"
@@ -540,111 +330,6 @@
             Windows: "./icons/Cura.ico"
             Macos: "./icons/cura.icns"
             Linux: "./icons/cura-128.png"
-"5.2.0-alpha":
-    requirements:
-        - "pyarcus/5.2@ultimaker/testing"
-        - "curaengine/(latest)@ultimaker/testing"
-        - "pysavitar/(latest)@ultimaker/testing"
-        - "pynest2d/(latest)@ultimaker/testing"
-        - "uranium/(latest)@ultimaker/testing"
-        - "fdm_materials/(latest)@ultimaker/testing"
-        - "cura_binary_data/(latest)@ultimaker/testing"
-        - "cpython/3.10.4"
-    internal_requirements:
-        - "fdm_materials_private/(latest)@ultimaker/testing"
-        - "cura_private_data/(latest)@ultimaker/testing"
-    runinfo:
-        entrypoint: "cura_app.py"
-    pyinstaller:
-        datas:
-            cura_plugins:
-                package: "cura"
-                src: "plugins"
-                dst: "share/cura/plugins"
-            cura_resources:
-                package: "cura"
-                src: "resources"
-                dst: "share/cura/resources"
-            cura_private_data:
-                package: "cura_private_data"
-                src: "resources"
-                dst: "share/cura/resources"
-                internal: true
-            uranium_plugins:
-                package: "uranium"
-                src: "plugins"
-                dst: "share/uranium/plugins"
-            uranium_resources:
-                package: "uranium"
-                src: "resources"
-                dst: "share/uranium/resources"
-            uranium_um_qt_qml_um:
-                package: "uranium"
-                src: "site-packages/UM/Qt/qml/UM"
-                dst: "PyQt6/Qt6/qml/UM"
-            cura_binary_data:
-                package: "cura_binary_data"
-                src: "resources/cura/resources"
-                dst: "share/cura/resources"
-            uranium_binary_data:
-                package: "cura_binary_data"
-                src: "resources/uranium/resources"
-                dst: "share/uranium/resources"
-            windows_binary_data:
-                package: "cura_binary_data"
-                src: "windows"
-                dst: "share/windows"
-            fdm_materials:
-                package: "fdm_materials"
-                src: "materials"
-                dst: "share/cura/resources/materials"
-            fdm_materials_private:
-                package: "fdm_materials_private"
-                src: "resources/materials"
-                dst: "share/cura/resources/materials"
-                internal: true
-            tcl:
-                package: "tcl"
-                src: "lib/tcl8.6"
-                dst: "tcl"
-            tk:
-                package: "tk"
-                src: "lib/tk8.6"
-                dst: "tk"
-        binaries:
-            curaengine:
-                package: "curaengine"
-                src: "bin"
-                dst: "."
-                binary: "CuraEngine"
-        hiddenimports:
-            - "pySavitar"
-            - "pyArcus"
-            - "pynest2d"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "logging.handlers"
-            - "zeroconf"
-            - "fcntl"
-            - "stl"
-            - "serial"
-        collect_all:
-            - "cura"
-            - "UM"
-            - "serial"
-            - "Charon"
-            - "sqlite3"
-            - "trimesh"
-            - "win32ctypes"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "stl"
-        icon:
-            Windows: "./icons/Cura.ico"
-            Macos: "./icons/cura.icns"
-            Linux: "./icons/cura-128.png"
 "5.1.0":
     requirements:
         - "arcus/5.1.0"

cura/Machines/Models/UserChangesModel.py

@@ -118,12 +118,14 @@ class UserChangesModel(ListModel):
                     if original_value is not None:
                         break
 
-                item_to_add = {"key": setting_key,
+                item_to_add = {
+                    "key": setting_key,
                     "label": label,
-                               "user_value": str(user_changes.getProperty(setting_key, "value")),
+                    "user_value": str(user_changes.getProperty(setting_key, "value", default_value_resolve_context)),
                     "original_value": str(original_value),
                     "extruder": "",
-                               "category": category_label}
+                    "category": category_label,
+                }
 
                 if stack != global_stack:
                     item_to_add["extruder"] = stack.getName()

packaging/AppImage/AppRun

@@ -17,4 +17,9 @@ export OPENSSL_CONF="$scriptdir/openssl.cnf"
 # unset `QT_STYLE_OVERRIDE` as a precaution
 unset QT_STYLE_OVERRIDE
 
-$scriptdir/UltiMaker-Cura "$@"
+BIN=`basename "$ARGV0" .AppImage`
+if [ -f $scriptdir/$BIN ]; then
+    $scriptdir/$BIN "$@"
+else
+    $scriptdir/UltiMaker-Cura "$@"
+fi;

plugins/UFPWriter/UFPWriter.py

@@ -229,22 +229,24 @@ class UFPWriter(MeshWriter):
             "quality": asdict(machine_manager.activeQualityDisplayNameMap()),
         }
 
+        def _retrieveValue(container: InstanceContainer, setting_: str):
+            value_ = container.getProperty(setting_, "value")
+            for _ in range(0, 1024):  # Prevent possibly endless loop by not using a limit.
+                if not isinstance(value_, SettingFunction):
+                    return value_  # Success!
+                value_ = value_(container)
+            return 0  # Fallback value after breaking possibly endless loop.
+
         global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack())
 
         # Add global user or quality changes
         global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges)
         for setting in global_flattened_changes.getAllKeys():
-            value = global_flattened_changes.getProperty(setting, "value")
+            settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting)
-            if isinstance(value, SettingFunction):
-                value = value(global_flattened_changes)
-            settings["global"]["changes"][setting] = value
 
         # Get global all settings values without user or quality changes
         for setting in global_stack.getAllKeys():
-            value = global_stack.getProperty(setting, "value")
+            settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting)
-            if isinstance(value, SettingFunction):
-                value = value(global_stack)
-            settings["global"]["all_settings"][setting] = value
 
         for i, extruder in enumerate(global_stack.extruderList):
             # Add extruder fields to settings dictionary
@@ -256,16 +258,10 @@ class UFPWriter(MeshWriter):
             # Add extruder user or quality changes
             extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges)
             for setting in extruder_flattened_changes.getAllKeys():
-                value = extruder_flattened_changes.getProperty(setting, "value")
+                settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting)
-                if isinstance(value, SettingFunction):
-                    value = value(extruder_flattened_changes)
-                settings[f"extruder_{i}"]["changes"][setting] = value
 
             # Get extruder all settings values without user or quality changes
             for setting in extruder.getAllKeys():
-                value = extruder.getProperty(setting, "value")
+                settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting)
-                if isinstance(value, SettingFunction):
-                    value = value(extruder)
-                settings[f"extruder_{i}"]["all_settings"][setting] = value
 
         return settings

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):

printer-linter/src/terminal.py

@@ -113,8 +113,11 @@ def extractFilePaths(paths: List[Path]) -> List[Path]:
     for path in paths:
         if path.is_dir():
             file_paths.extend(path.rglob("**/*"))
-        else:
+        if not path.match("*"):
             file_paths.append(path)
+        else:
+            file_paths.extend(Path(*path.parts[:-1]).glob(path.parts[-1]))
+            continue
 
     return file_paths
 

resources/definitions/101Hero.def.json

@@ -2,51 +2,45 @@
     "version": 2,
     "name": "101Hero",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "rikky",
         "manufacturer": "101Hero",
         "file_formats": "text/x-gcode",
         "platform": "101hero-platform.3mf",
-        "supports_usb_connection": true,
+        "machine_extruder_trains": { "0": "101Hero_extruder_0" },
         "preferred_quality_type": "draft",
-        "machine_extruder_trains":
+        "supports_usb_connection": true
-        {
-            "0": "101Hero_extruder_0"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "machine_name": { "default_value": "101Hero" },
+        "gantry_height": { "value": "0" },
-        "machine_shape": { "default_value": "elliptic"},
-        "machine_heated_bed": { "default_value": false },
-        "machine_width": { "default_value": 149.86 },
-        "machine_depth": { "default_value": 149.86 },
-        "machine_height": { "default_value": 99.822 },
         "machine_center_is_zero": { "default_value": true },
-        "machine_head_with_fans_polygon": {
+        "machine_depth": { "default_value": 149.86 },
+        "machine_end_gcode": { "default_value": "M104 S0     ;extruder heater off\nM140 S0     ;heated bed heater off (if you have it)\nG91         ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z0.5 E-5 F840 ;move Z up a bit and retract even more\nG28 X0 Y0   ;home X/Y, so the head is out of the way\nM84         ;steppers off\nG90         ;absolute positioning" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
             "default_value": [
-                [ 0, 0 ],
+                [0, 0],
-                [ 0, 0 ],
+                [0, 0],
-                [ 0, 0 ],
+                [0, 0],
-                [ 0, 0 ]
+                [0, 0]
             ]
         },
-        "speed_print": {  "default_value": 14 },
+        "machine_heated_bed": { "default_value": false },
-        "speed_travel": { "value": "speed_print" },
+        "machine_height": { "default_value": 99.822 },
-        "speed_wall": { "value": "speed_print * 0.7" },
+        "machine_name": { "default_value": "101Hero" },
-        "speed_topbottom": { "value": "speed_print * 0.7" },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_start_gcode": { "default_value": "G21       ;metric values\nG90       ;absolute positioning\nM82       ;set extruder to absolute mode\nM107      ;start with the fan off\nG28 Z0    ;home Z\nG1 Z15.0 F840\nG92 E0    ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F840\n;Put printing message on LCD screen\nM117 Printing...\n" },
+        "machine_width": { "default_value": 149.86 },
+        "retraction_amount": { "default_value": 2.5 },
+        "retraction_speed": { "default_value": 10 },
         "speed_layer_0": { "value": "speed_print * 0.7" },
-        "gantry_height": { "value": "0" },
+        "speed_print": { "default_value": 14 },
-        "retraction_speed": { "default_value" : 10 },
+        "speed_topbottom": { "value": "speed_print * 0.7" },
-        "retraction_amount": { "default_value" : 2.5 },
+        "speed_travel": { "value": "speed_print" },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "speed_wall": { "value": "speed_print * 0.7" }
-
-        "machine_start_gcode": {
-            "default_value": "G21       ;metric values\nG90       ;absolute positioning\nM82       ;set extruder to absolute mode\nM107      ;start with the fan off\nG28 Z0    ;home Z\nG1 Z15.0 F840\nG92 E0    ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F840\n;Put printing message on LCD screen\nM117 Printing...\n"
-         },
-        "machine_end_gcode": {
-            "default_value": "M104 S0     ;extruder heater off\nM140 S0     ;heated bed heater off (if you have it)\nG91         ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z0.5 E-5 F840 ;move Z up a bit and retract even more\nG28 X0 Y0   ;home X/Y, so the head is out of the way\nM84         ;steppers off\nG90         ;absolute positioning"
-        }
     }
 }

resources/definitions/3dator.def.json

@@ -2,34 +2,28 @@
     "version": 2,
     "name": "3Dator",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "3Dator GmbH",
         "manufacturer": "3Dator GmbH",
         "file_formats": "text/x-gcode",
-        "supports_usb_connection": true,
         "platform": "3dator_platform.3mf",
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "3dator_extruder_0" },
-        {
+        "supports_usb_connection": true
-            "0": "3dator_extruder_0"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "machine_name": { "default_value": "3Dator" },
+        "adhesion_type": { "default_value": "none" },
-        "prime_tower_size": { "default_value": 8.660254037844387 },
+        "gantry_height": { "value": "30" },
         "infill_sparse_density": { "default_value": 20 },
         "layer_height": { "default_value": 0.2 },
-        "speed_print": { "default_value": 50 },
-        "machine_heated_bed": { "default_value": true },
         "machine_center_is_zero": { "default_value": false },
-        "machine_height": { "default_value": 260 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_depth": { "default_value": 170 },
-        "machine_width": { "default_value": 180 },
+        "machine_end_gcode": { "default_value": "M104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28                          ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning" },
-        "retraction_speed": {"default_value":100},
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "adhesion_type": { "default_value": "none" },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": {
+        {
             "default_value": [
                 [-15, -25],
                 [-15, 35],
@@ -37,13 +31,13 @@
                 [40, -25]
             ]
         },
-        "gantry_height": {
+        "machine_heated_bed": { "default_value": true },
-            "value": "30"
+        "machine_height": { "default_value": 260 },
-        },
+        "machine_name": { "default_value": "3Dator" },
-        "machine_start_gcode": {
+        "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21  ;metric values\nG90  ;absolute positioning\nM82  ;set extruder to absolute mode\nM107  ;start with the fan off\nG28 Z0  ;move Z to min endstops\nG28 X0 Y0  ;move X/Y to min endstops\nG29  ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0  ;zero the extruded length\nG1 X10 E30 F500  ;printing a Line from right to left\nG92 E0  ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white" },
-            "default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21  ;metric values\nG90  ;absolute positioning\nM82  ;set extruder to absolute mode\nM107  ;start with the fan off\nG28 Z0  ;move Z to min endstops\nG28 X0 Y0  ;move X/Y to min endstops\nG29  ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0  ;zero the extruded length\nG1 X10 E30 F500  ;printing a Line from right to left\nG92 E0  ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white"      },
+        "machine_width": { "default_value": 180 },
-        "machine_end_gcode": {
+        "prime_tower_size": { "default_value": 8.660254037844387 },
-            "default_value": "M104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28                          ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning"
+        "retraction_speed": { "default_value": 100 },
-        }
+        "speed_print": { "default_value": 50 }
     }
 }

resources/definitions/3di_base.def.json

@@ -2,48 +2,25 @@
     "version": 2,
     "name": "3DI Base Printer",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": false,
         "author": "Vaibhav Jain",
         "manufacturer": "3Deometry Innovations",
         "file_formats": "text/x-gcode",
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "3di_base_extruder_0" }
+    },
+    "overrides":
     {
-            "0": "3di_base_extruder_0"
+        "machine_center_is_zero": { "default_value": true },
-        }
+        "machine_depth": { "default_value": 220 },
-    },
+        "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" },
-
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-    "overrides": {
+        "machine_heated_bed": { "default_value": true },
-		"machine_name":{
+        "machine_height": { "default_value": 220 },
-			"default_value": "3DI Base Printer"
+        "machine_name": { "default_value": "3DI Base Printer" },
-		},
+        "machine_shape": { "default_value": "elliptic" },
-        "machine_heated_bed": {
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." },
-            "default_value": true
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_center_is_zero": {
-            "default_value": true
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning"
-        },
-        "machine_shape": {
-            "default_value": "elliptic"
-        }
     }
 }
-

resources/definitions/3di_d300.def.json

@@ -2,25 +2,21 @@
     "version": 2,
     "name": "3DI D300",
     "inherits": "3di_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "platform": "3di_d300_platform.STL",
-        "platform_offset": [-200, -5, 173.205]
+        "platform_offset": [
+            -200,
+            -5,
+            173.205
+        ]
     },
-
+    "overrides":
-    "overrides": {
+    {
-		"machine_name": { 
+        "machine_depth": { "default_value": 300 },
-		    "default_value": "3DI D300" 
+        "machine_height": { "default_value": 300 },
-			},
+        "machine_name": { "default_value": "3DI D300" },
-        "machine_width": {
+        "machine_width": { "default_value": 300 }
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        }
     }
 }
-

resources/definitions/3dtech_semi_professional.def.json

@@ -2,40 +2,29 @@
     "version": 2,
     "name": "3DTech Semi-Professional",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "3DTech",
         "manufacturer": "3DTech",
         "file_formats": "text/x-gcode",
         "platform": "3dtech_semi_professional_platform.3mf",
-        "platform_offset": [0, -2.5, 0 ],
+        "machine_extruder_trains": { "0": "3dtech_semi_professional_extruder_0" },
-        "machine_extruder_trains":
+        "platform_offset": [
+            0,
+            -2.5,
+            0
+        ]
+    },
+    "overrides":
     {
-            "0": "3dtech_semi_professional_extruder_0"
+        "machine_center_is_zero": { "default_value": false },
-        }
+        "machine_depth": { "default_value": 250 },
-    },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0 ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" },
-    "overrides": {
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_height": { "default_value": 300 },
         "machine_name": { "default_value": "3DTECH SP Control" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ; home all axes\nG29 ;\nG1 Z5 F3000 ; lift\nG1 X5 Y25 F5000 ; move to prime\nG1 Z0.2 F3000 ; get ready to prime\nG92 E0 ; reset extrusion distance\nG1 Y100 E20 F600 ; prime nozzle\nG1 Y140 F5000 ; quick wipe" },
-            "default_value": 250
+        "machine_width": { "default_value": 250 }
-        },
-        "machine_depth": {
-            "default_value": 250
-        },
-		"machine_height": {
-            "default_value": 300
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ; home all axes\nG29 ;\nG1 Z5 F3000 ; lift\nG1 X5 Y25 F5000 ; move to prime\nG1 Z0.2 F3000 ; get ready to prime\nG92 E0 ; reset extrusion distance\nG1 Y100 E20 F600 ; prime nozzle\nG1 Y140 F5000 ; quick wipe"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0 ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/I3MetalMotion.def.json

@@ -2,32 +2,26 @@
     "version": 2,
     "name": "I3 Metal Motion",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Peter Felecan",
         "manufacturer": "eMotionTech",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "preferred_material": "emotiontech_pla",
+        "machine_extruder_trains": { "0": "I3MetalMotion_extruder_0" },
-        "machine_extruder_trains":
+        "preferred_material": "emotiontech_pla"
+    },
+    "overrides":
     {
-            "0": "I3MetalMotion_extruder_0"
-        }
-    },
-
-    "overrides": {
-        "machine_name": { "default_value": "I3MetalMotion" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_width": { "default_value": 200 },
-        "machine_height": { "default_value": 200 },
-        "machine_depth": { "default_value": 200 },
         "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 200 },
+        "machine_end_gcode": { "default_value": "G28 Z\nG28 X\nG28 Y\nM107 ; Turn off the fan\nG91; Relative positioning\nG1 E-1 ; reduce filament pressure\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn the steppers off" },
         "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" },
-        "machine_start_gcode": {
+        "machine_heated_bed": { "default_value": true },
-            "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position"
+        "machine_height": { "default_value": 200 },
-        },
+        "machine_name": { "default_value": "I3MetalMotion" },
-        "machine_end_gcode": {
+        "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" },
-            "default_value": "G28 Z\nG28 X\nG28 Y\nM107 ; Turn off the fan\nG91; Relative positioning\nG1 E-1 ; reduce filament pressure\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn the steppers off"
+        "machine_width": { "default_value": 200 }
-        }
     }
 }

resources/definitions/Mark2_for_Ultimaker2.def.json

@@ -2,179 +2,69 @@
     "version": 2,
     "name": "Mark2 for Ultimaker2",
     "inherits": "ultimaker2_plus",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "TheUltimakerCommunity",
         "manufacturer": "Foehnsturm",
-        "weight": 0,
-        "has_variants": true,
-        "has_materials": true,
-        "has_machine_quality": false,
         "file_formats": "text/x-gcode",
-        "icon": "icon_ultimaker.png",
         "platform": "ultimaker2_platform.obj",
-        "platform_texture": "Mark2_for_Ultimaker2_backplate.png",
+        "has_machine_quality": false,
+        "has_materials": true,
+        "has_variants": true,
+        "icon": "icon_ultimaker.png",
         "machine_extruder_trains":
         {
             "0": "Mark2_extruder1",
             "1": "Mark2_extruder2"
         },
-        "supported_actions": ["MachineSettingsAction", "UpgradeFirmware"]
+        "platform_texture": "Mark2_for_Ultimaker2_backplate.png",
+        "supported_actions": [
+            "MachineSettingsAction",
+            "UpgradeFirmware"
+        ],
+        "weight": 0
     },
-    "overrides": {
+    "overrides":
-        "machine_name": { "default_value": "Mark2_for_Ultimaker2" },
-        "machine_width": {
-            "default_value": 223
-        },
-        "machine_depth": {
-            "default_value": 223
-        },
-        "machine_height": {
-            "default_value": 203
-        },
-        "gantry_height": {
-            "value": "52"
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 3.5
-        },
-        "machine_nozzle_cool_down_speed": {
-            "default_value": 1.5
-        },
-        "machine_min_cool_heat_time_window":
     {
-            "default_value": 15.0
+        "acceleration_enabled": { "default_value": true },
-        },
-        "machine_show_variants": {
-            "default_value": true
-        },
-        "machine_nozzle_head_distance": {
-            "default_value": 5
-        },
-        "machine_heat_zone_length": {
-            "default_value": 20
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "speed_wall_x": {
-            "value": "speed_wall"
-        },
-        "layer_height_0": {
-            "value": "round(machine_nozzle_size / 1.5, 2)"
-        },
-        "line_width": {
-            "value": "round(machine_nozzle_size * 0.875, 2)"
-        },
-        "speed_support": {
-            "value": "speed_wall_0"
-        },
-        "machine_max_feedrate_x": {
-            "default_value": 250
-        },
-        "machine_max_feedrate_y": {
-            "default_value": 250
-        },
-        "machine_max_feedrate_z": {
-            "default_value": 40
-        },
-        "machine_max_feedrate_e": {
-            "default_value": 45
-        },
-        "machine_acceleration": {
-            "default_value": 3000
-        },
-        "retraction_amount": {
-            "default_value": 5.1
-        },
-        "retraction_speed": {
-            "default_value": 25
-        },
-        "switch_extruder_retraction_amount": {
-            "value": "retraction_amount",
-            "enabled": false
-        },
-        "switch_extruder_retraction_speeds": {
-            "value": "retraction_speed",
-            "enabled": false
-        },
-        "switch_extruder_retraction_speed": {
-            "value": "retraction_retract_speed",
-            "enabled": false
-        },
-        "switch_extruder_prime_speed": {
-            "value": "retraction_prime_speed",
-            "enabled": false
-        },
-        "machine_head_with_fans_polygon":
-        {
-            "default_value": [
-                [ -44, 14 ],
-                [ -44, -34 ],
-                [ 64, 14 ],
-                [ 64, -34 ]
-            ]
-        },
-        "machine_use_extruder_offset_to_offset_coords": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode" : {
-            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\""
-        },
-        "machine_end_gcode" : {
-            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\""
-        },
-        "machine_extruder_count": {
-            "default_value": 2
-        },
-        "acceleration_enabled":
-        {
-            "default_value": true
-        },
-        "acceleration_print":
-        {
-            "value": "2000"
-        },
-        "acceleration_travel":
-        {
-            "value": "acceleration_print if magic_spiralize else 3000"
-        },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
+        "acceleration_print": { "value": "2000" },
         "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_support_interface": { "value": "acceleration_topbottom" },
         "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" },
+        "acceleration_travel": { "value": "acceleration_print if magic_spiralize else 3000" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" },
-        "jerk_enabled":
+        "extruder_prime_pos_abs": { "default_value": false },
+        "extruder_prime_pos_x":
         {
-            "default_value": true
+            "default_value": 0.0,
+            "enabled": false
         },
-        "jerk_travel":
+        "extruder_prime_pos_y":
         {
-            "value": "jerk_print if magic_spiralize else 20"
+            "default_value": 0.0,
+            "enabled": false
         },
+        "extruder_prime_pos_z":
+        {
+            "default_value": 0.0,
+            "enabled": false
+        },
+        "gantry_height": { "value": "52" },
+        "jerk_enabled": { "default_value": true },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" },
         "jerk_support": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" },
         "jerk_support_interface": { "value": "jerk_topbottom" },
         "jerk_topbottom": { "value": "10 if jerk_print < 25 else math.ceil(jerk_print * 10 / 25)" },
+        "jerk_travel": { "value": "jerk_print if magic_spiralize else 20" },
+        "jerk_travel_layer_0": { "value": "math.ceil(jerk_layer_0 * jerk_travel / jerk_print)" },
         "jerk_wall": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" },
         "jerk_wall_0": { "value": "10 if jerk_wall < 16 else math.ceil(jerk_wall * 6 / 10)" },
-        "jerk_travel_layer_0": { "value": "math.ceil(jerk_layer_0 * jerk_travel / jerk_print)" },
+        "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
-        "extruder_prime_pos_abs": { "default_value": false },
-        "extruder_prime_pos_x": { "default_value": 0.0, "enabled": false },
-        "extruder_prime_pos_y": { "default_value": 0.0, "enabled": false },
-        "extruder_prime_pos_z": { "default_value": 0.0, "enabled": false },
         "layer_start_x":
         {
             "default_value": 105.0,
@@ -185,19 +75,93 @@
             "default_value": 27.0,
             "enabled": false
         },
-        "prime_tower_position_x": {
+        "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
-            "value": "185"
+        "machine_acceleration": { "default_value": 3000 },
-        },
+        "machine_center_is_zero": { "default_value": false },
-        "prime_tower_position_y": {
+        "machine_depth": { "default_value": 223 },
-            "value": "160"
+        "machine_disallowed_areas":
-        },
+        {
-        "machine_disallowed_areas": {
             "default_value": [
-                [[-115,  112.5], [ -10,  112.5], [ -10,  72.5], [-115,  72.5]],
+                [
-                [[ 115,  112.5], [ 115,  72.5], [ 15,  72.5], [ 15,  112.5]],
+                    [-115, 112.5],
-                [[-115, -112.5], [-115, -87.5], [ 115, -87.5], [ 115, -112.5]],
+                    [-10, 112.5],
-                [[-115, 72.5], [-97, 72.5], [-97, -112.5], [-115, -112.5]]
+                    [-10, 72.5],
+                    [-115, 72.5]
+                ],
+                [
+                    [115, 112.5],
+                    [115, 72.5],
+                    [15, 72.5],
+                    [15, 112.5]
+                ],
+                [
+                    [-115, -112.5],
+                    [-115, -87.5],
+                    [115, -87.5],
+                    [115, -112.5]
+                ],
+                [
+                    [-115, 72.5],
+                    [-97, 72.5],
+                    [-97, -112.5],
+                    [-115, -112.5]
                 ]
+            ]
+        },
+        "machine_end_gcode": { "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-44, 14],
+                [-44, -34],
+                [64, 14],
+                [64, -34]
+            ]
+        },
+        "machine_heat_zone_length": { "default_value": 20 },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 203 },
+        "machine_max_feedrate_e": { "default_value": 45 },
+        "machine_max_feedrate_x": { "default_value": 250 },
+        "machine_max_feedrate_y": { "default_value": 250 },
+        "machine_max_feedrate_z": { "default_value": 40 },
+        "machine_min_cool_heat_time_window": { "default_value": 15.0 },
+        "machine_name": { "default_value": "Mark2_for_Ultimaker2" },
+        "machine_nozzle_cool_down_speed": { "default_value": 1.5 },
+        "machine_nozzle_head_distance": { "default_value": 5 },
+        "machine_nozzle_heat_up_speed": { "default_value": 3.5 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\"" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 223 },
+        "prime_tower_position_x": { "value": "185" },
+        "prime_tower_position_y": { "value": "160" },
+        "retraction_amount": { "default_value": 5.1 },
+        "retraction_speed": { "default_value": 25 },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "switch_extruder_prime_speed":
+        {
+            "enabled": false,
+            "value": "retraction_prime_speed"
+        },
+        "switch_extruder_retraction_amount":
+        {
+            "enabled": false,
+            "value": "retraction_amount"
+        },
+        "switch_extruder_retraction_speed":
+        {
+            "enabled": false,
+            "value": "retraction_retract_speed"
+        },
+        "switch_extruder_retraction_speeds":
+        {
+            "enabled": false,
+            "value": "retraction_speed"
         }
     }
 }

resources/definitions/SV01.def.json

@@ -1,6 +1,6 @@
 {
     "version": 2,
-    "name": "Sovol-SV01",
+    "name": "Sovol-SV01 (Legacy)",
     "inherits": "fdmprinter",
     "metadata":
     {
@@ -15,7 +15,6 @@
     },
     "overrides":
     {
-        "acceleration_enabled": { "value": false },
         "acceleration_print": { "value": 500 },
         "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
         "acceleration_travel": { "value": 500 },
@@ -38,7 +37,6 @@
         "machine_max_acceleration_e": { "value": 5000 },
         "machine_max_acceleration_x": { "value": 500 },
         "machine_max_acceleration_y": { "value": 500 },
-        "machine_max_acceleration_z": { "value": 100 },
         "machine_max_feedrate_e": { "value": 50 },
         "machine_max_feedrate_x": { "value": 500 },
         "machine_max_feedrate_y": { "value": 500 },
@@ -56,7 +54,6 @@
         "retraction_amount": { "default_value": 3 },
         "retraction_speed": { "default_value": 50 },
         "skin_overlap": { "value": 10.0 },
-        "skirt_brim_speed": { "value": "speed_layer_0" },
         "speed_print": { "value": 50.0 },
         "wall_0_wipe_dist": { "value": 0.0 },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },

resources/definitions/SV02.def.json

@@ -1,6 +1,6 @@
 {
     "version": 2,
-    "name": "Sovol-SV02",
+    "name": "Sovol-SV02 (Legacy)",
     "inherits": "fdmprinter",
     "metadata":
     {
@@ -19,7 +19,6 @@
     },
     "overrides":
     {
-        "acceleration_enabled": { "value": false },
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },
@@ -40,11 +39,9 @@
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
         "machine_acceleration": { "value": 500 },
-        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 240 },
         "machine_end_gcode": { "default_value": "M104 S0  ;hotend off\nM140 S0  ;bed off\nG92 E0\nG1 F2000 E-100  ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y240  ;move bed for easy part removal\nM84  ;disable steppers" },
         "machine_extruder_count": { "default_value": 2 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 300 },
         "machine_max_acceleration_e": { "value": 500 },
@@ -55,16 +52,14 @@
         "machine_max_feedrate_x": { "value": 500 },
         "machine_max_feedrate_y": { "value": 500 },
         "machine_max_feedrate_z": { "value": 10 },
-        "machine_max_jerk_e": { "default_value": 5.0 },
         "machine_max_jerk_xy": { "default_value": 5.0 },
         "machine_max_jerk_z": { "default_value": 0.4 },
         "machine_name": { "default_value": "SV02" },
         "machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E5 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" },
         "machine_width": { "default_value": 280 },
         "material_diameter": { "default_value": 1.75 },
-        "material_final_print_temperature": { "value": 195 },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "prime_tower_min_volume": { "value": "((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height'))/2" },
+        "prime_tower_min_volume": { "value": "((reveOrValue('layer_height'))/2" },
         "prime_tower_position_x": { "value": "240" },
         "prime_tower_position_y": { "value": "190" },
         "prime_tower_size": { "value": "30" },
@@ -76,7 +71,6 @@
         "skirt_line_count": { "value": 3 },
         "speed_print": { "default_value": 50 },
         "top_bottom_thickness": { "default_value": 1 },
-        "travel_retract_before_outer_wall": { "default_value": true },
         "wall_0_wipe_dist": { "value": 0.0 }
     }
 }

resources/definitions/SV03.def.json

@@ -1,66 +1,64 @@
 {
     "version": 2,
-    "name": "Sovol-SV03",
+    "name": "Sovol-SV03 (Legacy)",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Sovol",
         "manufacturer": "Sovol 3D",
         "file_formats": "text/x-gcode",
-        "has_variants": false,
         "has_machine_quality": false,
-        "preferred_quality_type": "draft",
+        "has_variants": false,
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "SV03_extruder_0" },
-            "0": "SV03_extruder_0"
+        "preferred_quality_type": "draft"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "machine_name": { "default_value": "SV03" },
+        "acceleration_enabled": { "value": false },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_width": { "default_value": 350 },
-        "machine_depth": { "default_value": 350 },
-        "machine_height": { "default_value": 400 },	
-        "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_z": { "value": 100 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
-        "machine_heated_bed": { "default_value": true },
-        "material_diameter": { "default_value": 1.75 },
         "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" },
+        "adhesion_type": { "value": "'skirt'" },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'lines'" },
+        "infill_wipe_dist": { "value": 0.0 },
+        "jerk_enabled": { "value": false },
         "jerk_print": { "value": 8 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-        "acceleration_enabled": { "value": false },
+        "machine_acceleration": { "value": 500 },
-        "jerk_enabled": { "value": false },
+        "machine_depth": { "default_value": 350 },
-        "speed_print": { "value": 50.0 } ,
+        "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" },
-        "skirt_brim_speed": { "value": "speed_layer_0" },
+        "machine_heated_bed": { "default_value": true },
-        "optimize_wall_printing_order": { "value": "True" },
+        "machine_height": { "default_value": 400 },
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "machine_max_acceleration_e": { "value": 5000 },
-        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "machine_max_acceleration_x": { "value": 500 },
-        "z_seam_type": { "value": "'back'" },
+        "machine_max_acceleration_y": { "value": 500 },
-        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
+        "machine_max_acceleration_z": { "value": 100 },
-        "infill_pattern": { "value": "'lines'" },
+        "machine_max_feedrate_e": { "value": 50 },
-        "infill_before_walls": { "value": false },
+        "machine_max_feedrate_x": { "value": 500 },
-        "infill_overlap": { "value": 30.0 },
+        "machine_max_feedrate_y": { "value": 500 },
-        "skin_overlap": { "value": 10.0 },
+        "machine_max_feedrate_z": { "value": 10 },
-        "infill_wipe_dist": { "value": 0.0 },
+        "machine_max_jerk_e": { "value": 5 },
-        "wall_0_wipe_dist": { "value": 0.0 },      
+        "machine_max_jerk_xy": { "value": 10 },
-        "retraction_amount": { "default_value": 3},
+        "machine_max_jerk_z": { "value": 0.4 },
-        "retraction_speed": { "default_value": 50},
+        "machine_name": { "default_value": "SV03" },
-        "adhesion_type": { "value": "'skirt'" },
         "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\nG29 ;Automatic Leveling\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_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_width": { "default_value": 350 },
+        "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": 3 },
+        "retraction_speed": { "default_value": 50 },
+        "skin_overlap": { "value": 10.0 },
+        "skirt_brim_speed": { "value": "speed_layer_0" },
+        "speed_print": { "value": 50.0 },
+        "wall_0_wipe_dist": { "value": 0.0 },
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
+        "z_seam_type": { "value": "'back'" }
     }
 }

resources/definitions/abax_pri3.def.json

@@ -1,60 +1,31 @@
 {
-    "name": "Abax PRi3",
     "version": 2,
+    "name": "Abax PRi3",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Abax 3D Technologies",
         "manufacturer": "Abax 3D Technologies",
         "file_formats": "text/x-gcode",
         "has_machine_quality": "true",
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "abax_pri3_extruder_0" }
+    },
+    "overrides":
     {
-            "0": "abax_pri3_extruder_0"
+        "layer_height": { "default_value": 0.2 },
-        }
+        "layer_height_0": { "default_value": 0.2 },
-    },
+        "machine_center_is_zero": { "default_value": false },
-    "overrides": {
+        "machine_depth": { "default_value": 220 },
-        "machine_start_gcode": {
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
+        "machine_gcode_flavor": { "default_value": "RepRap" },
-        },
+        "machine_heated_bed": { "default_value": false },
-        "machine_end_gcode": {
+        "machine_height": { "default_value": 200 },
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
-        },
+        "machine_width": { "default_value": 225 },
-        "machine_width": {
+        "speed_print": { "default_value": 40 },
-            "default_value": 225
+        "support_enable": { "default_value": true },
-        },
+        "top_bottom_thickness": { "default_value": 1 },
-        "machine_depth": {
+        "wall_thickness": { "value": "1" }
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 200
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
     }
 }

resources/definitions/abax_pri5.def.json

@@ -1,60 +1,31 @@
 {
-    "name": "Abax PRi5",
     "version": 2,
+    "name": "Abax PRi5",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Abax 3D Technologies",
         "manufacturer": "Abax 3D Technologies",
         "file_formats": "text/x-gcode",
         "has_machine_quality": "true",
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "abax_pri5_extruder_0" }
+    },
+    "overrides":
     {
-            "0": "abax_pri5_extruder_0"
+        "layer_height": { "default_value": 0.2 },
-        }
+        "layer_height_0": { "default_value": 0.2 },
-    },
+        "machine_center_is_zero": { "default_value": false },
-    "overrides": {
+        "machine_depth": { "default_value": 310 },
-        "machine_start_gcode": {
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
+        "machine_gcode_flavor": { "default_value": "RepRap" },
-        },
+        "machine_heated_bed": { "default_value": false },
-        "machine_end_gcode": {
+        "machine_height": { "default_value": 300 },
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
-        },
+        "machine_width": { "default_value": 310 },
-        "machine_width": {
+        "speed_print": { "default_value": 40 },
-            "default_value": 310
+        "support_enable": { "default_value": true },
-        },
+        "top_bottom_thickness": { "default_value": 1 },
-        "machine_depth": {
+        "wall_thickness": { "value": "1" }
-            "default_value": 310
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
     }
 }

resources/definitions/abax_titan.def.json

@@ -1,59 +1,30 @@
 {
-    "name": "Abax Titan",
     "version": 2,
+    "name": "Abax Titan",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Abax 3D Technologies",
         "manufacturer": "Abax 3D Technologies",
         "file_formats": "text/x-gcode",
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "abax_titan_extruder_0" }
+    },
+    "overrides":
     {
-            "0": "abax_titan_extruder_0"
+        "layer_height": { "default_value": 0.2 },
-        }
+        "layer_height_0": { "default_value": 0.2 },
-    },
+        "machine_center_is_zero": { "default_value": false },
-    "overrides": {
+        "machine_depth": { "default_value": 310 },
-        "machine_start_gcode": {
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
+        "machine_gcode_flavor": { "default_value": "RepRap" },
-        },
+        "machine_heated_bed": { "default_value": false },
-        "machine_end_gcode": {
+        "machine_height": { "default_value": 300 },
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
-        },
+        "machine_width": { "default_value": 310 },
-        "machine_width": {
+        "speed_print": { "default_value": 40 },
-            "default_value": 310
+        "support_enable": { "default_value": true },
-        },
+        "top_bottom_thickness": { "default_value": 1 },
-        "machine_depth": {
+        "wall_thickness": { "value": "1" }
-            "default_value": 310
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
     }
 }

resources/definitions/alfawise_u20.def.json

@@ -1,72 +1,35 @@
 {
-    "name": "Alfawise U20",
     "version": 2,
+    "name": "Alfawise U20",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Samuel Pinches",
         "manufacturer": "Alfawise",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fast",
+        "machine_extruder_trains": { "0": "alfawise_u20_extruder_0" },
-        "machine_extruder_trains":
+        "preferred_quality_type": "fast"
+    },
+    "overrides":
     {
-            "0": "alfawise_u20_extruder_0"
+        "gantry_height": { "value": "10" },
-        }
+        "layer_height_0": { "default_value": 0.2 },
-    },
+        "machine_center_is_zero": { "default_value": false },
-    "overrides": {
+        "machine_depth": { "default_value": 300 },
-        "machine_name": {
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;turn off nozzle heater\nM140 S0                 ;turn off bed heater\nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament slightly\nG90                     ;set to absolute positioning\nG28 X0                  ;move to the X-axis origin (Home)\nG0 Y280 F600            ;bring the bed to the front for easy print removal\nM84                     ;turn off stepper motors\n; -- end of END GCODE --" },
-            "default_value": "Alfawise U20"
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        },
+        "machine_heated_bed": { "default_value": true },
-        "machine_start_gcode": {
+        "machine_height": { "default_value": 400 },
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28                     ;home all axis\nG92 E0                  ;zero the extruded length\nG1 Z1 F1000             ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0                  ;zero the extruded length again\n; -- end of START GCODE --"
+        "machine_name": { "default_value": "Alfawise U20" },
-        },
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28                     ;home all axis\nG92 E0                  ;zero the extruded length\nG1 Z1 F1000             ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0                  ;zero the extruded length again\n; -- end of START GCODE --" },
-        "machine_end_gcode": {
+        "machine_width": { "default_value": 300 },
-            "default_value": "; -- END GCODE --\nM104 S0                 ;turn off nozzle heater\nM140 S0                 ;turn off bed heater\nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament slightly\nG90                     ;set to absolute positioning\nG28 X0                  ;move to the X-axis origin (Home)\nG0 Y280 F600            ;bring the bed to the front for easy print removal\nM84                     ;turn off stepper motors\n; -- end of END GCODE --"
+        "material_diameter": { "default_value": 1.75 },
-        },
+        "retraction_amount": { "default_value": 5 },
-        "machine_width": {
+        "retraction_enable": { "default_value": true },
-            "default_value": 300
+        "retraction_speed": { "default_value": 45 },
-        },
+        "speed_print": { "default_value": 40 },
-        "machine_height": {
+        "support_enable": { "default_value": true },
-            "default_value": 400
+        "wall_thickness": { "value": "1.2" }
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "gantry_height": {
-            "value": "10"
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },    
-        "material_diameter": {
-            "default_value": 1.75
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1.2"
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        },
-        "retraction_enable": {
-            "default_value": true
-        },
-        "retraction_amount": {
-            "default_value": 5
-        },
-        "retraction_speed": {
-            "default_value": 45
-        }
     }
 }

resources/definitions/alfawise_u30.def.json

@@ -1,59 +1,54 @@
 {
-    "name": "Alfawise U30",
     "version": 2,
+    "name": "Alfawise U30",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Nicolas Nussbaum",
         "manufacturer": "Alfawise",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fast",
+        "machine_extruder_trains": { "0": "alfawise_u30_extruder_0" },
-        "machine_extruder_trains":
+        "preferred_quality_type": "fast"
+    },
+    "overrides":
     {
-            "0": "alfawise_u30_extruder_0"
-        }
-    },
-    "overrides": {
-        "machine_name": { "default_value": "Alfawise U30" },
-        "machine_start_gcode": {
-            "default_value": "; -- START GCODE --\nG21        ;metric values\nG90        ;absolute positioning\nM82        ;set extruder to absolute mode\nM107       ;start with the fan off\nG28 X0 Y0  ;move X/Y to min endstops\nG28 Z0     ;move Z to min endstops\nG1 Z1 F1000             ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0                  ;zero the extruded length again\nG1 F80\n;Put printing message on LCD screen\nM117 Printing...\n; -- end of START GCODE --"
-        },
-        "machine_end_gcode": {
-            "default_value": "; -- END GCODE --\nM104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F80 ;move Z up a bit and retract filament even more\nG28 X0 Y0                              ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning\nM107       ;turn the fan off; -- end of END GCODE --"
-        },
-        "material_diameter": { "default_value": 1.75 },
-        "layer_height_0": { "default_value": 0.2 },
-        "wall_thickness": { "value": "1.2" },
-        "speed_print": { "default_value": 40 },
-        "support_enable": { "default_value": true },
-        "retraction_enable": { "default_value": true },
-        "retraction_amount": { "default_value": 5 },
-        "retraction_speed": { "default_value": 45 },
         "gantry_height": { "value": "25" },
-        "machine_width": { "default_value": 220 },
+        "layer_height_0": { "default_value": 0.2 },
-        "machine_height": { "default_value": 250 },
+        "machine_acceleration": { "default_value": 300 },
-        "machine_depth": { "default_value": 220 },
         "machine_center_is_zero": { "default_value": false },
-        "machine_heated_bed": {	"default_value": true },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91                                    ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F80 ;move Z up a bit and retract filament even more\nG28 X0 Y0                              ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning\nM107       ;turn the fan off; -- end of END GCODE --" },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_max_feedrate_x": { "default_value": 200 },
+        "machine_heated_bed": { "default_value": true },
-        "machine_max_feedrate_y": { "default_value": 200 },
+        "machine_height": { "default_value": 250 },
-        "machine_max_feedrate_z": { "default_value": 5 },
+        "machine_max_acceleration_e": { "default_value": 3000 },
-        "machine_max_feedrate_e": { "default_value": 100 },
-        "speed_z_hop": { "value": "machine_max_feedrate_z" },
         "machine_max_acceleration_x": { "default_value": 500 },
         "machine_max_acceleration_y": { "default_value": 500 },
         "machine_max_acceleration_z": { "default_value": 10 },
-        "machine_max_acceleration_e": { "default_value": 3000 },
+        "machine_max_feedrate_e": { "default_value": 100 },
-        "machine_acceleration": { "default_value": 300 },
+        "machine_max_feedrate_x": { "default_value": 200 },
+        "machine_max_feedrate_y": { "default_value": 200 },
+        "machine_max_feedrate_z": { "default_value": 5 },
+        "machine_max_jerk_e": { "default_value": 5.0 },
         "machine_max_jerk_xy": { "default_value": 20.0 },
         "machine_max_jerk_z": { "default_value": 0.4 },
-        "machine_max_jerk_e": { "default_value": 5.0 },
+        "machine_name": { "default_value": "Alfawise U30" },
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21        ;metric values\nG90        ;absolute positioning\nM82        ;set extruder to absolute mode\nM107       ;start with the fan off\nG28 X0 Y0  ;move X/Y to min endstops\nG28 Z0     ;move Z to min endstops\nG1 Z1 F1000             ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0                  ;zero the extruded length again\nG1 F80\n;Put printing message on LCD screen\nM117 Printing...\n; -- end of START GCODE --" },
+        "machine_steps_per_mm_e": { "default_value": 93 },
         "machine_steps_per_mm_x": { "default_value": 80 },
         "machine_steps_per_mm_y": { "default_value": 80 },
         "machine_steps_per_mm_z": { "default_value": 400 },
-        "machine_steps_per_mm_e": { "default_value": 93 },
+        "machine_width": { "default_value": 220 },
+        "material_diameter": { "default_value": 1.75 },
+        "retraction_amount": { "default_value": 5 },
+        "retraction_enable": { "default_value": true },
+        "retraction_speed": { "default_value": 45 },
+        "skirt_brim_minimal_length": { "default_value": 250 },
         "skirt_line_count": { "default_value": 1 },
-        "skirt_brim_minimal_length": { "default_value": 250 }
+        "speed_print": { "default_value": 40 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "support_enable": { "default_value": true },
+        "wall_thickness": { "value": "1.2" }
     }
 }

resources/definitions/alya3dp.def.json

@@ -9,41 +9,103 @@
         "manufacturer": "Kati Hal ARGE",
         "file_formats": "text/x-gcode",
         "platform": "alya_platform.3mf",
-        "platform_offset": [-60, -45, 75 ],
+        "exclude_materials": [
-        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],
+            "chromatik_pla",
-        "preferred_material": "generic_pla",
+            "dsm_arnitel2045_175",
+            "dsm_novamid1070_175",
+            "fabtotum_abs",
+            "fabtotum_nylon",
+            "fabtotum_pla",
+            "fabtotum_tpu",
+            "fiberlogy_hd_pla",
+            "filo3d_pla",
+            "filo3d_pla_green",
+            "filo3d_pla_red",
+            "generic_abs",
+            "generic_abs_175",
+            "generic_bam",
+            "generic_cpe",
+            "generic_cpe_175",
+            "generic_cpe_plus",
+            "generic_hips",
+            "generic_hips_175",
+            "generic_nylon",
+            "generic_nylon_175",
+            "generic_pc",
+            "generic_pc_175",
+            "generic_petg",
+            "generic_petg_175",
+            "generic_pp",
+            "generic_pva",
+            "generic_pva_175",
+            "generic_tough_pla",
+            "generic_tpu",
+            "generic_tpu_175",
+            "imade3d_petg_green",
+            "imade3d_petg_pink",
+            "imade3d_pla_green",
+            "imade3d_pla_pink",
+            "innofill_innoflex60_175",
+            "octofiber_pla",
+            "polyflex_pla",
+            "polymax_pla",
+            "polyplus_pla",
+            "polywood_pla",
+            "verbatim_bvoh_175",
+            "Vertex_Delta_ABS",
+            "Vertex_Delta_PET",
+            "Vertex_Delta_PLA",
+            "Vertex_Delta_TPU",
+            "zyyx_pro_flex",
+            "zyyx_pro_pla",
+            "tizyx_pla",
+            "tizyx_abs",
+            "tizyx_pla_bois"
+        ],
         "has_machine_quality": true,
         "has_materials": true,
         "has_variants": false,
-        "supports_usb_connection": false,
+        "machine_extruder_trains": { "0": "alya3dp_extruder_0" },
-        "machine_extruder_trains":
+        "platform_offset": [
+            -60,
+            -45,
+            75
+        ],
+        "preferred_material": "generic_pla",
+        "supports_usb_connection": false
+    },
+    "overrides":
     {
-            "0": "alya3dp_extruder_0"
+        "adhesion_type":
+        {
+            "default_value": "raft",
+            "options":
+            {
+                "brim": "Brim",
+                "none": "None",
+                "raft": "Raft"
             }
         },
-
+        "gantry_height": { "value": "55" },
-    "overrides": {
-        "machine_name": { "default_value": "ALYA 3DP" },
-        "machine_heated_bed":          {   "default_value": false            },
-        "machine_width":               {   "default_value": 100             },
-        "machine_height":              {   "default_value": 133             },
-        "machine_depth":               {   "default_value": 100             },
         "machine_center_is_zero": { "default_value": false },
-        "gantry_height":               {   "value": "55"},
+        "machine_depth": { "default_value": 100 },
-        "retraction_amount":           {   "default_value": 1.5 },
+        "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" },
-        "support_enable":              {   "default_value": true},
-        "machine_head_with_fans_polygon": {
-            "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]]
-        },
-        "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"},  "default_value": "raft"},
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode":
+        "machine_head_with_fans_polygon":
         {
-            "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0  ;move X Y to endstops \n G28 Z0     ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0                  ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n  G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen"
+            "default_value": [
+                [75, 18],
+                [18, 18],
+                [18, 35],
+                [75, 35]
+            ]
         },
-        "machine_end_gcode":
+        "machine_heated_bed": { "default_value": false },
-        {
+        "machine_height": { "default_value": 133 },
-            "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}"
+        "machine_name": { "default_value": "ALYA 3DP" },
-        }
+        "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0  ;move X Y to endstops \n G28 Z0     ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0                  ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n  G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" },
+        "machine_width": { "default_value": 100 },
+        "retraction_amount": { "default_value": 1.5 },
+        "support_enable": { "default_value": true }
     }
 }

resources/definitions/alyanx3dp.def.json

@@ -9,41 +9,103 @@
         "manufacturer": "Kati Hal ARGE",
         "file_formats": "text/x-gcode",
         "platform": "alya_nx_platform.3mf",
-        "platform_offset": [-104, 0, 93 ],
+        "exclude_materials": [
-        "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],
+            "chromatik_pla",
-        "preferred_material": "generic_pla",
+            "dsm_arnitel2045_175",
+            "dsm_novamid1070_175",
+            "fabtotum_abs",
+            "fabtotum_nylon",
+            "fabtotum_pla",
+            "fabtotum_tpu",
+            "fiberlogy_hd_pla",
+            "filo3d_pla",
+            "filo3d_pla_green",
+            "filo3d_pla_red",
+            "generic_abs",
+            "generic_abs_175",
+            "generic_bam",
+            "generic_cpe",
+            "generic_cpe_175",
+            "generic_cpe_plus",
+            "generic_hips",
+            "generic_hips_175",
+            "generic_nylon",
+            "generic_nylon_175",
+            "generic_pc",
+            "generic_pc_175",
+            "generic_petg",
+            "generic_petg_175",
+            "generic_pp",
+            "generic_pva",
+            "generic_pva_175",
+            "generic_tough_pla",
+            "generic_tpu",
+            "generic_tpu_175",
+            "imade3d_petg_green",
+            "imade3d_petg_pink",
+            "imade3d_pla_green",
+            "imade3d_pla_pink",
+            "innofill_innoflex60_175",
+            "octofiber_pla",
+            "polyflex_pla",
+            "polymax_pla",
+            "polyplus_pla",
+            "polywood_pla",
+            "verbatim_bvoh_175",
+            "Vertex_Delta_ABS",
+            "Vertex_Delta_PET",
+            "Vertex_Delta_PLA",
+            "Vertex_Delta_TPU",
+            "zyyx_pro_flex",
+            "zyyx_pro_pla",
+            "tizyx_pla",
+            "tizyx_abs",
+            "tizyx_pla_bois"
+        ],
         "has_machine_quality": true,
         "has_materials": true,
         "has_variants": false,
-        "supports_usb_connection": false,
+        "machine_extruder_trains": { "0": "alya3dp_extruder_0" },
-        "machine_extruder_trains":
+        "platform_offset": [
+            -104,
+            0,
+            93
+        ],
+        "preferred_material": "generic_pla",
+        "supports_usb_connection": false
+    },
+    "overrides":
     {
-            "0": "alya3dp_extruder_0"
+        "adhesion_type":
+        {
+            "default_value": "raft",
+            "options":
+            {
+                "brim": "Brim",
+                "none": "None",
+                "raft": "Raft"
             }
         },
-
+        "gantry_height": { "value": "55" },
-    "overrides": {
-        "machine_name": { "default_value": "ALYA NX 3DP" },
-        "machine_heated_bed":          {   "default_value": false            },
-        "machine_width":               {   "default_value": 180             },
-        "machine_height":              {   "default_value": 170             },
-        "machine_depth":               {   "default_value": 160             },
         "machine_center_is_zero": { "default_value": false },
-        "gantry_height":               {   "value": "55"},
+        "machine_depth": { "default_value": 160 },
-        "retraction_amount":           {   "default_value": 1.5 },
+        "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" },
-        "support_enable":              {   "default_value": true},
-        "machine_head_with_fans_polygon": {
-            "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]]
-        },
-        "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"},  "default_value": "raft"},
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode":
+        "machine_head_with_fans_polygon":
         {
-            "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0  ;move X Y to endstops \n G28 Z0     ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0                  ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n  G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen"
+            "default_value": [
+                [75, 18],
+                [18, 18],
+                [18, 35],
+                [75, 35]
+            ]
         },
-        "machine_end_gcode":
+        "machine_heated_bed": { "default_value": false },
-        {
+        "machine_height": { "default_value": 170 },
-            "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}"
+        "machine_name": { "default_value": "ALYA NX 3DP" },
-        }
+        "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0  ;move X Y to endstops \n G28 Z0     ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0                  ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n  G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" },
+        "machine_width": { "default_value": 180 },
+        "retraction_amount": { "default_value": 1.5 },
+        "support_enable": { "default_value": true }
     }
 }

resources/definitions/anet3d.def.json

@@ -2,136 +2,120 @@
     "version": 2,
     "name": "anet3d",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
+        "visible": false,
         "author": "Tiger.He",
         "manufacturer": "Anet",
-        "visible": false,
         "file_formats": "text/x-gcode",
-        "first_start_actions": ["MachineSettingsAction"],
+        "first_start_actions": [ "MachineSettingsAction" ],
-        
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" },
-        "preferred_variant_name": "0.4mm Nozzle",
-        "preferred_quality_type": "standard",
         "preferred_material": "generic_pla",
-        "machine_extruder_trains":
+        "preferred_quality_type": "standard",
-        {
+        "preferred_variant_name": "0.4mm Nozzle"
-            "0": "anet3d_extruder_0"
-        }
     },
-    "overrides": {
+    "overrides":
-        "machine_max_feedrate_x": { "value": 500 },
+    {
-        "machine_max_feedrate_y": { "value": 500 },
+        "acceleration_enabled": { "value": true },
-        "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_z": { "value": 100 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
-
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
-
-        "machine_heated_bed": { "default_value": true },
-
-        "material_diameter": { "default_value": 1.75 },
-
         "acceleration_print": { "value": 1000 },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
         "acceleration_travel": { "value": 1000 },
         "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 },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "value": 10 },
+        "extruder_prime_pos_x":
+        {
+            "maximum_value": "machine_width",
+            "minimum_value": "0"
+        },
+        "extruder_prime_pos_y":
+        {
+            "maximum_value": "machine_depth",
+            "minimum_value": "0"
+        },
+        "fill_outline_gaps": { "value": false },
+        "gantry_height": { "value": "0" },
+        "infill_before_walls": { "value": true },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "infill_wipe_dist": { "value": 0 },
+        "jerk_enabled": { "value": false },
         "jerk_print": { "value": 30.0 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-
+        "machine_acceleration": { "value": 500 },
-        "acceleration_enabled": { "value": true },
+        "machine_center_is_zero": { "default_value": false },
-        "jerk_enabled": { "value": false },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-
+        "machine_heated_bed": { "default_value": true },
-        "speed_print": { "value": 50.0 } ,
+        "machine_max_acceleration_e": { "value": 5000 },
-        "speed_infill": { "value": "speed_print * 2" },
+        "machine_max_acceleration_x": { "value": 500 },
-
+        "machine_max_acceleration_y": { "value": 500 },
-        "speed_wall_x": { "value": "speed_wall" },
+        "machine_max_acceleration_z": { "value": 100 },
-        "speed_roofing": { "value": "speed_topbottom" },
+        "machine_max_feedrate_e": { "value": 50 },
-        "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
+        "machine_max_feedrate_x": { "value": 500 },
-        "speed_layer_0": { "value": "speed_print / 2" },
+        "machine_max_feedrate_y": { "value": 500 },
-        "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+        "machine_max_feedrate_z": { "value": 10 },
-        "speed_prime_tower": { "value": "speed_print" },
+        "machine_max_jerk_e": { "value": 5 },
-        "speed_support": { "value": "speed_print" },
+        "machine_max_jerk_xy": { "value": 10 },
-        "speed_support_interface": { "value": "speed_print" },
+        "machine_max_jerk_z": { "value": 0.4 },
-        "speed_z_hop": { "value": 5 },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": true },
-
+        "material_bed_temperature": { "minimum_value": "0" },
-        "skirt_brim_speed": { "value": "speed_layer_0" },
+        "material_diameter": { "default_value": 1.75 },
-
-        "optimize_wall_printing_order": { "value": true },
-
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "z_seam_type": { "value": "'back'" },
+        "material_print_temperature": { "minimum_value": "0" },
-        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
+        "material_standby_temperature": { "minimum_value": "0" },
-
+        "meshfix_maximum_resolution": { "value": "0.25" },
-        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
-        "infill_before_walls": { "value": true },
+        "optimize_wall_printing_order": { "value": true },
-        "infill_overlap": { "value": 30.0 },
+        "relative_extrusion":
-        "skin_overlap": { "value": 10.0 },
-        "infill_wipe_dist": { "value": 0 },
-        "wall_0_wipe_dist": { "value": 0.2 },
-
-        "fill_outline_gaps": { "value": false },
-
-        "retraction_speed":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "enabled": false,
-            "maximum_value": 200
+            "value": false
+        },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "retraction_count_max": { "value": 100 },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 1 },
+        "retraction_min_travel": { "value": 1.5 },
+        "retraction_prime_speed":
+        {
+            "maximum_value": 200,
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
         "retraction_retract_speed":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": 200,
-            "maximum_value": 200
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
-        "retraction_prime_speed":
+        "retraction_speed":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": 200,
-            "maximum_value": 200
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
-
+        "skin_overlap": { "value": 10.0 },
-        "retraction_hop": { "value": 1 },
+        "skirt_brim_speed": { "value": "speed_layer_0" },
-        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
+        "speed_infill": { "value": "speed_print * 2" },
-        "retraction_combing_max_distance": { "value": 30 },
+        "speed_layer_0": { "value": "speed_print / 2" },
+        "speed_prime_tower": { "value": "speed_print" },
+        "speed_print": { "value": 50.0 },
+        "speed_roofing": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_print" },
+        "speed_support_interface": { "value": "speed_print" },
+        "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
+        "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_z_hop": { "value": 5 },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
         "travel_avoid_other_parts": { "value": true },
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-
+        "wall_0_wipe_dist": { "value": 0.2 },
-        "retraction_count_max": { "value": 100 },
+        "wall_thickness": { "value": "line_width * 2" },
-        "retraction_extrusion_window": { "value": 10 },
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
-        "retraction_min_travel": { "value": 1.5 },
+        "z_seam_type": { "value": "'back'" }
-
-        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_min_layer_time": { "value": 10 },
-
-        "adaptive_layer_height_variation": { "value": 0.04 },
-        "adaptive_layer_height_variation_step": { "value": 0.04 },
-
-        "meshfix_maximum_resolution": { "value": "0.25" },
-        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
-
-        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
-        "wall_thickness": {"value": "line_width * 2" },
-        
-        "material_print_temperature": {"minimum_value": "0"},
-        "material_bed_temperature": {"minimum_value": "0"},
-        "material_standby_temperature": {"minimum_value": "0"},
-        
-        "extruder_prime_pos_y":{"minimum_value": "0","maximum_value": "machine_depth"},
-        "extruder_prime_pos_x":{"minimum_value": "0","maximum_value": "machine_width"},
-        "relative_extrusion":{"value": false, "enabled": false},
-        
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": true},
-        "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
-        
-        "machine_center_is_zero": { "default_value": false },
-        "gantry_height": { "value": "0"}
     }
 }

resources/definitions/anet3d_a2.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A2",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 220 },
         "machine_name": { "default_value": "Anet A2" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 220
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 220
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_a2_plus.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A2 Plus",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 270 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 220 },
         "machine_name": { "default_value": "Anet A2 Plus" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 220
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_depth": {
-            "default_value": 270
-        },
-        "machine_height": {
-            "default_value": 220
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_a6.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A6",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "Anet A6" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 220
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_a8.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A8",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 240 },
         "machine_name": { "default_value": "Anet A8" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 220
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 240
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_a8_plus.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet A8 Plus",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 350 },
         "machine_name": { "default_value": "Anet A8 Plus" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 300
+        "machine_width": { "default_value": 300 }
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 350
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_e10.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet E10",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,        
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 270 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 300 },
         "machine_name": { "default_value": "Anet E10" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 220
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_depth": {
-            "default_value": 270
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_e12.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet E12",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,        
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 400 },
         "machine_name": { "default_value": "Anet E12" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 300
+        "machine_width": { "default_value": 300 }
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_e16.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet E16",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,        
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 400 },
         "machine_name": { "default_value": "Anet E16" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 300
+        "machine_width": { "default_value": 300 }
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_et4.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET4",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,        
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "Anet ET4" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 220
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_et4_pro.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET4 Pro",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "Anet ET4 Pro" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 220
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_et4_x.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET4 X",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 250 },
         "machine_name": { "default_value": "Anet ET4 X" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 220
+        "machine_width": { "default_value": 220 }
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_et5.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET5",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,        
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 400 },
         "machine_name": { "default_value": "Anet ET5" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 300
+        "machine_width": { "default_value": 300 }
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/anet3d_et5_x.def.json

@@ -2,30 +2,18 @@
     "version": 2,
     "name": "Anet ET5 X",
     "inherits": "anet3d",
-    "metadata": {
+    "metadata":
-        "visible": true,
-        "machine_extruder_trains":
     {
-            "0": "anet3d_extruder_0"
+        "visible": true,
-        }
+        "machine_extruder_trains": { "0": "anet3d_extruder_0" }
     },
-
+    "overrides":
-    "overrides": {
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" },
+        "machine_height": { "default_value": 400 },
         "machine_name": { "default_value": "Anet ET5 X" },
-        "machine_width": {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" },
-            "default_value": 300
+        "machine_width": { "default_value": 300 }
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
     }
 }

resources/definitions/ankermake_m5.def.json

@@ -17,7 +17,37 @@
     },
     "overrides":
     {
-        "acceleration_print": { "value": "2500" },
+        "acceleration_enabled": { "value": "true" },
+        "acceleration_infill": { "maximum_value_warning": "2500" },
+        "acceleration_layer_0": { "maximum_value_warning": "2500" },
+        "acceleration_prime_tower": { "maximum_value_warning": "2500" },
+        "acceleration_print":
+        {
+            "maximum_value_warning": "2500",
+            "value": "2500"
+        },
+        "acceleration_print_layer_0": { "maximum_value_warning": "2500" },
+        "acceleration_roofing": { "maximum_value_warning": "2500" },
+        "acceleration_skirt_brim": { "maximum_value_warning": "2500" },
+        "acceleration_support": { "maximum_value_warning": "2500" },
+        "acceleration_support_bottom": { "maximum_value_warning": "2500" },
+        "acceleration_support_infill": { "maximum_value_warning": "2500" },
+        "acceleration_support_interface": { "maximum_value_warning": "2500" },
+        "acceleration_support_roof": { "maximum_value_warning": "2500" },
+        "acceleration_topbottom": { "maximum_value_warning": "2500" },
+        "acceleration_travel":
+        {
+            "maximum_value_warning": "2500",
+            "value": "acceleration_print"
+        },
+        "acceleration_travel_layer_0":
+        {
+            "maximum_value_warning": "2500",
+            "value": "acceleration_travel"
+        },
+        "acceleration_wall": { "maximum_value_warning": "2500" },
+        "acceleration_wall_0": { "maximum_value_warning": "2500" },
+        "acceleration_wall_x": { "maximum_value_warning": "2500" },
         "adhesion_type": { "default_value": "skirt" },
         "cool_min_layer_time": { "value": 6 },
         "cool_min_speed": { "value": 30 },
@@ -91,7 +121,6 @@
         "top_bottom_thickness": { "value": "layer_height * 4" },
         "wall_overhang_angle": { "value": 55 },
         "wall_overhang_speed_factor": { "value": 55 },
-        "xy_offset_layer_0": { "value": -0.2 },
         "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" }
     }
 }

resources/definitions/anycubic_4max.def.json

@@ -9,48 +9,15 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_4max_platform.3mf",
-        "has_materials": true,
-        "quality_definition": "anycubic_4max",
         "has_machine_quality": true,
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_4max_extruder_0" },
         "preferred_quality_type": "normal",
-        "machine_extruder_trains":
+        "quality_definition": "anycubic_4max"
-        {
-            "0": "anycubic_4max_extruder_0"
-        }
     },
-
     "overrides":
     {
-        "machine_name": { "default_value": "Anycubic 4Max" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_width": { "default_value": 220 },
-        "machine_height": {"default_value": 300 },
-        "machine_depth": { "default_value": 220 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_max_feedrate_x": { "default_value": 300 },
-        "machine_max_feedrate_y": { "default_value": 300 },
-        "machine_max_feedrate_z": { "default_value": 10 },
-        "machine_acceleration": { "default_value": 1500 },
-        "machine_max_acceleration_x": { "default_value": 1500 },
-        "machine_max_acceleration_y": { "default_value": 1500 },
-        "machine_max_acceleration_z": { "default_value": 100 },
-        "machine_max_jerk_xy": { "default_value": 11.0 },
-        "machine_max_jerk_z": { "default_value": 0.4 }, 
-        "machine_max_jerk_e": { "default_value": 11.0 },
         "acceleration_enabled": { "value": true },
-        "jerk_enabled": { "value": "True" },
-        "jerk_layer_0": { "value": "jerk_topbottom" },
-        "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
-        "jerk_print": { "value": "11" },
-        "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
-        "jerk_support_interface": { "value": "jerk_topbottom" },
-        "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
-        "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
-        "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
-
-        "gantry_height": { "value": "25.0" },
-        "skin_overlap": { "value": "10" },
-
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "900" },
@@ -60,7 +27,41 @@
         "acceleration_travel": { "value": "acceleration_print" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
-
+        "adhesion_type": { "default_value": "skirt" },
+        "gantry_height": { "value": "25.0" },
+        "infill_before_walls": { "value": false },
+        "infill_pattern": { "value": "'zigzag'" },
+        "jerk_enabled": { "value": "True" },
+        "jerk_layer_0": { "value": "jerk_topbottom" },
+        "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_print": { "value": "11" },
+        "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
+        "jerk_support_interface": { "value": "jerk_topbottom" },
+        "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
+        "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
+        "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
+        "machine_acceleration": { "default_value": 1500 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 300 },
+        "machine_max_acceleration_x": { "default_value": 1500 },
+        "machine_max_acceleration_y": { "default_value": 1500 },
+        "machine_max_acceleration_z": { "default_value": 100 },
+        "machine_max_feedrate_x": { "default_value": 300 },
+        "machine_max_feedrate_y": { "default_value": 300 },
+        "machine_max_feedrate_z": { "default_value": 10 },
+        "machine_max_jerk_e": { "default_value": 11.0 },
+        "machine_max_jerk_xy": { "default_value": 11.0 },
+        "machine_max_jerk_z": { "default_value": 0.4 },
+        "machine_name": { "default_value": "Anycubic 4Max" },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5" },
+        "machine_width": { "default_value": 220 },
+        "material_bed_temperature": { "maximum_value": "150" },
+        "material_bed_temperature_layer_0": { "maximum_value": "150" },
+        "skin_overlap": { "value": "10" },
         "speed_layer_0": { "value": "20" },
         "speed_print": { "value": "40" },
         "speed_support": { "value": "speed_wall_0" },
@@ -69,17 +70,6 @@
         "speed_travel": { "value": "60" },
         "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" },
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
-        "speed_wall_x": { "value": "speed_wall" },
+        "speed_wall_x": { "value": "speed_wall" }
-
-        "infill_pattern": {"value": "'zigzag'" },
-        "infill_before_walls": {"value": false },
-
-        "adhesion_type": { "default_value": "skirt" },
-        "material_bed_temperature": { "maximum_value": "150" },
-        "material_bed_temperature_layer_0": { "maximum_value": "150" },
-
-        "machine_gcode_flavor":{"default_value": "RepRap (Marlin/Sprinter)"},
-        "machine_start_gcode":{"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5"},
-        "machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"}
     }
 }

resources/definitions/anycubic_chiron.def.json

@@ -9,70 +9,35 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_chiron_platform.obj",
-        "platform_texture": "anycubic-chiron.png",
+        "firmware_file": "MarlinChiron.hex",
-        "has_materials": true,
-        "preferred_material": "generic_pla",
         "has_machine_quality": true,
-        "quality_definition": "anycubic_chiron",
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_chiron_extruder_0" },
+        "platform_texture": "anycubic-chiron.png",
+        "preferred_material": "generic_pla",
         "preferred_quality_type": "normal",
-        "machine_extruder_trains":
+        "quality_definition": "anycubic_chiron"
-        {
-            "0": "anycubic_chiron_extruder_0"
     },
-        "firmware_file": "MarlinChiron.hex"
-    },
-
     "overrides":
     {
-        "machine_name":
+        "gantry_height": { "value": "35" },
-        {
+        "machine_center_is_zero": { "default_value": false },
-            "default_value": "Anycubic Chiron"
+        "machine_depth": { "default_value": 400 },
-        },
+        "machine_end_gcode": { "default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n" },
-        "machine_heated_bed":
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        {
-            "default_value": true
-        },
-        "machine_width":
-        {
-            "default_value": 400
-        },
-        "machine_height":
-        {
-            "default_value": 450
-        },
-        "machine_depth":
-        {
-            "default_value": 400
-        },
-        "machine_center_is_zero":
-        {
-            "default_value": false
-        },
-        "gantry_height":
-        {
-            "value": "35"
-        },
         "machine_head_with_fans_polygon":
         {
-            "default_value":
+            "default_value": [
-            [
                 [-45, 50],
                 [-45, -45],
                 [45, 50],
                 [45, -45]
             ]
         },
-        "machine_gcode_flavor":
+        "machine_heated_bed": { "default_value": true },
-        {
+        "machine_height": { "default_value": 450 },
-            "default_value": "RepRap (Marlin/Sprinter)"
+        "machine_name": { "default_value": "Anycubic Chiron" },
-        },
+        "machine_start_gcode": { "default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n" },
-        "machine_start_gcode":
+        "machine_width": { "default_value": 400 }
-        {
-            "default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n"
-        }
     }
 }

resources/definitions/anycubic_i3_mega.def.json

@@ -9,56 +9,22 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_i3_mega_platform.3mf",
-        "has_materials": true,
         "has_machine_quality": true,
-        "preferred_quality_type": "normal",
+        "has_materials": true,
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "anycubic_i3_mega_extruder_0" },
-        {
+        "preferred_quality_type": "normal"
-            "0": "anycubic_i3_mega_extruder_0"
-        }
     },
-
     "overrides":
     {
-        "machine_name":
+        "gantry_height": { "value": "0" },
-        {
+        "machine_center_is_zero": { "default_value": false },
-            "default_value": "Anycubic i3 Mega"
+        "machine_depth": { "default_value": 210 },
-        },
+        "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" },
-        "machine_heated_bed":
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        {
+        "machine_heated_bed": { "default_value": true },
-            "default_value": true
+        "machine_height": { "default_value": 205 },
-        },
+        "machine_name": { "default_value": "Anycubic i3 Mega" },
-        "machine_width":
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nG0 Y20 F{speed_travel}\nM117 Printing...\nG5" },
-        {
+        "machine_width": { "default_value": 210 }
-            "default_value": 210
-        },
-        "machine_height":
-        {
-            "default_value": 205
-        },
-        "machine_depth":
-        {
-            "default_value": 210
-        },
-        "machine_center_is_zero":
-        {
-            "default_value": false
-        },
-        "gantry_height":
-        {
-            "value": "0"
-        },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nG0 Y20 F{speed_travel}\nM117 Printing...\nG5"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
-        }
     }
 }

resources/definitions/anycubic_i3_mega_s.def.json

@@ -9,134 +9,122 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_i3_mega_s_platform.3mf",
+        "has_machine_quality": true,
         "has_materials": true,
         "has_variants": false,
-        "has_machine_quality": true,
+        "machine_extruder_trains": { "0": "anycubic_i3_mega_s_extruder_0" },
-        "preferred_quality_type": "normal",
+        "preferred_quality_type": "normal"
-        "machine_extruder_trains":
-        {
-            "0": "anycubic_i3_mega_s_extruder_0"
-        }
     },
-
     "overrides":
     {
-        "machine_name": { "default_value": "Anycubic i3 Mega S/Pro" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_width": { "default_value": 210 },
-        "machine_height": { "default_value": 205 },
-        "machine_depth": { "default_value": 210 },
-        "machine_center_is_zero": { "default_value": false },
-        "gantry_height": { "value": "0" },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21                                        ; metric values \nG90                                        ; absolute positioning \nM82                                        ; set extruder to absolute mode \nM900 K0                                    ; disable lin. adv. if not set in GCODE\nM107                                       ; start with the fan off \nM140 S{material_bed_temperature_layer_0}   ; Start heating the bed \nG4 S60                                     ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0}   ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500                            ; BEEP heating done \nG28 X0 Y10 Z0                              ; move X/Y to min endstops \nM420 S1                                    ; Enable leveling \nM420 Z2.0                                  ; Set leveling fading height to 2 mm \nG0 Z0.15                                   ; lift nozzle a bit \nG92 E0                                     ; zero the extruded length \nG1 X50 E20 F500                            ; Extrude 20mm of filament in a 5cm line. \nG92 E0                                     ; zero the extruded length again \nG1 E-2 F500                                ; Retract a little \nG1 X50 F500                                ; wipe away from the filament line\nG1 X100 F9000                              ; Quickly wipe away from the filament line" },
-        "machine_end_gcode": { "default_value": "M104 S0                                    ; Extruder off \nM140 S0                                    ; Heatbed off \nM107                                       ; Fan off \nG91                                        ; relative positioning \nG1 E-5 F300                                ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0                                  ; homing \nG1 Y180 F2000                              ; reset feedrate \nM84                                        ; disable stepper motors \nG90                                        ; absolute positioning \nM300 S440 P200                             ; Make Print Completed Tones \nM300 S660 P250                             ; beep \nM300 S880 P300                             ; beep" },
-
-        "machine_max_acceleration_x": { "value": 3000 },
-        "machine_max_acceleration_y": { "value": 2000 },
-        "machine_max_acceleration_z": { "value": 60 },
-        "machine_max_acceleration_e": { "value": 10000 },
-        "machine_acceleration": { "value": 3000 },
-
-        "machine_max_feedrate_x": { "default_value": 500 },
-        "machine_max_feedrate_y": { "default_value": 500 },
-        "machine_max_feedrate_z": { "default_value": 8 },
-
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
-
-        "material_diameter": { "default_value": 1.75 },
-        "material_print_temperature": { "maximum_value_warning": 260 },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 260 },
-        "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_bed_temperature": { "maximum_value_warning": 110 },
-        "material_bed_temperature_layer_0": { "maximum_value_warning": 110 },
-
-        "top_bottom_thickness": { "value":  "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" },
-        "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" },
-
-        "acceleration_print": { "value": 1500 },
         "acceleration_enabled": { "value": false },
+        "acceleration_print": { "value": 1500 },
+        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
         "acceleration_travel": { "value": 3000 },
         "acceleration_travel_layer_0": { "value": "acceleration_travel" },
-        "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" },
+        "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
-
+        "brim_replaces_support": { "value": false },
-        "jerk_print": { "value": 8 },
-        "jerk_travel": { "value": 10 },
-        "jerk_travel_layer_0": { "value": "jerk_travel" },
-        "jerk_enabled": { "value": true },
-
-        "speed_print": { "value": 50.0 } ,
-
-        "speed_wall_x": { "value": "speed_wall" },
-        "speed_roofing": { "value": "speed_topbottom" },
-        "speed_travel": { "value": 100.0, "maximum_value_warning": 150.0, "maximum_value": 200.0 },
-        "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" },
-        "speed_travel_layer_0": { "value": "speed_travel" },
-        "speed_prime_tower": { "value": "speed_topbottom" },
-        "speed_support": { "value": "speed_wall_0" },
-        "speed_support_interface": { "value": "speed_topbottom" },
-        "speed_z_hop": { "value": 8 },
-
-        "skirt_brim_speed": { "value": "speed_layer_0" },
-
-        "optimize_wall_printing_order": { "value": "True" },
-
-        "infill_sparse_density": { "value": 25 },
-        "infill_before_walls": { "value": false },
-        "infill_overlap": { "value": 15.0 },
-
-        "retraction_speed": { "value": 30, "maximum_value_warning": 60 },
-        "retraction_retract_speed": { "maximum_value_warning": 60 },
-        "retraction_prime_speed": { "maximum_value_warning": 60 },
-
-        "retraction_hop_enabled": { "value": true },
-        "retraction_hop": { "value": 0.075 },
-        "retraction_hop_only_when_collides": { "value": true },
-        "retraction_amount": { "value": 6 },
-
-        "retraction_min_travel": { "value": 1.5 },
-        "retraction_combing": { "value": "'off'" },
-        "retraction_combing_max_distance": { "value": 30 },
-        
-        "travel_avoid_other_parts": { "value": true },
-        "travel_avoid_supports": { "value": true },
-        "travel_retract_before_outer_wall": { "value": true },
-
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
         "cool_fan_speed": { "value": 100 },
         "cool_fan_speed_0": { "value": 30 },
-
         "cool_min_layer_time": { "value": 10 },
-
+        "gantry_height": { "value": "0" },
-        "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
+        "infill_before_walls": { "value": false },
-        "brim_replaces_support": { "value": false },
+        "infill_overlap": { "value": 15.0 },
+        "infill_sparse_density": { "value": 25 },
+        "jerk_enabled": { "value": true },
+        "jerk_print": { "value": 8 },
+        "jerk_travel": { "value": 10 },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "machine_acceleration": { "value": 3000 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 210 },
+        "machine_end_gcode": { "default_value": "M104 S0                                    ; Extruder off \nM140 S0                                    ; Heatbed off \nM107                                       ; Fan off \nG91                                        ; relative positioning \nG1 E-5 F300                                ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0                                  ; homing \nG1 Y180 F2000                              ; reset feedrate \nM84                                        ; disable stepper motors \nG90                                        ; absolute positioning \nM300 S440 P200                             ; Make Print Completed Tones \nM300 S660 P250                             ; beep \nM300 S880 P300                             ; beep" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 205 },
+        "machine_max_acceleration_e": { "value": 10000 },
+        "machine_max_acceleration_x": { "value": 3000 },
+        "machine_max_acceleration_y": { "value": 2000 },
+        "machine_max_acceleration_z": { "value": 60 },
+        "machine_max_feedrate_x": { "default_value": 500 },
+        "machine_max_feedrate_y": { "default_value": 500 },
+        "machine_max_feedrate_z": { "default_value": 8 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_name": { "default_value": "Anycubic i3 Mega S/Pro" },
+        "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21                                        ; metric values \nG90                                        ; absolute positioning \nM82                                        ; set extruder to absolute mode \nM900 K0                                    ; disable lin. adv. if not set in GCODE\nM107                                       ; start with the fan off \nM140 S{material_bed_temperature_layer_0}   ; Start heating the bed \nG4 S60                                     ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0}   ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500                            ; BEEP heating done \nG28 X0 Y10 Z0                              ; move X/Y to min endstops \nM420 S1                                    ; Enable leveling \nM420 Z2.0                                  ; Set leveling fading height to 2 mm \nG0 Z0.15                                   ; lift nozzle a bit \nG92 E0                                     ; zero the extruded length \nG1 X50 E20 F500                            ; Extrude 20mm of filament in a 5cm line. \nG92 E0                                     ; zero the extruded length again \nG1 E-2 F500                                ; Retract a little \nG1 X50 F500                                ; wipe away from the filament line\nG1 X100 F9000                              ; Quickly wipe away from the filament line" },
+        "machine_width": { "default_value": 210 },
+        "material_bed_temperature": { "maximum_value_warning": 110 },
+        "material_bed_temperature_layer_0": { "maximum_value_warning": 110 },
+        "material_diameter": { "default_value": 1.75 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_print_temperature": { "maximum_value_warning": 260 },
+        "material_print_temperature_layer_0":
+        {
+            "maximum_value_warning": 260,
+            "value": "material_print_temperature + 5"
+        },
+        "meshfix_maximum_deviation": { "value": 0.05 },
+        "minimum_interface_area": { "value": 10 },
+        "minimum_support_area": { "value": 2 },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 6 },
+        "retraction_combing": { "value": "'off'" },
+        "retraction_combing_max_distance": { "value": 30 },
+        "retraction_hop": { "value": 0.075 },
+        "retraction_hop_enabled": { "value": true },
+        "retraction_hop_only_when_collides": { "value": true },
+        "retraction_min_travel": { "value": 1.5 },
+        "retraction_prime_speed": { "maximum_value_warning": 60 },
+        "retraction_retract_speed": { "maximum_value_warning": 60 },
+        "retraction_speed":
+        {
+            "maximum_value_warning": 60,
+            "value": 30
+        },
+        "skirt_brim_speed": { "value": "speed_layer_0" },
         "skirt_gap": { "value": 5.0 },
         "skirt_line_count": { "value": 2 },
-
+        "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" },
-        "meshfix_maximum_deviation": { "value": 0.05 },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": 50.0 },
+        "speed_roofing": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_travel":
+        {
+            "maximum_value": 200.0,
+            "maximum_value_warning": 150.0,
+            "value": 100.0
+        },
+        "speed_travel_layer_0": { "value": "speed_travel" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_z_hop": { "value": 8 },
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
-        "support_pattern": { "value": "'zigzag'" },
-        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
-        "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.16 else layer_height * 2" },
-        "support_top_distance": { "value":  "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)"},
-        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
-        "support_wall_count": { "value": 1 },
         "support_brim_enable": { "value": true },
         "support_brim_width": { "value": 4 },
-
+        "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
-        "support_interface_enable": { "value": true },
-        "support_structure": { "value": "'tree'" },
-        "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" },
-        "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_density": { "value": 33.333 },
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_pattern": { "value": "'grid'" },
         "support_interface_skip_height": { "value": 0.2 },
-        "minimum_support_area": { "value": 2 },
+        "support_pattern": { "value": "'zigzag'" },
-        "minimum_interface_area": { "value": 10 }
+        "support_structure": { "value": "'tree'" },
+        "support_top_distance": { "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)" },
+        "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" },
+        "support_use_towers": { "value": false },
+        "support_wall_count": { "value": 1 },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" },
+        "travel_avoid_other_parts": { "value": true },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": true },
+        "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" }
     }
 }

resources/definitions/anycubic_i3_mega_x.def.json

@@ -4,33 +4,36 @@
     "inherits": "anycubic_i3_mega_s",
     "metadata":
     {
-        "quality_definition": "anycubic_i3_mega_s",
+        "platform": "anycubic_i3_mega_x_platform.stl",
-        "platform": "anycubic_i3_mega_x_platform.stl"
+        "quality_definition": "anycubic_i3_mega_s"
     },
     "overrides":
     {
-        "machine_name": { "default_value": "Anycubic i3 Mega X" },
+        "acceleration_print": { "value": 400 },
-        "machine_width": { "default_value": 300 },
+        "acceleration_travel": { "value": 400 },
-        "machine_height": { "default_value": 305 },
+        "machine_acceleration": { "value": 3000 },
         "machine_depth": { "default_value": 300 },
-
+        "machine_height": { "default_value": 305 },
+        "machine_max_acceleration_e": { "value": 10000 },
         "machine_max_acceleration_x": { "value": 400 },
         "machine_max_acceleration_y": { "value": 400 },
         "machine_max_acceleration_z": { "value": 60 },
-        "machine_max_acceleration_e": { "value": 10000 },
-        "machine_acceleration": { "value": 3000 },
-
         "machine_max_feedrate_x": { "default_value": 120 },
         "machine_max_feedrate_y": { "default_value": 120 },
         "machine_max_feedrate_z": { "default_value": 20 },
-
+        "machine_name": { "default_value": "Anycubic i3 Mega X" },
-        "speed_travel": { "value": 100.0,  "maximum_value": 120.0 },
+        "machine_width": { "default_value": 300 },
-
+        "retraction_prime_speed": { "maximum_value_warning": 60 },
-        "acceleration_print": { "value": 400 },
-        "acceleration_travel": { "value": 400 },
-        
-        "retraction_speed": { "value": 30, "maximum_value_warning": 60 },
         "retraction_retract_speed": { "maximum_value_warning": 60 },
-        "retraction_prime_speed": { "maximum_value_warning": 60 }
+        "retraction_speed":
+        {
+            "maximum_value_warning": 60,
+            "value": 30
+        },
+        "speed_travel":
+        {
+            "maximum_value": 120.0,
+            "value": 100.0
+        }
     }
 }

resources/definitions/anycubic_kobra.def.json

@@ -8,47 +8,22 @@
         "author": "Jason Chen",
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
-        "has_materials": true,
+        "firmware_file": "MarlinChiron.hex",
-        "preferred_material": "generic_pla",
         "has_machine_quality": true,
-        "quality_definition": "anycubic_kobra",
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_kobra_extruder_0" },
+        "preferred_material": "generic_pla",
         "preferred_quality_type": "pla",
-        "machine_extruder_trains":
+        "quality_definition": "anycubic_kobra"
-        {
-            "0": "anycubic_kobra_extruder_0"
     },
-        "firmware_file": "MarlinChiron.hex"
-    },
-
     "overrides":
     {
-        "machine_name":
+        "machine_depth": { "default_value": 222 },
-        {
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-            "default_value": "Anycubic Kobra"
+        "machine_heated_bed": { "default_value": true },
-        },
+        "machine_height": { "default_value": 252 },
-        "machine_heated_bed":
+        "machine_name": { "default_value": "Anycubic Kobra" },
-        {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" },
-            "default_value": true
+        "machine_width": { "default_value": 222 }
-        },
-        "machine_width":
-        {
-            "default_value": 222
-        },
-        "machine_height":
-        {
-            "default_value": 252
-        },
-        "machine_depth":
-        {
-            "default_value": 222
-        },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
-        }
     }
 }

resources/definitions/anycubic_kobra_max.def.json

@@ -8,47 +8,22 @@
         "author": "Jason Chen",
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
-        "has_materials": true,
+        "firmware_file": "MarlinChiron.hex",
-        "preferred_material": "generic_pla",
         "has_machine_quality": true,
-        "quality_definition": "anycubic_kobra_max",
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_kobra_max_extruder_0" },
+        "preferred_material": "generic_pla",
         "preferred_quality_type": "pla",
-        "machine_extruder_trains":
+        "quality_definition": "anycubic_kobra_max"
-        {
-            "0": "anycubic_kobra_max_extruder_0"
     },
-        "firmware_file": "MarlinChiron.hex"
-    },
-
     "overrides":
     {
-        "machine_name":
+        "machine_depth": { "default_value": 402 },
-        {
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-            "default_value": "Anycubic Kobra Max"
+        "machine_heated_bed": { "default_value": true },
-        },
+        "machine_height": { "default_value": 452 },
-        "machine_heated_bed":
+        "machine_name": { "default_value": "Anycubic Kobra Max" },
-        {
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" },
-            "default_value": true
+        "machine_width": { "default_value": 402 }
-        },
-        "machine_width":
-        {
-            "default_value": 402
-        },
-        "machine_height":
-        {
-            "default_value": 452
-        },
-        "machine_depth":
-        {
-            "default_value": 402
-        },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
-        }
     }
 }

resources/definitions/anycubic_kossel.def.json

@@ -1,65 +1,76 @@
 {
-    "name": "Anycubic Kossel",
     "version": 2,
+    "name": "Anycubic Kossel",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": false,
         "author": "Allester Fox",
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
-        "preferred_variant_name": "0.4mm Nozzle",
-        "preferred_quality_type": "standard",
-        "preferred_material": "generic_pla",
         "platform": "kossel_platform.3mf",
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" },
-            "0": "anycubic_kossel_extruder_0"
+        "preferred_material": "generic_pla",
-        }
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle"
     },
-    "overrides": {
+    "overrides":
-        "machine_heated_bed": {
+    {
-            "default_value": true
+        "machine_center_is_zero": { "default_value": true },
-        },
+        "machine_depth": { "default_value": 180 },
-        "machine_width": {
+        "machine_disallowed_areas":
-            "default_value": 180
+        {
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 180
-        },
-        "machine_center_is_zero": {
-            "default_value": true
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 2
-        },
-        "machine_nozzle_cool_down_speed": {
-            "default_value": 2
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "G21        ;metric values\nG90        ;absolute positioning\nM107       ;start with the fan off\nG28   ;move to endstops\nG92 E0                  ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Printing..."
-        },
-        "machine_end_gcode": {
-            "default_value": "M400      ;Free buffer\nG91      ;relative positioning\nG1 E-1 F300      ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5        ;move Z up a bit and retract filament even more\nG90      ;absolute positioning\nM104 S0      ;extruder heater off\nM140 S0      ;heated bed heater off\nM107      ;fan off\nM84      ;steppers off\nG28      ;move to endstop\nM84      ;steppers off"
-        },
-        "machine_shape": {
-            "default_value": "elliptic"
-        },
-        "machine_disallowed_areas": {
             "default_value": [
-                [[-50, -85], [-85, -85], [-90, -90]],
+                [
-                [[-85, -85], [-85, -50], [-90, -90]],
+                    [-50, -85],
-                [[50, -85],  [85, -85],  [90, -90]],
+                    [-85, -85],
-                [[85, -85],  [85, -50],  [90, -90]],
+                    [-90, -90]
-                [[-50, 85],  [-85, 85],  [-90, 90]],
+                ],
-                [[-85, 85],  [-85, 50],  [-90, 90]],
+                [
-                [[50, 85],   [85, 85],   [90, 90]],
+                    [-85, -85],
-                [[85, 85],   [85, 50],   [90, 90]]
+                    [-85, -50],
+                    [-90, -90]
+                ],
+                [
+                    [50, -85],
+                    [85, -85],
+                    [90, -90]
+                ],
+                [
+                    [85, -85],
+                    [85, -50],
+                    [90, -90]
+                ],
+                [
+                    [-50, 85],
+                    [-85, 85],
+                    [-90, 90]
+                ],
+                [
+                    [-85, 85],
+                    [-85, 50],
+                    [-90, 90]
+                ],
+                [
+                    [50, 85],
+                    [85, 85],
+                    [90, 90]
+                ],
+                [
+                    [85, 85],
+                    [85, 50],
+                    [90, 90]
                 ]
-        }
+            ]
+        },
+        "machine_end_gcode": { "default_value": "M400      ;Free buffer\nG91      ;relative positioning\nG1 E-1 F300      ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5        ;move Z up a bit and retract filament even more\nG90      ;absolute positioning\nM104 S0      ;extruder heater off\nM140 S0      ;heated bed heater off\nM107      ;fan off\nM84      ;steppers off\nG28      ;move to endstop\nM84      ;steppers off" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 300 },
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_start_gcode": { "default_value": "G21        ;metric values\nG90        ;absolute positioning\nM107       ;start with the fan off\nG28   ;move to endstops\nG92 E0                  ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Printing..." },
+        "machine_width": { "default_value": 180 }
     }
 }

resources/definitions/anycubic_kossel_linear_plus.def.json

@@ -1,36 +1,67 @@
 {
-    "name": "Anycubic Kossel Linear Plus",
     "version": 2,
+    "name": "Anycubic Kossel Linear Plus",
     "inherits": "anycubic_kossel",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "platform": "kossel_pro_build_platform.3mf",
-        "platform_offset": [0, -0.25, 0],
+        "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" },
-        "machine_extruder_trains": {
+        "platform_offset": [
-            "0": "anycubic_kossel_extruder_0"
+            0,
-        }
+            -0.25,
-    },
+            0
-    "overrides": {
-        "machine_name": {
-            "default_value": "Anycubic Kossel Linear Plus"
-        },
-        "machine_width": {
-            "default_value": 240
-        },
-        "machine_depth": {
-            "default_value": 240
-        },
-        "machine_disallowed_areas": {
-            "default_value": [
-                [[-50, -115], [-115, -115], [-90, -90]],
-                [[-115, -115], [-115, -50], [-90, -90]],
-                [[50, -115], [115, -115], [90, -90]],
-                [[115, -115], [115, -50], [90, -90]],
-                [[-50, 115], [-115, 115], [-90, 90]],
-                [[-115, 115], [-115, 50], [-90, 90]],
-                [[50, 115], [115, 115], [90, 90]],
-                [[115, 115], [115, 50], [90, 90]]
         ]
-        }
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 240 },
+        "machine_disallowed_areas":
+        {
+            "default_value": [
+                [
+                    [-50, -115],
+                    [-115, -115],
+                    [-90, -90]
+                ],
+                [
+                    [-115, -115],
+                    [-115, -50],
+                    [-90, -90]
+                ],
+                [
+                    [50, -115],
+                    [115, -115],
+                    [90, -90]
+                ],
+                [
+                    [115, -115],
+                    [115, -50],
+                    [90, -90]
+                ],
+                [
+                    [-50, 115],
+                    [-115, 115],
+                    [-90, 90]
+                ],
+                [
+                    [-115, 115],
+                    [-115, 50],
+                    [-90, 90]
+                ],
+                [
+                    [50, 115],
+                    [115, 115],
+                    [90, 90]
+                ],
+                [
+                    [115, 115],
+                    [115, 50],
+                    [90, 90]
+                ]
+            ]
+        },
+        "machine_name": { "default_value": "Anycubic Kossel Linear Plus" },
+        "machine_width": { "default_value": 240 }
     }
 }

resources/definitions/anycubic_kossel_pulley.def.json

@@ -1,16 +1,14 @@
 {
-    "name": "Anycubic Kossel Pulley",
     "version": 2,
+    "name": "Anycubic Kossel Pulley",
     "inherits": "anycubic_kossel",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" }
-            "0": "anycubic_kossel_extruder_0"
-        }
     },
-    "overrides": {
+    "overrides":
-        "machine_name": {
+    {
-            "default_value": "Anycubic Kossel Pulley"
+        "machine_name": { "default_value": "Anycubic Kossel Pulley" }
-        }
     }
 }

resources/definitions/anycubic_mega_zero.def.json

@@ -9,107 +9,65 @@
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_mega_zero_platform.stl",
-        "has_materials": true,
         "has_machine_quality": true,
-        "preferred_quality_type": "normal",
+        "has_materials": true,
+        "machine_extruder_trains": { "0": "anycubic_mega_zero_extruder_0" },
         "preferred_material": "generic_pla",
-        "machine_extruder_trains":
+        "preferred_quality_type": "normal"
-        {
-            "0": "anycubic_mega_zero_extruder_0"
-        }
     },
-
     "overrides":
     {
-        "machine_name":
+        "acceleration_enabled": { "value": false },
-        {
-            "default_value": "Anycubic Mega Zero"
-        },
-        "machine_heated_bed":
-        {
-            "default_value": false
-        },
-        "machine_width":
-        {
-            "default_value": 220
-        },
-        "machine_depth":
-        {
-            "default_value": 220
-        },
-        "machine_height":
-        {
-            "default_value": 250
-        },
-        "machine_center_is_zero":
-        {
-            "default_value": false
-        },
-        "gantry_height":
-        {
-            "value": 25
-        },
-        "machine_gcode_flavor":
-        {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode":
-        {
-            "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Start heating ...\nM104 S{material_print_temperature_layer_0}\nM117 Homing X/Y ...\nG28 X0 Y0 ;move X/Y to min endstops\nM117 Homing Z ...\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nM117 Heating ...\nM109 S{material_print_temperature_layer_0}\nM117 Start cleaning ...\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nM117 Intro line ...\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z{layer_height} F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z{layer_height} F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z{layer_height} F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-1 F500 ; Retract filiment by 1 mm\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F{speed_travel} ; Move over to prevent blob squish\nG1 F{speed_travel}\nG92 E0 ; Reset Extruder\nM117 Printing...\n"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": "M117 Cooling down...\nM104 S0 ; turn off extruder\nM84 ; disable motors\nM107 ; Fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positioning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n"
-        },
-        "machine_max_feedrate_x": { "value": 500 },
-        "machine_max_feedrate_y": { "value": 500 },
-        "machine_max_feedrate_z": { "value": 5 },
-        "machine_max_feedrate_e": { "value": 30 },
-
-        "machine_max_acceleration_x": { "value": 500 },
-        "machine_max_acceleration_y": { "value": 500 },
-        "machine_max_acceleration_z": { "value": 100 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
-        "acceleration_enabled": { "value": false },
+        "adhesion_type": { "value": "'skirt'" },
-
+        "cool_fan_full_at_height": { "value": "layer_height_0" },
-        "machine_max_jerk_xy": { "value": 10 },
+        "gantry_height": { "value": 25 },
-        "machine_max_jerk_z": { "value": 0.3 },
+        "jerk_enabled": { "value": false },
-        "machine_max_jerk_e": { "value": 15 },
         "jerk_print": { "value": 10 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-        "jerk_enabled": { "value": false },
+        "machine_acceleration": { "value": 500 },
-
+        "machine_center_is_zero": { "default_value": false },
-        "speed_print": { "value": 50.0 },
+        "machine_depth": { "default_value": 220 },
-        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "machine_end_gcode": { "default_value": "M117 Cooling down...\nM104 S0 ; turn off extruder\nM84 ; disable motors\nM107 ; Fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positioning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n" },
-
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "optimize_wall_printing_order": { "value": "True" },
+        "machine_heated_bed": { "default_value": false },
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "machine_height": { "default_value": 250 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "machine_max_feedrate_e": { "value": 30 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 15 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Anycubic Mega Zero" },
+        "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Start heating ...\nM104 S{material_print_temperature_layer_0}\nM117 Homing X/Y ...\nG28 X0 Y0 ;move X/Y to min endstops\nM117 Homing Z ...\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nM117 Heating ...\nM109 S{material_print_temperature_layer_0}\nM117 Start cleaning ...\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nM117 Intro line ...\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z{layer_height} F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z{layer_height} F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z{layer_height} F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-1 F500 ; Retract filiment by 1 mm\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F{speed_travel} ; Move over to prevent blob squish\nG1 F{speed_travel}\nG92 E0 ; Reset Extruder\nM117 Printing...\n" },
+        "machine_width": { "default_value": 220 },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "retraction_hop_enabled": { "value": "True" },
+        "optimize_wall_printing_order": { "value": "True" },
-        "retraction_hop": { "value": 0.2 },
+        "retraction_amount": { "value": 7 },
         "retraction_combing": { "value": "'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
-
-        "travel_avoid_other_parts": { "value": true },
-        "travel_avoid_supports": { "value": true },
-        "travel_retract_before_outer_wall": { "value": true },
-
-        "retraction_speed": { "value": 30 },
-        "retraction_amount": { "value": 7 },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "retraction_hop_enabled": { "value": "True" },
         "retraction_min_travel": { "value": 1.5 },
-
+        "retraction_speed": { "value": 30 },
-        "cool_fan_full_at_height": { "value": "layer_height_0" },
+        "skirt_line_count": { "default_value": 3 },
-        "adhesion_type": { "value": "'skirt'" },
+        "speed_print": { "value": 50.0 },
-        "skirt_line_count": {"default_value": 3},
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
         "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.1 else layer_height*2" }
+        "support_z_distance": { "value": "layer_height if layer_height > 0.1 else layer_height*2" },
+        "travel_avoid_other_parts": { "value": true },
+        "travel_avoid_supports": { "value": true },
+        "travel_retract_before_outer_wall": { "value": true }
     }
 }

resources/definitions/anycubic_vyper.def.json

@@ -2,46 +2,26 @@
     "version": 2,
     "name": "Anycubic Vyper",
     "inherits": "fdmprinter",
-	"metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "ThatGuyZim",
         "manufacturer": "Anycubic",
         "file_formats": "text/x-gcode",
         "platform": "anycubic_vyper_platform.stl",
-		"machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "anycubic_vyper_extruder_0" }
-			"0": "anycubic_vyper_extruder_0"
-		}
     },
-	"overrides": {
+    "overrides":
-		"machine_name": {
+    {
-			"default_value": "Anycubic Vyper"
+        "gantry_height": { "value": "0" },
-		},
+        "machine_center_is_zero": { "default_value": false },
-		"machine_heated_bed": {
+        "machine_depth": { "default_value": 255 },
-			"default_value": true
+        "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 S1318 P266" },
-		},
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-		"machine_width": {
+        "machine_heated_bed": { "default_value": true },
-			"default_value": 250
+        "machine_height": { "default_value": 265 },
-		},
+        "machine_name": { "default_value": "Anycubic Vyper" },
-		"machine_height": {
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nM300 S1318 P266\nG28 Z0 ;move Z to min endstops\nG0 Z0.2\nG92 E0 ;zero the extruded length\nG1 X40 E25 F400 ; Extrude 25mm of filament in a 4cm line. Reduce speed (F) if you have a nozzle smaller than 0.4mm!\nG92 E0 ;zero the extruded length again\nG1 E-1 F500 ; Retract a little\nG1 X80 F4000 ; Quickly wipe away from the filament line\nM117 ; Printing\u2026\nG5" },
-			"default_value": 265
+        "machine_width": { "default_value": 250 }
-		},
-		"machine_depth": {
-			"default_value": 255
-		},
-		"machine_center_is_zero": {
-			"default_value": false
-		},
-		"gantry_height": {
-			"value": "0"
-		},
-		"machine_gcode_flavor": {
-			"default_value": "RepRap (Marlin/Sprinter)"
-		},
-		"machine_start_gcode": {
-			"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nM300 S1318 P266\nG28 Z0 ;move Z to min endstops\nG0 Z0.2\nG92 E0 ;zero the extruded length\nG1 X40 E25 F400 ; Extrude 25mm of filament in a 4cm line. Reduce speed (F) if you have a nozzle smaller than 0.4mm!\nG92 E0 ;zero the extruded length again\nG1 E-1 F500 ; Retract a little\nG1 X80 F4000 ; Quickly wipe away from the filament line\nM117 ; Printing…\nG5"
-		},
-		"machine_end_gcode": {
-			"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 S1318 P266"
-		}
     }
 }

resources/definitions/arjun300.def.json

@@ -2,51 +2,59 @@
     "version": 2,
     "name": "Arjun 300",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "platform": "arjun300_platform.stl",
-        "platform_offset": [-155, -6, 190],
         "has_material": true,
         "has_variants": true,
-        "preferred_variant_name": "0.4 mm Nozzle",
         "machine_extruder_trains":
         {
             "0": "arjun_extruder_0",
             "1": "arjun_extruder_1"
-        }
         },
-
+        "platform_offset": [
-    "overrides": {
+            -155,
-        "machine_name": { "default_value": "Arjun 300" },
+            -6,
-        "machine_width": { "default_value": 317 },
+            190
-        "machine_height": { "default_value": 290 },
+        ],
+        "preferred_variant_name": "0.4 mm Nozzle",
+        "weight": 3
+    },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "ironing_enabled": { "default_value": true },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 310 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
+        "machine_height": { "default_value": 290 },
-        "machine_show_variants": {"default_value": true},
+        "machine_max_feedrate_e": { "value": 150 },
-        "machine_acceleration": {"default_value": 2000},
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
+        "machine_name": { "default_value": "Arjun 300" },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
+        "machine_nozzle_size": { "default_value": 0.4 },
-        "line_width": {"value": "machine_nozzle_size"},
+        "machine_show_variants": { "default_value": true },
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 317 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
+        "retraction_amount": { "default_value": 6.5 },
-        "retraction_amount": {"default_value": 6.5},
+        "retraction_speed": { "default_value": 30 },
-        "retraction_speed": { "default_value": 30},
+        "speed_travel":
-        
+        {
-		"adhesion_type": { "default_value": "skirt" },
+            "maximum_value": "300",
-        "machine_gcode_flavor": { "default_value": "Marlin"},
+            "value": "200"
-	    "ironing_enabled":{"default_value": true},
+        }
-        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"},
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"},
-        "machine_extruder_count": { "default_value": 2 }
     }
 }

resources/definitions/arjun_duplication.def.json

@@ -2,48 +2,49 @@
     "version": 2,
     "name": "Arjun 300 Duplication",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "has_material": true,
         "has_variants": true,
+        "machine_extruder_trains": { "0": "arjun_dm_extruder" },
         "preferred_variant_name": "0.4 mm Nozzle",
-        "machine_extruder_trains":
+        "weight": 3
-        {
-            "0": "arjun_dm_extruder"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "machine_name": { "default_value": "Arjun 300 Duplication" },
+        "adhesion_type": { "default_value": "skirt" },
-        "machine_width": { "default_value": 158.5 },
+        "ironing_enabled": { "default_value": true },
-        "machine_height": { "default_value": 290 },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 310 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
+        "machine_height": { "default_value": 290 },
-        "machine_show_variants": {"default_value": true},
+        "machine_max_feedrate_e": { "value": 150 },
-        "machine_acceleration": {"default_value": 2000},
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
+        "machine_name": { "default_value": "Arjun 300 Duplication" },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
+        "machine_nozzle_size": { "default_value": 0.4 },
-        "line_width": {"value": "machine_nozzle_size"},
+        "machine_show_variants": { "default_value": true },
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 158.5 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
+        "retraction_amount": { "default_value": 6.5 },
-        "retraction_amount": {"default_value": 6.5},
+        "retraction_speed": { "default_value": 30 },
-        "retraction_speed": { "default_value": 30},
+        "speed_travel":
-        
+        {
-		"adhesion_type": { "default_value": "skirt" },
+            "maximum_value": "300",
-        "machine_gcode_flavor": { "default_value": "Marlin"},
+            "value": "200"
-	    "ironing_enabled":{"default_value": true},
+        }
-        "machine_start_gcode": {"default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"},
-        "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"},
-        "machine_extruder_count": { "default_value": 1 }
     }
 }

resources/definitions/arjun_mirrored.def.json

@@ -2,48 +2,49 @@
     "version": 2,
     "name": "Arjun 300 Mirror",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "has_material": true,
         "has_variants": true,
+        "machine_extruder_trains": { "0": "arjun_mm_extruder" },
         "preferred_variant_name": "0.4 mm Nozzle",
-        "machine_extruder_trains":
+        "weight": 3
-        {
-            "0": "arjun_mm_extruder"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "machine_name": { "default_value": "Arjun 300 Mirror" },
+        "adhesion_type": { "default_value": "skirt" },
-        "machine_width": { "default_value": 158.5 },
+        "ironing_enabled": { "default_value": true },
-        "machine_height": { "default_value": 290 },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 310 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
+        "machine_height": { "default_value": 290 },
-        "machine_show_variants": {"default_value": true},
+        "machine_max_feedrate_e": { "value": 150 },
-        "machine_acceleration": {"default_value": 2000},
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
+        "machine_name": { "default_value": "Arjun 300 Mirror" },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
+        "machine_nozzle_size": { "default_value": 0.4 },
-        "line_width": {"value": "machine_nozzle_size"},
+        "machine_show_variants": { "default_value": true },
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 158.5 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
+        "retraction_amount": { "default_value": 6.5 },
-        "retraction_amount": {"default_value": 6.5},
+        "retraction_speed": { "default_value": 30 },
-        "retraction_speed": { "default_value": 30},
+        "speed_travel":
-        
+        {
-		"adhesion_type": { "default_value": "skirt" },
+            "maximum_value": "300",
-        "machine_gcode_flavor": { "default_value": "Marlin"},
+            "value": "200"
-	    "ironing_enabled":{"default_value": true},
+        }
-        "machine_start_gcode": {"default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"},
-        "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"},
-        "machine_extruder_count": { "default_value": 1 }
     }
 }

resources/definitions/arjunpro300.def.json

@@ -2,51 +2,59 @@
     "version": 2,
     "name": "Arjun Pro 300",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "platform": "arjunpro300_platform.STL",
-        "platform_offset": [-155, -6, 190],
         "has_material": true,
         "has_variants": true,
-        "preferred_variant_name": "0.4 mm Nozzle",
         "machine_extruder_trains":
         {
             "0": "arjunpro_extruder_0",
             "1": "arjunpro_extruder_1"
-        }
         },
-
+        "platform_offset": [
-    "overrides": {
+            -155,
-        "machine_name": { "default_value": "Arjun Pro 300" },
+            -6,
-        "machine_width": { "default_value": 300 },
+            190
-        "machine_height": { "default_value": 293 },
+        ],
+        "preferred_variant_name": "0.4 mm Nozzle",
+        "weight": 3
+    },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "ironing_enabled": { "default_value": true },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 300 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
+        "machine_height": { "default_value": 293 },
-        "machine_show_variants": {"default_value": true},
+        "machine_max_feedrate_e": { "value": 150 },
-        "machine_acceleration": {"default_value": 2000},
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
+        "machine_name": { "default_value": "Arjun Pro 300" },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
+        "machine_nozzle_size": { "default_value": 0.4 },
-        "line_width": {"value": "machine_nozzle_size"},
+        "machine_show_variants": { "default_value": true },
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 300 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
+        "retraction_amount": { "default_value": 6.5 },
-        "retraction_amount": {"default_value": 6.5},
+        "retraction_speed": { "default_value": 30 },
-        "retraction_speed": { "default_value": 30},
+        "speed_travel":
-        
+        {
-		"adhesion_type": { "default_value": "skirt" },
+            "maximum_value": "300",
-        "machine_gcode_flavor": { "default_value": "Marlin"},
+            "value": "200"
-	    "ironing_enabled":{"default_value": true},
+        }
-        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"},
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"},
-        "machine_extruder_count": { "default_value": 2 }
     }
 }

resources/definitions/arjunpro_duplication.def.json

@@ -2,48 +2,49 @@
     "version": 2,
     "name": "Arjun Pro 300 Duplication",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "has_material": true,
         "has_variants": true,
+        "machine_extruder_trains": { "0": "arjunpro_dm_extruder" },
         "preferred_variant_name": "0.4 mm Nozzle",
-        "machine_extruder_trains":
+        "weight": 3
-        {
-            "0": "arjunpro_dm_extruder"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "machine_name": { "default_value": "Arjunpro 300 Duplication" },
+        "adhesion_type": { "default_value": "skirt" },
-        "machine_width": { "default_value": 120 },
+        "ironing_enabled": { "default_value": true },
-        "machine_height": { "default_value": 293 },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 300 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
+        "machine_height": { "default_value": 293 },
-        "machine_show_variants": {"default_value": true},
+        "machine_max_feedrate_e": { "value": 150 },
-        "machine_acceleration": {"default_value": 2000},
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
+        "machine_name": { "default_value": "Arjunpro 300 Duplication" },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
+        "machine_nozzle_size": { "default_value": 0.4 },
-        "line_width": {"value": "machine_nozzle_size"},
+        "machine_show_variants": { "default_value": true },
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 120 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
+        "retraction_amount": { "default_value": 6.5 },
-        "retraction_amount": {"default_value": 6.5},
+        "retraction_speed": { "default_value": 30 },
-        "retraction_speed": { "default_value": 30},
+        "speed_travel":
-        
+        {
-		"adhesion_type": { "default_value": "skirt" },
+            "maximum_value": "300",
-        "machine_gcode_flavor": { "default_value": "Marlin"},
+            "value": "200"
-	    "ironing_enabled":{"default_value": true},
+        }
-        "machine_start_gcode": {"default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"},
-        "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"},
-        "machine_extruder_count": { "default_value": 1 }
     }
 }

resources/definitions/arjunpro_mirrored.def.json

@@ -2,48 +2,49 @@
     "version": 2,
     "name": "Arjun Pro 300 Mirror",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Venkat Kamesh",
         "manufacturer": "Sri Vignan Technologies",
-        "weight": 3,
         "file_formats": "text/x-gcode",
         "has_material": true,
         "has_variants": true,
+        "machine_extruder_trains": { "0": "arjunpro_mm_extruder" },
         "preferred_variant_name": "0.4 mm Nozzle",
-        "machine_extruder_trains":
+        "weight": 3
-        {
-            "0": "arjunpro_mm_extruder"
-        }
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "machine_name": { "default_value": "Arjunpro 300 Mirror" },
+        "adhesion_type": { "default_value": "skirt" },
-        "machine_width": { "default_value": 120 },
+        "ironing_enabled": { "default_value": true },
-        "machine_height": { "default_value": 293 },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 300 },
-        "machine_center_is_zero": {"default_value": false},
+        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
         "machine_heated_bed": { "default_value": true },
-        "machine_nozzle_size": {"default_value": 0.4},
+        "machine_height": { "default_value": 293 },
-        "machine_show_variants": {"default_value": true},
+        "machine_max_feedrate_e": { "value": 150 },
-        "machine_acceleration": {"default_value": 2000},
         "machine_max_feedrate_x": { "value": 300 },
         "machine_max_feedrate_y": { "value": 300 },
         "machine_max_feedrate_z": { "value": 15 },
-        "machine_max_feedrate_e": { "value": 150 },
+        "machine_name": { "default_value": "Arjunpro 300 Mirror" },
-        "machine_use_extruder_offset_to_offset_coords": {"default_value": false},
+        "machine_nozzle_size": { "default_value": 0.4 },
-        "line_width": {"value": "machine_nozzle_size"},
+        "machine_show_variants": { "default_value": true },
-        "speed_travel": {"maximum_value": "300", "value": "200"},
+        "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
+        "machine_width": { "default_value": 120 },
+        "material_diameter": { "default_value": 1.75 },
         "optimize_wall_printing_order": { "value": "True" },
-        "material_diameter": { "default_value": 1.75},
+        "retraction_amount": { "default_value": 6.5 },
-        "retraction_amount": {"default_value": 6.5},
+        "retraction_speed": { "default_value": 30 },
-        "retraction_speed": { "default_value": 30},
+        "speed_travel":
-        
+        {
-		"adhesion_type": { "default_value": "skirt" },
+            "maximum_value": "300",
-        "machine_gcode_flavor": { "default_value": "Marlin"},
+            "value": "200"
-	    "ironing_enabled":{"default_value": true},
+        }
-        "machine_start_gcode": {"default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"},
-        "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"},
-        "machine_extruder_count": { "default_value": 1 }
     }
 }

resources/definitions/artillery_base.def.json

@@ -1,26 +1,13 @@
 {
-    "name": "Artillery Base Printer",
     "version": 2,
+    "name": "Artillery Base Printer",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": false,
         "author": "3D-Nexus.com, cataclism, Wondro",
         "manufacturer": "Artillery",
         "file_formats": "text/x-gcode",
-        "first_start_actions": ["MachineSettingsAction"],
-
-        "machine_extruder_trains": {
-            "0": "artillery_base_extruder_0"
-        },
-
-        "has_materials": true,
-        "has_variants": true,
-        "has_machine_quality": true,
-        "variants_name": "Nozzle Size",
-
-        "preferred_variant_name": "0.4mm Nozzle",
-        "preferred_quality_type": "standard",
-        "preferred_material": "generic_pla",
         "exclude_materials": [
             "Vertex_Delta_ABS",
             "Vertex_Delta_PET",
@@ -67,137 +54,120 @@
             "verbatim_bvoh_175",
             "zyyx_pro_flex",
             "zyyx_pro_pla"
-        ]
+        ],
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains": { "0": "artillery_base_extruder_0" },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle",
+        "variants_name": "Nozzle Size"
     },
-    "overrides": {
+    "overrides":
-        "machine_name": { "default_value": "Artillery Base Printer" },
+    {
-        "machine_start_gcode": { "default_value": "G28 ; home all axes\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"},
+        "acceleration_enabled": { "value": false },
-        "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y200 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n G1 X0 Y300 F1000 ; prepare for part removal\n M84 ; disable motors\n M106 S0 ; turn off fan" },
-
-        "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_z": { "value": 100 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
-
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
-
-        "machine_heated_bed": { "default_value": true },
-
-        "material_diameter": { "default_value": 1.75 },
-
         "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": "'none' if support_enable else 'skirt'" },
+        "brim_replaces_support": { "value": false },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "value": 10 },
+        "fill_outline_gaps": { "value": false },
+        "infill_before_walls": { "value": false },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "infill_wipe_dist": { "value": 0.0 },
+        "jerk_enabled": { "value": false },
         "jerk_print": { "value": 8 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-
-        "acceleration_enabled": { "value": false },
-        "jerk_enabled": { "value": false },
-
-        "speed_print": { "value": 60.0 } ,
-        "speed_wall_x": { "value": "speed_wall" },
-        "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
-        "speed_layer_0": { "value": 20.0 },
-        "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
-        "speed_prime_tower": { "value": "speed_topbottom" },
-        "speed_support": { "value": "speed_wall_0" },
-        "speed_support_interface": { "value": "speed_topbottom" },
-        "speed_z_hop": { "value": 5 },
-
         "line_width": { "value": "machine_nozzle_size * 1.1" },
-
+        "machine_acceleration": { "value": 500 },
-        "optimize_wall_printing_order": { "value": true },
+        "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y200 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n G1 X0 Y300 F1000 ; prepare for part removal\n M84 ; disable motors\n M106 S0 ; turn off fan" },
-
+        "machine_heated_bed": { "default_value": true },
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "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_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.4 },
+        "machine_name": { "default_value": "Artillery Base Printer" },
+        "machine_start_gcode": { "default_value": "G28 ; home all axes\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface" },
+        "material_diameter": { "default_value": 1.75 },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "z_seam_type": { "value": "'back'" },
+        "meshfix_maximum_resolution": { "value": "0.25" },
-        "z_seam_corner": { "value": "'z_seam_corner_none'" },
+        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
-
+        "minimum_interface_area": { "value": 10 },
-        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "minimum_support_area": { "value": 2 },
-        "infill_before_walls": { "value": false },
+        "optimize_wall_printing_order": { "value": true },
-        "infill_overlap": { "value": 30.0 },
+        "retraction_amount": { "value": 2 },
-        "skin_overlap": { "value": 10.0 },
+        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" },
-        "infill_wipe_dist": { "value": 0.0 },
+        "retraction_combing_max_distance": { "value": 30 },
-        "wall_0_wipe_dist": { "value": 0.0 },
+        "retraction_count_max": { "value": 100 },
-
+        "retraction_extrusion_window": { "value": 10 },
-        "fill_outline_gaps": { "value": false },
+        "retraction_hop": { "value": 0.2 },
-
+        "retraction_hop_enabled": { "value": "support_enable" },
-        "retraction_speed":
+        "retraction_min_travel": { "value": 1.5 },
+        "retraction_prime_speed":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": 200,
-            "maximum_value": 200
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
         "retraction_retract_speed":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": 200,
-            "maximum_value": 200
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
-        "retraction_prime_speed":
+        "retraction_speed":
         {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
+            "maximum_value": 200,
-            "maximum_value": 200
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
         },
-        
+        "skin_overlap": { "value": 10.0 },
-        "retraction_hop_enabled": { "value": "support_enable" },
-        "retraction_hop": { "value": 0.2 },
-        "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" },
-        "retraction_combing_max_distance": { "value": 30 },
-        "travel_avoid_other_parts": { "value": true },
-        "travel_avoid_supports": { "value": true },
-        "travel_retract_before_outer_wall": { "value": true },
-        
-		"retraction_amount": { "value": 2 },
-
-        "retraction_count_max": { "value": 100 },
-        "retraction_extrusion_window": { "value": 10 },
-        "retraction_min_travel": { "value": 1.5 },
-
-        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_min_layer_time": { "value": 10 },
-
-        "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },
-        "brim_replaces_support": { "value": false },
         "skirt_gap": { "value": 10.0 },
         "skirt_line_count": { "value": 4 },
-
+        "speed_layer_0": { "value": 20.0 },
-        "adaptive_layer_height_variation": { "value": 0.04 },
+        "speed_prime_tower": { "value": "speed_topbottom" },
-        "adaptive_layer_height_variation_step": { "value": 0.04 },
+        "speed_print": { "value": 60.0 },
-
+        "speed_support": { "value": "speed_wall_0" },
-        "meshfix_maximum_resolution": { "value": "0.25" },
+        "speed_support_interface": { "value": "speed_topbottom" },
-        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
+        "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
-
+        "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_z_hop": { "value": 5 },
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
-
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 4 },
         "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
+        "support_interface_density": { "value": 33.333 },
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 4" },
+        "support_interface_pattern": { "value": "'grid'" },
+        "support_interface_skip_height": { "value": 0.2 },
         "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.16 else layer_height * 2" },
         "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
-        "support_brim_enable": { "value": true },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
-        "support_brim_width": { "value": 4 },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
-
+        "travel_avoid_other_parts": { "value": true },
-        "support_interface_enable": { "value": true },
+        "travel_avoid_supports": { "value": true },
-        "support_interface_height": { "value": "layer_height * 4" },
+        "travel_retract_before_outer_wall": { "value": true },
-        "support_interface_density": { "value": 33.333 },
+        "wall_0_wipe_dist": { "value": 0.0 },
-        "support_interface_pattern": { "value": "'grid'" },
+        "wall_thickness": { "value": "line_width * 2" },
-        "support_interface_skip_height": { "value": 0.2 },
+        "z_seam_corner": { "value": "'z_seam_corner_none'" },
-        "minimum_support_area": { "value": 2 },
+        "z_seam_type": { "value": "'back'" }
-        "minimum_interface_area": { "value": 10 },
-        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
-        "wall_thickness": {"value": "line_width * 2" }
     }
 }
-

resources/definitions/artillery_genius.def.json

@@ -1,19 +1,24 @@
 {
-    "name": "Artillery Genius",
     "version": 2,
+    "name": "Artillery Genius",
     "inherits": "artillery_base",
-    "overrides": {
+    "metadata":
-        "machine_name": { "default_value": "Artillery Genius" },
+    {
-        "machine_width": { "default_value": 220 },
-        "machine_depth": { "default_value": 220 },
-        "machine_height": { "default_value": 250 },
-        "gantry_height": { "value": 25 }
-
-    },
-    "metadata": {
-        "quality_definition": "artillery_base",
         "visible": true,
         "platform": "artillery_genius.stl",
-        "platform_offset": [ -0, -72, -20]
+        "platform_offset": [
+            0,
+            -72,
+            -20
+        ],
+        "quality_definition": "artillery_base"
+    },
+    "overrides":
+    {
+        "gantry_height": { "value": 25 },
+        "machine_depth": { "default_value": 220 },
+        "machine_height": { "default_value": 250 },
+        "machine_name": { "default_value": "Artillery Genius" },
+        "machine_width": { "default_value": 220 }
     }
 }

resources/definitions/artillery_sidewinder_x1.def.json

@@ -1,19 +1,24 @@
 {
-    "name": "Artillery Sidewinder X1",
     "version": 2,
+    "name": "Artillery Sidewinder X1",
     "inherits": "artillery_base",
-    "overrides": {
+    "metadata":
-        "machine_name": { "default_value": "Artillery Sidewinder X1" },
+    {
-        "machine_width": { "default_value": 300 },
-        "machine_depth": { "default_value": 300 },
-        "machine_height": { "default_value": 400 },
-		"gantry_height": { "value": 25 }
-
-    },
-    "metadata": {
-        "quality_definition": "artillery_base",
         "visible": true,
         "platform": "artillery_swx1.stl",
-        "platform_offset": [ -200, -100, 250]
+        "platform_offset": [
+            -200,
+            -100,
+            250
+        ],
+        "quality_definition": "artillery_base"
+    },
+    "overrides":
+    {
+        "gantry_height": { "value": 25 },
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 400 },
+        "machine_name": { "default_value": "Artillery Sidewinder X1" },
+        "machine_width": { "default_value": 300 }
     }
 }

resources/definitions/atmat_asterion.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Asterion",
     "version": 2,
+    "name": "Asterion",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -10,10 +10,9 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Asterion" },
-        "machine_width":    { "default_value": 500 },
         "machine_depth": { "default_value": 500 },
-        "machine_height":   { "default_value": 600 }
+        "machine_height": { "default_value": 600 },
-		
+        "machine_name": { "default_value": "Asterion" },
+        "machine_width": { "default_value": 500 }
     }
 }

resources/definitions/atmat_asterion_ht.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Asterion HT",
     "version": 2,
+    "name": "Asterion HT",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -10,11 +10,10 @@
     },
     "overrides":
     {
-        "machine_name":                 { "default_value": "Asterion HT" },
-        "machine_width":                { "default_value": 500 },
         "machine_depth": { "default_value": 500 },
         "machine_height": { "default_value": 600 },
+        "machine_name": { "default_value": "Asterion HT" },
+        "machine_width": { "default_value": 500 },
         "material_print_temperature": { "maximum_value_warning": 500 }
-		
     }
 }

resources/definitions/atmat_galaxy_500.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Galaxy 500",
     "version": 2,
+    "name": "Galaxy 500",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -9,17 +9,13 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Galaxy 500" },
-        "machine_width":    { "default_value": 400 },
-        "machine_depth":    { "default_value": 400 },
-        "machine_height":   { "default_value": 500 },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "750" },
         "acceleration_print": { "value": "750" },
-		"acceleration_travel": 							{ "value": "750" },
         "acceleration_support": { "value": "750" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "750" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
         "jerk_layer_0": { "value": "5" },
@@ -28,9 +24,13 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
+        "jerk_travel": { "value": "jerk_layer_0" },
+        "jerk_travel_layer_0": { "value": "jerk_layer_0" },
         "jerk_wall": { "value": "jerk_print" },
         "jerk_wall_0": { "value": "jerk_print" },
-		"jerk_travel":									{ "value": "jerk_layer_0" },
+        "machine_depth": { "default_value": 400 },
-		"jerk_travel_layer_0":						    { "value": "jerk_layer_0" }
+        "machine_height": { "default_value": 500 },
+        "machine_name": { "default_value": "Galaxy 500" },
+        "machine_width": { "default_value": 400 }
     }
 }

resources/definitions/atmat_galaxy_600.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Galaxy 600",
     "version": 2,
+    "name": "Galaxy 600",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -9,17 +9,13 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Galaxy 600" },
-        "machine_width":    { "default_value": 500 },
-        "machine_depth":    { "default_value": 500 },
-        "machine_height":   { "default_value": 600 },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "750" },
         "acceleration_print": { "value": "750" },
-		"acceleration_travel": 							{ "value": "750" },
         "acceleration_support": { "value": "750" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "750" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
         "jerk_layer_0": { "value": "5" },
@@ -28,9 +24,13 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
+        "jerk_travel": { "value": "jerk_layer_0" },
+        "jerk_travel_layer_0": { "value": "jerk_layer_0" },
         "jerk_wall": { "value": "jerk_print" },
         "jerk_wall_0": { "value": "jerk_print" },
-		"jerk_travel":									{ "value": "jerk_layer_0" },
+        "machine_depth": { "default_value": 500 },
-		"jerk_travel_layer_0":						    { "value": "jerk_layer_0" }
+        "machine_height": { "default_value": 600 },
+        "machine_name": { "default_value": "Galaxy 600" },
+        "machine_width": { "default_value": 500 }
     }
 }

resources/definitions/atmat_signal_pro_300_v1.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal Pro 300 v1",
     "version": 2,
+    "name": "Signal Pro 300 v1",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -9,17 +9,13 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal Pro 300 v1" },
-        "machine_width":    { "default_value": 300 },
-        "machine_depth":    { "default_value": 300 },
-        "machine_height":   { "default_value": 300 },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "750" },
         "acceleration_print": { "value": "750" },
-		"acceleration_travel": 							{ "value": "750" },
         "acceleration_support": { "value": "750" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "750" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
         "jerk_layer_0": { "value": "5" },
@@ -28,9 +24,13 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
+        "jerk_travel": { "value": "jerk_layer_0" },
+        "jerk_travel_layer_0": { "value": "jerk_layer_0" },
         "jerk_wall": { "value": "jerk_print" },
         "jerk_wall_0": { "value": "jerk_print" },
-		"jerk_travel":									{ "value": "jerk_layer_0" },
+        "machine_depth": { "default_value": 300 },
-		"jerk_travel_layer_0":						    { "value": "jerk_layer_0" }
+        "machine_height": { "default_value": 300 },
+        "machine_name": { "default_value": "Signal Pro 300 v1" },
+        "machine_width": { "default_value": 300 }
     }
 }

resources/definitions/atmat_signal_pro_300_v2.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal Pro 300 v2",
     "version": 2,
+    "name": "Signal Pro 300 v2",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -10,9 +10,9 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal Pro 300 v2" },
-        "machine_width":    { "default_value": 300 },
         "machine_depth": { "default_value": 300 },
-        "machine_height":   { "default_value": 300 }
+        "machine_height": { "default_value": 300 },
+        "machine_name": { "default_value": "Signal Pro 300 v2" },
+        "machine_width": { "default_value": 300 }
     }
 }

resources/definitions/atmat_signal_pro_400_v1.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal Pro 400 v1",
     "version": 2,
+    "name": "Signal Pro 400 v1",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -9,17 +9,13 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal Pro 400 v1" },
-        "machine_width":    { "default_value": 300 },
-        "machine_depth":    { "default_value": 300 },
-        "machine_height":   { "default_value": 400 },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "750" },
         "acceleration_print": { "value": "750" },
-		"acceleration_travel": 							{ "value": "750" },
         "acceleration_support": { "value": "750" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "750" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
         "jerk_layer_0": { "value": "5" },
@@ -28,9 +24,13 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
+        "jerk_travel": { "value": "jerk_layer_0" },
+        "jerk_travel_layer_0": { "value": "jerk_layer_0" },
         "jerk_wall": { "value": "jerk_print" },
         "jerk_wall_0": { "value": "jerk_print" },
-		"jerk_travel":									{ "value": "jerk_layer_0" },
+        "machine_depth": { "default_value": 300 },
-		"jerk_travel_layer_0":						    { "value": "jerk_layer_0" }
+        "machine_height": { "default_value": 400 },
+        "machine_name": { "default_value": "Signal Pro 400 v1" },
+        "machine_width": { "default_value": 300 }
     }
 }

resources/definitions/atmat_signal_pro_400_v2.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal Pro 400 v2",
     "version": 2,
+    "name": "Signal Pro 400 v2",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -10,9 +10,9 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal Pro 400 v2" },
-        "machine_width":    { "default_value": 300 },
         "machine_depth": { "default_value": 300 },
-        "machine_height":   { "default_value": 400 }
+        "machine_height": { "default_value": 400 },
+        "machine_name": { "default_value": "Signal Pro 400 v2" },
+        "machine_width": { "default_value": 300 }
     }
 }

resources/definitions/atmat_signal_pro_500_v1.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal Pro 500 v1",
     "version": 2,
+    "name": "Signal Pro 500 v1",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -9,17 +9,13 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal Pro 500 v1" },
-        "machine_width":    { "default_value": 300 },
-        "machine_depth":    { "default_value": 300 },
-        "machine_height":   { "default_value": 500 },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "750" },
         "acceleration_print": { "value": "750" },
-		"acceleration_travel": 							{ "value": "750" },
         "acceleration_support": { "value": "750" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "750" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
         "jerk_layer_0": { "value": "5" },
@@ -28,9 +24,13 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
+        "jerk_travel": { "value": "jerk_layer_0" },
+        "jerk_travel_layer_0": { "value": "jerk_layer_0" },
         "jerk_wall": { "value": "jerk_print" },
         "jerk_wall_0": { "value": "jerk_print" },
-		"jerk_travel":									{ "value": "jerk_layer_0" },
+        "machine_depth": { "default_value": 300 },
-		"jerk_travel_layer_0":						    { "value": "jerk_layer_0" }
+        "machine_height": { "default_value": 500 },
+        "machine_name": { "default_value": "Signal Pro 500 v1" },
+        "machine_width": { "default_value": 300 }
     }
 }

resources/definitions/atmat_signal_pro_500_v2.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal Pro 500 v2",
     "version": 2,
+    "name": "Signal Pro 500 v2",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -10,9 +10,9 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal Pro 500 v2" },
-        "machine_width":    { "default_value": 300 },
         "machine_depth": { "default_value": 300 },
-        "machine_height":   { "default_value": 500 }
+        "machine_height": { "default_value": 500 },
+        "machine_name": { "default_value": "Signal Pro 500 v2" },
+        "machine_width": { "default_value": 300 }
     }
 }

resources/definitions/atmat_signal_pro_base.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal Pro Base",
     "version": 2,
+    "name": "Signal Pro Base",
     "inherits": "fdmprinter",
     "metadata":
     {
@@ -8,20 +8,6 @@
         "author": "ATMAT",
         "manufacturer": "ATMAT sp. z o.o.",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fast",
-        "has_machine_quality": true,
-        "has_materials": true,
-        "has_variants": true,
-        "variants_name": "Nozzle",
-        "preferred_variant_name": "V6 0.40mm",
-        "machine_extruder_trains":
-        {
-            "0": "atmat_signal_pro_extruder_left",
-            "1": "atmat_signal_pro_extruder_right"
-        },
-        "preferred_material": "generic_pla_175",
-		"supports_usb_connection": false,
-        "supports_network_connection": false,
         "exclude_materials": [
             "chromatik_pla",
             "dsm_arnitel2045_175",
@@ -90,92 +76,52 @@
             "Vertex_Delta_TPU",
             "zyyx_pro_flex",
             "zyyx_pro_pla"
-
+        ],
-        ]
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains":
+        {
+            "0": "atmat_signal_pro_extruder_left",
+            "1": "atmat_signal_pro_extruder_right"
+        },
+        "preferred_material": "generic_pla_175",
+        "preferred_quality_type": "fast",
+        "preferred_variant_name": "V6 0.40mm",
+        "supports_network_connection": false,
+        "supports_usb_connection": false,
+        "variants_name": "Nozzle"
     },
     "overrides":
     {
-        "machine_name":                                 { "default_value": "Signal Pro" },
-        "machine_width":                                { "default_value": 300 },
-        "machine_depth":                                { "default_value": 300 },
-        "machine_height":                               { "default_value": 300 },
-        "gantry_height":                                { "value": 30 },
-		"machine_extruder_count": 						{ "default_value": 2 },
-        "machine_heated_bed":                           { "default_value": true },
-		"machine_heated_build_volume": 					{ "default_value": true },
-        "build_volume_temperature": 					{ "maximum_value_warning": 45 },
-        "material_print_temperature":                   { "maximum_value_warning": 295 },
-        "material_bed_temperature":                     { "maximum_value_warning": 140 },
-        "machine_max_acceleration_x":                   { "default_value": 1500 },
-        "machine_max_acceleration_y":                   { "default_value": 1500 },
-        "machine_max_acceleration_z":                   { "default_value": 250 },
-        "machine_acceleration":                         { "default_value": 1500 },
-        "machine_max_jerk_xy":                          { "default_value": 15 },
-        "machine_max_jerk_z":                           { "default_value": 1 },
-        "machine_max_jerk_e":                           { "default_value": 15 },
-        "machine_head_with_fans_polygon":               { "default_value": [ [-35, 65], [-35, -50], [35, -50], [35, 65] ] },
-        "machine_max_feedrate_z":                       { "default_value": 10 },
-        "machine_max_feedrate_e":                       { "default_value": 120 },
-        "machine_gcode_flavor":                         { "default_value": "Marlin" },
-        "machine_start_gcode":                          { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 ; home all without mesh bed level\nM420 S1\nG92 E0.0 ; reset extruder distance position\nG1 Z0.25\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" },
-        "machine_end_gcode":                            { "default_value": "M104 T0 S0                     ;extruder heater off\nM104 T1 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off\nG91\nG1 Z1 F420                                        ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90                         ;absolute positioning\nG1 X0 Y300 F6000                              ;move the head out of the way\nM84                         ;steppers off" },
-        "adhesion_type":                                { "default_value": "skirt" },
-        "skirt_brim_minimal_length":                    { "value": "550" },
-		"retraction_amount": 							{ "value": "1" },
-        "retraction_speed":                             { "value": "50", "maximum_value_warning": "130" },
-        "retraction_retract_speed":                     { "value": "retraction_speed", "maximum_value_warning": "130" },
-        "retraction_prime_speed":                       { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": "130" },
-        "retraction_hop_enabled":                       { "value": "True" },
-        "retraction_hop":                               { "value": "0.5" },
-        "retraction_combing":                           { "value": "'noskin'" },
-        "retraction_combing_max_distance":              { "value": "10" },
-        "travel_avoid_other_parts":                     { "value": "True" },
-        "travel_avoid_supports":                        { "value": "True" },
-        "speed_travel":                                 { "maximum_value": "150", "value": "150", "maximum_value_warning": "151" },
-        "speed_travel_layer_0":                         { "value": "math.ceil(speed_travel * 0.4)" },
-        "speed_layer_0":                                { "value": "math.ceil(speed_print * 0.25)" },
-        "speed_wall":                                   { "value": "math.ceil(speed_print * 0.50)" },
-        "speed_wall_0":                                 { "value": "math.ceil(speed_print * 0.50)" },
-        "speed_wall_x":                                 { "value": "math.ceil(speed_print * 0.75)" },
-        "speed_topbottom":                              { "value": "math.ceil(speed_print * 0.45)" },
-        "speed_roofing":                                { "value": "math.ceil(speed_print * 0.45)" },
-        "speed_slowdown_layers":                        { "value": "2" },
-        "roofing_layer_count":                          { "value": "1" },
-        "optimize_wall_printing_order":                 { "value": "True" },
-        "infill_enable_travel_optimization":            { "value": "True" },
-        "minimum_polygon_circumference":                { "value": "0.2" },
-        "wall_overhang_angle":                          { "value": "75" },
-        "wall_overhang_speed_factor":                   { "value": "50" },
-        "bridge_settings_enabled":                      { "value": "True" },
-        "bridge_wall_coast":                            { "value": "10" },
-        "bridge_fan_speed":                             { "value": "100" },
-        "bridge_fan_speed_2":                           { "resolve": "max(cool_fan_speed, 50)" },
-        "bridge_fan_speed_3":                           { "resolve": "max(cool_fan_speed, 20)" },
-        "alternate_extra_perimeter":                    { "value": "True" },
-        "cool_min_layer_time_fan_speed_max":            { "value": "20" },
-        "cool_min_layer_time":                          { "value": "15" },
-        "cool_fan_speed_min":                           { "value": "cool_fan_speed" },
-        "cool_fan_full_at_height":                      { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" },
-        "cool_fan_full_layer":                          { "value": "4" },
-        "layer_height_0":                               { "resolve": "max(0.2, min(extruderValues('layer_height')))" },
-        "line_width":                                   { "value": "machine_nozzle_size * 1.125" },
-        "wall_line_width":                              { "value": "machine_nozzle_size" },
-        "fill_outline_gaps":                            { "value": "True" },
-        "meshfix_maximum_resolution":                   { "value": "0.01" },
-        "meshfix_maximum_deviation":                    { "value": "layer_height / 2" },
-        "infill_before_walls":                          { "value": "False" },
-        "zig_zaggify_infill":                           { "value": "True" },
-        "min_infill_area":                              { "value": "5.0" },
         "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "1000" },
         "acceleration_print": { "value": "1000" },
-		"acceleration_travel": 							{ "value": "1000" },
         "acceleration_support": { "value": "1000" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "1000" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
+        "adhesion_type": { "default_value": "skirt" },
+        "alternate_extra_perimeter": { "value": "True" },
+        "bridge_fan_speed": { "value": "100" },
+        "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" },
+        "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" },
+        "bridge_settings_enabled": { "value": "True" },
+        "bridge_wall_coast": { "value": "10" },
+        "build_volume_temperature": { "maximum_value_warning": 45 },
+        "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" },
+        "cool_fan_full_layer": { "value": "4" },
+        "cool_fan_speed_min": { "value": "cool_fan_speed" },
+        "cool_min_layer_time": { "value": "15" },
+        "cool_min_layer_time_fan_speed_max": { "value": "20" },
+        "extruder_prime_pos_abs": { "value": "True" },
+        "fill_outline_gaps": { "value": "True" },
+        "gantry_height": { "value": 30 },
+        "infill_before_walls": { "value": "False" },
+        "infill_enable_travel_optimization": { "value": "True" },
         "jerk_enabled": { "value": "True" },
         "jerk_layer_0": { "value": "5" },
         "jerk_prime_tower": { "value": "jerk_print" },
@@ -183,31 +129,109 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
-        "jerk_wall": 									{ "value": "jerk_print" },
-        "jerk_wall_0": 									{ "value": "jerk_print" },
         "jerk_travel": { "value": "jerk_layer_0" },
         "jerk_travel_layer_0": { "value": "jerk_layer_0" },
+        "jerk_wall": { "value": "jerk_print" },
+        "jerk_wall_0": { "value": "jerk_print" },
+        "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" },
+        "line_width": { "value": "machine_nozzle_size * 1.125" },
+        "machine_acceleration": { "default_value": 1500 },
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": "M104 T0 S0                     ;extruder heater off\nM104 T1 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off\nG91\nG1 Z1 F420                                        ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90                         ;absolute positioning\nG1 X0 Y300 F6000                              ;move the head out of the way\nM84                         ;steppers off" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_gcode_flavor": { "default_value": "Marlin" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-35, 65],
+                [-35, -50],
+                [35, -50],
+                [35, 65]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_heated_build_volume": { "default_value": true },
+        "machine_height": { "default_value": 300 },
+        "machine_max_acceleration_x": { "default_value": 1500 },
+        "machine_max_acceleration_y": { "default_value": 1500 },
+        "machine_max_acceleration_z": { "default_value": 250 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 10 },
+        "machine_max_jerk_e": { "default_value": 15 },
+        "machine_max_jerk_xy": { "default_value": 15 },
+        "machine_max_jerk_z": { "default_value": 1 },
+        "machine_name": { "default_value": "Signal Pro" },
+        "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 ; home all without mesh bed level\nM420 S1\nG92 E0.0 ; reset extruder distance position\nG1 Z0.25\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" },
+        "machine_width": { "default_value": 300 },
+        "material_bed_temperature": { "maximum_value_warning": 140 },
+        "material_print_temperature": { "maximum_value_warning": 295 },
+        "meshfix_maximum_deviation": { "value": "layer_height / 2" },
+        "meshfix_maximum_resolution": { "value": "0.01" },
+        "min_infill_area": { "value": "5.0" },
+        "minimum_polygon_circumference": { "value": "0.2" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "prime_tower_enable": { "value": "True" },
         "prime_tower_position_x": { "value": "270" },
         "prime_tower_position_y": { "value": "270" },
-		"extruder_prime_pos_abs": 						{ "value": "True" },
+        "retraction_amount": { "value": "1" },
-		"switch_extruder_prime_speed": 					{ "value": "15" },
+        "retraction_combing": { "value": "'noskin'" },
-        "switch_extruder_retraction_amount": 			{ "value": "2" },
+        "retraction_combing_max_distance": { "value": "10" },
-        "support_xy_distance":                          { "value": "wall_line_width_0 * 2.5" },
+        "retraction_hop": { "value": "0.5" },
-        "support_xy_distance_overhang":                 { "value": "wall_line_width_0" },
+        "retraction_hop_enabled": { "value": "True" },
+        "retraction_prime_speed":
+        {
+            "maximum_value_warning": "130",
+            "value": "math.ceil(retraction_speed * 0.4)"
+        },
+        "retraction_retract_speed":
+        {
+            "maximum_value_warning": "130",
+            "value": "retraction_speed"
+        },
+        "retraction_speed":
+        {
+            "maximum_value_warning": "130",
+            "value": "50"
+        },
+        "roofing_layer_count": { "value": "1" },
+        "skirt_brim_minimal_length": { "value": "550" },
+        "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" },
+        "speed_roofing": { "value": "math.ceil(speed_print * 0.45)" },
+        "speed_slowdown_layers": { "value": "2" },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 0.45)" },
+        "speed_travel":
+        {
+            "maximum_value": "150",
+            "maximum_value_warning": "151",
+            "value": "150"
+        },
+        "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" },
+        "speed_wall": { "value": "math.ceil(speed_print * 0.50)" },
+        "speed_wall_0": { "value": "math.ceil(speed_print * 0.50)" },
+        "speed_wall_x": { "value": "math.ceil(speed_print * 0.75)" },
         "support_angle": { "value": "60" },
         "support_bottom_distance": { "value": "support_z_distance / 2" },
-        "support_pattern":                              { "default_value": "zigzag" },
+        "support_bottom_enable": { "value": "False" },
-        "support_top_distance":                         { "value": "support_z_distance" },
+        "support_brim_enable": { "value": "True" },
-        "support_use_towers":                           { "value": "True" },
+        "support_infill_rate": { "value": "20" },
-        "support_z_distance":                           { "value": "layer_height" },
         "support_interface_enable": { "value": "True" },
         "support_interface_height": { "value": "1" },
         "support_interface_skip_height": { "value": "layer_height" },
-        "support_bottom_enable":                        { "value": "False" },
         "support_join_distance": { "value": "1" },
         "support_offset": { "value": "1.5" },
-        "support_infill_rate":                          { "value": "20" },
+        "support_pattern": { "default_value": "zigzag" },
-        "support_brim_enable":                          { "value": "True" },
+        "support_top_distance": { "value": "support_z_distance" },
-        "prime_tower_enable":                           { "value": "True" }
+        "support_use_towers": { "value": "True" },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2.5" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_z_distance": { "value": "layer_height" },
+        "switch_extruder_prime_speed": { "value": "15" },
+        "switch_extruder_retraction_amount": { "value": "2" },
+        "travel_avoid_other_parts": { "value": "True" },
+        "travel_avoid_supports": { "value": "True" },
+        "wall_line_width": { "value": "machine_nozzle_size" },
+        "wall_overhang_angle": { "value": "75" },
+        "wall_overhang_speed_factor": { "value": "50" },
+        "zig_zaggify_infill": { "value": "True" }
     }
 }

resources/definitions/atmat_signal_xl.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal XL",
     "version": 2,
+    "name": "Signal XL",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -9,17 +9,13 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal XL" },
-        "machine_width":    { "default_value": 310 },
-        "machine_depth":    { "default_value": 320 },
-        "machine_height":   { "default_value": 260 },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "750" },
         "acceleration_print": { "value": "750" },
-		"acceleration_travel": 							{ "value": "750" },
         "acceleration_support": { "value": "750" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "750" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
         "jerk_layer_0": { "value": "5" },
@@ -28,13 +24,16 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
-        "jerk_wall": 									{ "value": "jerk_print" },
-        "jerk_wall_0": 									{ "value": "jerk_print" },
         "jerk_travel": { "value": "jerk_layer_0" },
         "jerk_travel_layer_0": { "value": "jerk_layer_0" },
+        "jerk_wall": { "value": "jerk_print" },
+        "jerk_wall_0": { "value": "jerk_print" },
+        "machine_depth": { "default_value": 320 },
         "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Repetier" },
         "machine_heated_build_volume": { "default_value": false },
-		"machine_gcode_flavor":                         { "default_value": "Repetier" }
+        "machine_height": { "default_value": 260 },
-		
+        "machine_name": { "default_value": "Signal XL" },
+        "machine_width": { "default_value": 310 }
     }
 }

resources/definitions/atmat_signal_xxl.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal XXL",
     "version": 2,
+    "name": "Signal XXL",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -9,17 +9,13 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal XXL" },
-        "machine_width":    { "default_value": 310 },
-        "machine_depth":    { "default_value": 320 },
-        "machine_height":   { "default_value": 385 },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "750" },
         "acceleration_print": { "value": "750" },
-		"acceleration_travel": 							{ "value": "750" },
         "acceleration_support": { "value": "750" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "750" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
         "jerk_layer_0": { "value": "5" },
@@ -28,13 +24,16 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
-        "jerk_wall": 									{ "value": "jerk_print" },
-        "jerk_wall_0": 									{ "value": "jerk_print" },
         "jerk_travel": { "value": "jerk_layer_0" },
         "jerk_travel_layer_0": { "value": "jerk_layer_0" },
+        "jerk_wall": { "value": "jerk_print" },
+        "jerk_wall_0": { "value": "jerk_print" },
+        "machine_depth": { "default_value": 320 },
         "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Repetier" },
         "machine_heated_build_volume": { "default_value": false },
-		"machine_gcode_flavor":                         { "default_value": "Repetier" }
+        "machine_height": { "default_value": 385 },
-		
+        "machine_name": { "default_value": "Signal XXL" },
+        "machine_width": { "default_value": 310 }
     }
 }

resources/definitions/atmat_signal_xxxl.def.json

@@ -1,6 +1,6 @@
 {
-    "name": "Signal XXXL",
     "version": 2,
+    "name": "Signal XXXL",
     "inherits": "atmat_signal_pro_base",
     "metadata":
     {
@@ -9,17 +9,13 @@
     },
     "overrides":
     {
-        "machine_name":     { "default_value": "Signal XXXL" },
-        "machine_width":    { "default_value": 310 },
-        "machine_depth":    { "default_value": 320 },
-        "machine_height":   { "default_value": 500 },
         "acceleration_layer_0": { "value": "250" },
         "acceleration_prime_tower": { "value": "750" },
         "acceleration_print": { "value": "750" },
-		"acceleration_travel": 							{ "value": "750" },
         "acceleration_support": { "value": "750" },
         "acceleration_support_interface": { "value": "750" },
         "acceleration_topbottom": { "value": "750" },
+        "acceleration_travel": { "value": "750" },
         "acceleration_wall": { "value": "750" },
         "acceleration_wall_0": { "value": "500" },
         "jerk_layer_0": { "value": "5" },
@@ -28,13 +24,16 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
-        "jerk_wall": 									{ "value": "jerk_print" },
-        "jerk_wall_0": 									{ "value": "jerk_print" },
         "jerk_travel": { "value": "jerk_layer_0" },
         "jerk_travel_layer_0": { "value": "jerk_layer_0" },
+        "jerk_wall": { "value": "jerk_print" },
+        "jerk_wall_0": { "value": "jerk_print" },
+        "machine_depth": { "default_value": 320 },
         "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "Repetier" },
         "machine_heated_build_volume": { "default_value": false },
-		"machine_gcode_flavor":                         { "default_value": "Repetier" }
+        "machine_height": { "default_value": 500 },
-		
+        "machine_name": { "default_value": "Signal XXXL" },
+        "machine_width": { "default_value": 310 }
     }
 }

resources/definitions/atom2.def.json

@@ -1,35 +1,37 @@
 {
-  "name": "Atom 2",
     "version": 2,
+    "name": "Atom 2",
     "inherits": "fdmprinter",
-  "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Victor (Yu Chieh) Lin",
         "manufacturer": "Layer One",
         "file_formats": "text/x-gcode",
-    "platform_offset": [0,0,0],
+        "machine_extruder_trains": { "0": "atom2_extruder_0" },
-    "machine_extruder_trains":  { "0": "atom2_extruder_0"
+        "platform_offset": [
-    }
+            0,
+            0,
+            0
+        ]
     },
-
+    "overrides":
-  "overrides": {
+    {
-    "machine_name":           { "default_value": "Atom 2" },
+        "brim_width": { "default_value": 4 },
-    "machine_shape":          { "default_value": "elliptic" },
+        "default_material_print_temperature": { "default_value": 210 },
-    "machine_width":          { "default_value": 210 },
+        "infill_sparse_density": { "default_value": 10 },
+        "layer_height": { "default_value": 0.2 },
+        "machine_center_is_zero": { "default_value": true },
         "machine_depth": { "default_value": 210 },
-    "machine_height":         { "default_value": 320 },
+        "machine_end_gcode": { "default_value": "G28\nG91\nG1 E-6 F300\nM104 S0\nG1 E-1000 F5000\nM84\nG90" },
         "machine_extruder_count": { "default_value": 1 },
         "machine_heated_bed": { "default_value": false },
-    "machine_center_is_zero": { "default_value": true },
+        "machine_height": { "default_value": 320 },
-
+        "machine_name": { "default_value": "Atom 2" },
+        "machine_shape": { "default_value": "elliptic" },
         "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG1 Y-110 Z15\nG0 Z{layer_height_0}\nG92 E0\nG1 F200 Y-100 E6\nG92 E0" },
-    "machine_end_gcode":      { "default_value": "G28\nG91\nG1 E-6 F300\nM104 S0\nG1 E-1000 F5000\nM84\nG90" },
+        "machine_width": { "default_value": 210 },
-
-    "layer_height": { "default_value": 0.2 },
-    "default_material_print_temperature": { "default_value": 210 },
-    "speed_print": { "default_value": 32 },
         "optimize_wall_printing_order": { "value": "True" },
-    "infill_sparse_density": { "default_value": 10 },
+        "speed_print": { "default_value": 32 }
-    "brim_width": { "default_value": 4 }
     }
 }

resources/definitions/atom3.def.json

@@ -7,134 +7,116 @@
         "visible": true,
         "author": "Daniel Kurth",
         "manufacturer": "Layer One",
-        "platform_offset": [0, 0, 0],
+        "platform": "Atom 3 bed.3mf",
         "has_machine_quality": false,
         "has_materials": true,
-        "preferred_material": "layer_one_dark_gray_pla",
         "has_variants": true,
-        "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle",
+        "machine_extruder_trains": { "0": "atom3_extruder_0" },
+        "platform_offset": [
+            0,
+            0,
+            0
+        ],
+        "preferred_material": "layer_one_dark_gray_pla",
         "preferred_quality_type": "normal",
-        "variants_name": "Tool:",
+        "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle",
-        "platform": "Atom 3 bed.3mf",
+        "variants_name": "Tool:"
-        "machine_extruder_trains":
-        {
-            "0": "atom3_extruder_0"
-        }
     },
-
-
     "overrides":
     {
-        "machine_name": { "default_value": "Atom 3" },
+        "adhesion_type": { "default_value": "skirt" },
-        "machine_show_variants": { "default_value": true},
+        "cool_lift_head": { "default_value": false },
-        "machine_shape": { "default_value": "elliptic" },
+        "cool_min_layer_time": { "default_value": 5 },
-        "machine_width": { "default_value": 270},
+        "cool_min_speed": { "default_value": 10 },
-        "machine_depth": { "default_value": 270},
+        "default_material_bed_temperature":
-        "machine_height": { "default_value": 340},
-        "machine_center_is_zero": { "default_value": true},
-        "machine_nozzle_head_distance": { "default_value": 6},
-        "machine_head_with_fans_polygon":
         {
-            "default_value":[
+            "default_value": 60,
-                [-23.82, 51.25],
+            "maximum_value": "120",
-                [23.82, 51.25],
+            "maximum_value_warning": "115",
-                [56.292 , -5.00],
+            "minimum_value": "0",
-                [32.476, -46.250],
+            "minimum_value_warning": "build_volume_temperature"
-                [-32.476, -46.25],
-                [-56.292, -5.00]
-            ]
         },
-        "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" },
+        "default_material_print_temperature": { "default_value": 200 },
-        "machine_heated_bed": { "default_value": true },
+        "infill_before_walls": { "value": false },
-        "material_diameter": { "default_value": 1.75},
+        "infill_sparse_density": { "default_value": 17 },
-        "machine_start_gcode":
+        "initial_layer_line_width_factor": { "default_value": 100 },
-        {
+        "layer_height": { "default_value": 0.2 },
-            "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE"
-        },
-        "machine_end_gcode":
-        {
-            "default_value": ";MACHINE END CODE\nG91 ;relative positioning\nG1 E-1 F300  ;retract  filament release pressure\nG1 Z+1.0 E-5 F9000 ;move up a and retract more\nG90 ;absolute positioning\nG28; home\nM84 ;steppers off\n;MACHINE END CODE"
-        },
-
-        "layer_height": {"default_value": 0.2 },
         "layer_height_0":
         {
             "default_value": 0.2,
             "value": "layer_height"
         },
-        "line_width": { "value": "machine_nozzle_size"},
+        "line_width": { "value": "machine_nozzle_size" },
-
+        "machine_center_is_zero": { "default_value": true },
-        "initial_layer_line_width_factor": { "default_value": 100},
+        "machine_depth": { "default_value": 270 },
-
+        "machine_end_gcode": { "default_value": ";MACHINE END CODE\nG91 ;relative positioning\nG1 E-1 F300  ;retract  filament release pressure\nG1 Z+1.0 E-5 F9000 ;move up a and retract more\nG90 ;absolute positioning\nG28; home\nM84 ;steppers off\n;MACHINE END CODE" },
-        "top_bottom_thickness": { "default_value": 1.0},
+        "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" },
-
+        "machine_head_with_fans_polygon":
-        "infill_sparse_density": { "default_value": 17},
-        "infill_before_walls": { "value": false},
-        "zig_zaggify_infill": { "value": true},
-
-        "default_material_print_temperature": { "default_value": 200 },
-        "material_initial_print_temperature": { "value": "material_print_temperature_layer_0"},
-        "material_final_print_temperature": { "value": "material_print_temperature"},
-        "default_material_bed_temperature":
         {
-            "default_value": 60,
+            "default_value": [
-            "minimum_value": "0",
+                [-23.82, 51.25],
-            "minimum_value_warning": "build_volume_temperature",
+                [23.82, 51.25],
-            "maximum_value_warning": "115",
+                [56.292, -5.0],
-            "maximum_value": "120"
+                [32.476, -46.25],
+                [-32.476, -46.25],
+                [-56.292, -5.0]
+            ]
         },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 340 },
+        "machine_name": { "default_value": "Atom 3" },
+        "machine_nozzle_head_distance": { "default_value": 6 },
+        "machine_shape": { "default_value": "elliptic" },
+        "machine_show_variants": { "default_value": true },
+        "machine_start_gcode": { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" },
+        "machine_width": { "default_value": 270 },
         "material_bed_temperature":
         {
-            "value": "round(default_material_bed_temperature-(-0.202 * default_material_bed_temperature + 7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature",
+            "maximum_value": "120",
+            "maximum_value_warning": "115",
             "minimum_value": "0",
             "minimum_value_warning": "build_volume_temperature",
-            "maximum_value_warning": "115",
+            "value": "round(default_material_bed_temperature-(-0.202 * default_material_bed_temperature + 7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature"
-            "maximum_value": "120"
         },
-
+        "material_diameter": { "default_value": 1.75 },
-        "speed_print": { "default_value": 40},
+        "material_final_print_temperature": { "value": "material_print_temperature" },
-        "speed_wall": { "value": "speed_print * 0.75"},
+        "material_initial_print_temperature": { "value": "material_print_temperature_layer_0" },
-        "speed_wall_0": { "value": "speed_print * 0.5"},
-        "speed_wall_x": { "value": "speed_print * 0.75"},
-        "speed_layer_0": { "value": "20"},
-        "speed_slowdown_layers": { "default_value": 1},
-
         "retraction_amount":
         {
             "default_value": 7,
             "maximum_value_warning": 9
         },
+        "retraction_hop": { "default_value": 0.5 },
+        "retraction_hop_enabled": { "default_value": true },
         "retraction_speed":
         {
             "default_value": 70,
             "maximum_value_warning": 80
         },
-        "retraction_hop_enabled": { "default_value": true},
-        "retraction_hop": { "default_value": 0.5},
-
-        "cool_min_layer_time": { "default_value": 5},
-        "cool_min_speed": { "default_value": 10},
-        "cool_lift_head": { "default_value": false},
-
-        "support_type": { "default_value": "everywhere"},
-        "support_angle": { "default_value": 60},
-        "support_z_distance": { "value": "layer_height"},
-        "support_xy_distance_overhang":{"value": "machine_nozzle_size"},
-
-
-        "adhesion_type": { "default_value": "skirt"},
         "skirt_brim_minimal_length":
         {
             "default_value": 750,
-            "value": "60 / (layer_height_0 * line_width)",
+            "maximum_value_warning": "4000",
             "minimum_value": "0",
             "minimum_value_warning": "25",
-            "maximum_value_warning": "4000"
+            "value": "60 / (layer_height_0 * line_width)"
         },
         "skirt_gap":
         {
             "default_value": 1,
             "value": "3 * wall_line_width_0"
-        }
+        },
+        "speed_layer_0": { "value": "20" },
+        "speed_print": { "default_value": 40 },
+        "speed_slowdown_layers": { "default_value": 1 },
+        "speed_wall": { "value": "speed_print * 0.75" },
+        "speed_wall_0": { "value": "speed_print * 0.5" },
+        "speed_wall_x": { "value": "speed_print * 0.75" },
+        "support_angle": { "default_value": 60 },
+        "support_type": { "default_value": "everywhere" },
+        "support_xy_distance_overhang": { "value": "machine_nozzle_size" },
+        "support_z_distance": { "value": "layer_height" },
+        "top_bottom_thickness": { "default_value": 1.0 },
+        "zig_zaggify_infill": { "value": true }
     }
 }

resources/definitions/atom3_lite.def.json

@@ -2,61 +2,47 @@
     "version": 2,
     "name": "Atom 3 Lite",
     "inherits": "atom3",
-    "metadata": {
+    "metadata":
+    {
         "author": "Daniel Kurth",
         "manufacturer": "Layer One",
-        "platform_offset": [0, 0, 0],
+        "platform": "Atom 3 lite bed.3mf",
-        "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle",
+        "platform_offset": [
-        "platform": "Atom 3 lite bed.3mf"
+            0,
+            0,
+            0
+        ],
+        "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle"
     },
-
+    "overrides":
-
+    {
-
+        "cool_lift_head": { "default_value": false },
-
+        "cool_min_layer_time": { "default_value": 15 },
-    "overrides": {
+        "cool_min_speed": { "default_value": 5 },
         "machine_head_with_fans_polygon":
         {
-            "default_value":
+            "default_value": [
-            [
                 [-23.82, 41.25],
                 [23.82, 41.25],
                 [38.105, 16.5],
-                [57.631 , 16.5],
+                [57.631, 16.5],
-
+                [57.631, -16.5],
-                [57.631 , -16.5],
                 [38.105, -16.5],
                 [23.82, -41.25],
                 [-23.82, -41.25],
-
                 [-38.105, -16.5],
-                [-57.631 , -16.5],
+                [-57.631, -16.5],
-                [-57.631 , 16.5],
+                [-57.631, 16.5],
                 [-38.105, 16.5],
                 [-23.82, 41.25]
             ]
         },
-
-
-
-
         "retraction_amount": { "default_value": 7 },
-        "retraction_speed": {
+        "retraction_speed":
+        {
             "default_value": 70,
             "maximum_value_warning": "90"
         },
-
+        "support_angle": { "default_value": 45 }
-
-
-
-        "cool_min_layer_time": { "default_value": 15},
-        "cool_min_speed": { "default_value": 5},
-        "cool_lift_head": { "default_value": false},
-
-
-
-
-        "support_angle": { "default_value": 45}
     }
 }
-
-  

resources/definitions/atomstack_cambrian_base.def.json

@@ -2,28 +2,20 @@
     "version": 2,
     "name": "AtomStack Cambrian Base Printer",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": false,
         "author": "AtomStack",
         "manufacturer": "AtomStack",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "atomstack_cambrianmaxe175_extruder_0" }
-            "0": "atomstack_cambrianmaxe175_extruder_0"
-        }
     },
-    "overrides": {
+    "overrides":
-        "machine_heated_bed": {
+    {
-            "default_value": true
+        "machine_end_gcode": { "default_value": "; AtomStack Cambrian End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute position\n\nG1 X0 Y210 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off nozzle\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },
-        },
+        "machine_extruder_count": { "default_value": 1 },
-        "machine_extruder_count": {
+        "machine_heated_bed": { "default_value": true },
-            "default_value": 1
+        "machine_start_gcode": { "default_value": "; AtomStack Cambrian Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.9 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.9 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG1 E29 ;Retract the filament\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }
-        },
-        "machine_start_gcode": {
-            "default_value": "; AtomStack Cambrian Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.9 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.9 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG1 E29 ;Retract the filament\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish"
-        },
-        "machine_end_gcode": {
-            "default_value": "; AtomStack Cambrian End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute position\n\nG1 X0 Y210 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off nozzle\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z"
-        }
     }
 }

resources/definitions/atomstack_cambrianmaxe175.def.json

@@ -2,28 +2,20 @@
     "version": 2,
     "name": "Cambrian Max E175",
     "inherits": "atomstack_cambrian_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "AtomStack",
         "manufacturer": "AtomStack",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "atomstack_cambrianmaxe175_extruder_0" }
-            "0": "atomstack_cambrianmaxe175_extruder_0"
-        }
     },
-    "overrides": {
+    "overrides":
-        "machine_name": {
+    {
-            "default_value": "Cambrian MAX E175"
+        "machine_depth": { "default_value": 330 },
-        },
+        "machine_height": { "default_value": 380 },
-        "machine_width": {
+        "machine_name": { "default_value": "Cambrian MAX E175" },
-            "default_value": 320
+        "machine_width": { "default_value": 320 }
-        },
-        "machine_height": {
-            "default_value": 380
-        },
-        "machine_depth": {
-            "default_value": 330
-        }
     }
 }

resources/definitions/atomstack_cambrianmaxe285.def.json

@@ -2,28 +2,20 @@
     "version": 2,
     "name": "Cambrian Max E285",
     "inherits": "atomstack_cambrian_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "AtomStack",
         "manufacturer": "AtomStack",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "atomstack_cambrianmaxe285_extruder_0" }
-            "0": "atomstack_cambrianmaxe285_extruder_0"
-        }
     },
-    "overrides": {
+    "overrides":
-        "machine_name": {
+    {
-            "default_value": "Cambrian MAX E285"
+        "machine_depth": { "default_value": 330 },
-        },
+        "machine_height": { "default_value": 380 },
-        "machine_width": {
+        "machine_name": { "default_value": "Cambrian MAX E285" },
-            "default_value": 320
+        "machine_width": { "default_value": 320 }
-        },
-        "machine_height": {
-            "default_value": 380
-        },
-        "machine_depth": {
-            "default_value": 330
-        }
     }
 }

resources/definitions/atomstack_cambrianproe175.def.json

@@ -2,28 +2,20 @@
     "version": 2,
     "name": "Cambrian Pro E175",
     "inherits": "atomstack_cambrian_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "AtomStack",
         "manufacturer": "AtomStack",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "atomstack_cambrianproe175_extruder_0" }
-            "0": "atomstack_cambrianproe175_extruder_0"
-        }
     },
-    "overrides": {
+    "overrides":
-        "machine_name": {
+    {
-            "default_value": "Cambrian Pro E175"
+        "machine_depth": { "default_value": 235 },
-        },
+        "machine_height": { "default_value": 250 },
-        "machine_width": {
+        "machine_name": { "default_value": "Cambrian Pro E175" },
-            "default_value": 235
+        "machine_width": { "default_value": 235 }
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_depth": {
-            "default_value": 235
-        }
     }
 }

resources/definitions/atomstack_cambrianproe285.def.json

@@ -2,28 +2,20 @@
     "version": 2,
     "name": "Cambrian Pro E285",
     "inherits": "atomstack_cambrian_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "AtomStack",
         "manufacturer": "AtomStack",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "machine_extruder_trains": {
+        "machine_extruder_trains": { "0": "atomstack_cambrianproe285_extruder_0" }
-        "0": "atomstack_cambrianproe285_extruder_0"
-        }
     },
-    "overrides": {
+    "overrides":
-        "machine_name": {
+    {
-            "default_value": "Cambrian Pro E285"
+        "machine_depth": { "default_value": 235 },
-        },
+        "machine_height": { "default_value": 250 },
-        "machine_width": {
+        "machine_name": { "default_value": "Cambrian Pro E285" },
-            "default_value": 235
+        "machine_width": { "default_value": 235 }
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_depth": {
-            "default_value": 235
-        }
     }
 }

resources/definitions/beamup_l.def.json

@@ -2,57 +2,35 @@
     "version": 2,
     "name": "BeamUp L",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "BeamUp",
         "manufacturer": "BeamUp",
         "file_formats": "text/x-gcode",
         "platform": "beamup_l.3mf",
-        "platform_offset": [0, -2.5, -2.5],
         "has_machine_quality": true,
         "has_materials": true,
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "beamup_l_extruder_0" },
+        "platform_offset": [
+            0,
+            -2.5,
+            -2.5
+        ]
+    },
+    "overrides":
     {
-            "0": "beamup_l_extruder_0"
+        "gantry_height": { "value": "0" },
-        }
+        "machine_center_is_zero": { "default_value": false },
-    },
+        "machine_depth": { "default_value": 320 },
-
+        "machine_end_gcode": { "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off" },
-    "overrides": {
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_name": { 
+        "machine_heated_bed": { "default_value": false },
-            "default_value": "BeamUp L" 
+        "machine_height": { "default_value": 300 },
-        },
+        "machine_name": { "default_value": "BeamUp L" },
-        "machine_width": {
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
-            "default_value": 320
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
-        },
+        "machine_start_gcode": { "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X50 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X250 Y0 E15 F662" },
-        "machine_depth": {
+        "machine_width": { "default_value": 320 }
-            "default_value": 320
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 2
-        },
-        "machine_nozzle_cool_down_speed": {
-            "default_value": 2
-        },
-        "gantry_height": {
-            "value": "0"
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X50 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X250 Y0 E15 F662"
-        },
-        "machine_end_gcode": {
-            "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off"
-        }
     }
 }

resources/definitions/beamup_s.def.json

@@ -2,57 +2,35 @@
     "version": 2,
     "name": "BeamUp S",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "BeamUp",
         "manufacturer": "BeamUp",
         "file_formats": "text/x-gcode",
         "platform": "beamup_s.3mf",
-        "platform_offset": [0, -5, -10],
         "has_machine_quality": true,
         "has_materials": true,
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "beamup_s_extruder_0" },
+        "platform_offset": [
+            0,
+            -5,
+            -10
+        ]
+    },
+    "overrides":
     {
-            "0": "beamup_s_extruder_0"
+        "gantry_height": { "value": "0" },
-        }
+        "machine_center_is_zero": { "default_value": false },
-    },
+        "machine_depth": { "default_value": 180 },
-
+        "machine_end_gcode": { "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off" },
-    "overrides": {
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_name": { 
+        "machine_heated_bed": { "default_value": false },
-            "default_value": "BeamUp S" 
+        "machine_height": { "default_value": 130 },
-        },
+        "machine_name": { "default_value": "BeamUp S" },
-        "machine_width": {
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
-            "default_value": 200
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
-        },
+        "machine_start_gcode": { "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X5 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X180 Y0 E15 F662" },
-        "machine_depth": {
+        "machine_width": { "default_value": 200 }
-            "default_value": 180
-        },
-        "machine_height": {
-            "default_value": 130
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 2
-        },
-        "machine_nozzle_cool_down_speed": {
-            "default_value": 2
-        },
-        "gantry_height": {
-            "value": "0"
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X5 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X180 Y0 E15 F662"
-        },
-        "machine_end_gcode": {
-            "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off"
-        }
     }
 }

resources/definitions/bfb.def.json

@@ -1,32 +1,34 @@
 {
-    "name": "BFB",
     "version": 2,
+    "name": "BFB",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "manufacturer": "BFB",
         "file_formats": "text/x-gcode",
-        "platform_offset": [ 0, 0, 0],
+        "machine_extruder_trains": { "0": "bfb_extruder_0" },
-        "machine_extruder_trains":
+        "platform_offset": [
-        {
+            0,
-            "0": "bfb_extruder_0"
+            0,
-        }
+            0
+        ]
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "speed_print": { "default_value": 40 },
-        "machine_extruder_count": { "default_value": 1 },
-        "prime_tower_size": { "default_value": 7.745966692414834 },
-        "machine_name": { "default_value": "BFB_Test" },
-        "machine_heated_bed": { "default_value": false },
-        "machine_width": { "default_value": 275 },
-        "machine_gcode_flavor": { "default_value": "BFB" },
-        "machine_depth": { "default_value": 265 },
-        "machine_center_is_zero": { "default_value": true },
-        "machine_height": { "default_value": 240 },
-        "layer_height": { "default_value": 0.25 },
-        "retraction_amount": { "default_value": 0.05 },
         "infill_sparse_density": { "default_value": 10 },
-        "layer_height_0": { "default_value": 0.5 }
+        "layer_height": { "default_value": 0.25 },
+        "layer_height_0": { "default_value": 0.5 },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_depth": { "default_value": 265 },
+        "machine_extruder_count": { "default_value": 1 },
+        "machine_gcode_flavor": { "default_value": "BFB" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 240 },
+        "machine_name": { "default_value": "BFB_Test" },
+        "machine_width": { "default_value": 275 },
+        "prime_tower_size": { "default_value": 7.745966692414834 },
+        "retraction_amount": { "default_value": 0.05 },
+        "speed_print": { "default_value": 40 }
     }
 }

resources/definitions/bibo2_dual.def.json

@@ -2,92 +2,47 @@
     "version": 2,
     "name": "Bibo 2 dual",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "unknown",
         "manufacturer": "BIBO",
         "file_formats": "text/x-gcode",
+        "first_start_actions": [ "MachineSettingsAction" ],
         "has_materials": true,
-        "machine_extruder_trains": {
+        "machine_extruder_trains":
+        {
             "0": "bibo2_dual_extruder_0",
             "1": "bibo2_dual_extruder_1"
-        },
-        "first_start_actions": [
-            "MachineSettingsAction"
-        ]
-    },
-    "overrides": {
-        "machine_name": {
-            "default_value": "BIBO2 dual"
-        },
-        "machine_width": {
-            "default_value": 214
-        },
-        "machine_height": {
-            "default_value": 160
-        },
-        "machine_depth": {
-            "default_value": 186
-        },
-        "machine_center_is_zero": {
-            "default_value": true
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 2
-        },
-        "machine_nozzle_cool_down_speed": {
-            "default_value": 2
-        },
-        "machine_head_with_fans_polygon": {
-            "default_value": [
-                [
-                    -68.18,
-                    64.63
-                ],
-                [
-                    -68.18,
-                    -47.38
-                ],
-                [
-                    35.18,
-                    64.63
-                ],
-                [
-                    35.18,
-                    -47.38
-                ]
-            ]
-        },
-        "gantry_height": {
-            "value": "12"
-        },
-        "machine_use_extruder_offset_to_offset_coords": {
-            "default_value": true
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "machine_start_gcode": {
-            "default_value": "M104 T0 165\nM104 T1 165\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 2mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nT{initial_extruder_nr}\nM117 BIBO Printing..."
-        },
-        "machine_end_gcode": {
-            "default_value": ";End GCode\nM104 T0 S0                     ;extruder heater off\nM104 T1 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100                                        ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-2 X-20 Y-20 F300 ;move Z up a bit and retract filament even more\nG28 X0 Y0                              ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning"
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "machine_extruder_count": {
-            "default_value": 2
-        },
-        "prime_tower_position_x": {
-            "value": "50"
-        },
-        "prime_tower_position_y": {
-            "value": "50"
         }
+    },
+    "overrides":
+    {
+        "gantry_height": { "value": "12" },
+        "machine_center_is_zero": { "default_value": true },
+        "machine_depth": { "default_value": 186 },
+        "machine_end_gcode": { "default_value": ";End GCode\nM104 T0 S0                     ;extruder heater off\nM104 T1 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100                                        ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-2 X-20 Y-20 F300 ;move Z up a bit and retract filament even more\nG28 X0 Y0                              ;move X/Y to min endstops, so the head is out of the way\nM84                         ;steppers off\nG90                         ;absolute positioning" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-68.18, 64.63],
+                [-68.18, -47.38],
+                [35.18, 64.63],
+                [35.18, -47.38]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 160 },
+        "machine_name": { "default_value": "BIBO2 dual" },
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+        "machine_start_gcode": { "default_value": "M104 T0 165\nM104 T1 165\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 2mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nT{initial_extruder_nr}\nM117 BIBO Printing..." },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": true },
+        "machine_width": { "default_value": 214 },
+        "prime_tower_position_x": { "value": "50" },
+        "prime_tower_position_y": { "value": "50" },
+        "speed_print": { "default_value": 40 }
     }
 }
-

resources/definitions/biqu_b1.def.json

@@ -1,44 +1,45 @@
 {
-    "name": "Biqu B1",
     "version": 2,
+    "name": "Biqu B1",
     "inherits": "biqu_base",
-    "metadata": {
+    "metadata":
-        "quality_definition": "biqu_base",
+    {
         "visible": true,
-        "has_machine_materials": true,
         "platform": "BIQU_SSS.stl",
+        "has_machine_materials": true,
         "platform_offset": [
             0,
             -7.4,
             5
-        ]
+        ],
+        "quality_definition": "biqu_base"
     },
-    "overrides": {
+    "overrides":
+    {
         "coasting_enable": { "value": true },
-        "retraction_amount": { "value": 7 },
+        "gantry_height": { "value": 27.5 },
-        "retraction_speed": { "value": 70 },
-        "support_enable": { "value": true },
-        "support_structure": { "value": "'normal'" },
-        "support_type": { "value": "'buildplate'" },
-        "support_angle": { "value": 45 },
-        "support_infill_rate": { "value": 15 },
         "infill_overlap_mm": { "value": 0.06 },
-        "speed_print": { "value": 60 },
-        "machine_name": { "default_value": "BIQU B1" },
-        "machine_width": { "value": 235 },
         "machine_depth": { "value": 235 },
-        "machine_height": { "value": 270 },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": { "default_value": [
+        {
+            "default_value": [
                 [-33, 35],
                 [-33, -23],
                 [33, -23],
                 [33, 35]
             ]
         },
-        "machine_start_gcode": {
+        "machine_height": { "value": 270 },
-            "default_value": "                                 ; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0}      ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0}      ; Wait for Heat Bed temperature\nM117 Getting the extruder up to temp!\nM104 S{material_print_temperature_layer_0}    ; Set Extruder temperature\nG92 E0                           ; Reset Extruder\nM117 Homing axes\nG28                              ; Home all axes\nM109 S{material_print_temperature_layer_0}    ; Wait for Extruder temperature\nG1 Z2.0 F3000                    ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0         ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15  ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0      ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30     ; Draw the second line\nG92 E0                           ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000                    ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0           ; Move over to prevent blob squish"
+        "machine_name": { "default_value": "BIQU B1" },
-        },
+        "machine_start_gcode": { "default_value": "                                 ; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0}      ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0}      ; Wait for Heat Bed temperature\nM117 Getting the extruder up to temp!\nM104 S{material_print_temperature_layer_0}    ; Set Extruder temperature\nG92 E0                           ; Reset Extruder\nM117 Homing axes\nG28                              ; Home all axes\nM109 S{material_print_temperature_layer_0}    ; Wait for Extruder temperature\nG1 Z2.0 F3000                    ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0         ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15  ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0      ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30     ; Draw the second line\nG92 E0                           ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000                    ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0           ; Move over to prevent blob squish" },
-
+        "machine_width": { "value": 235 },
-        "gantry_height": { "value": 27.5 }
+        "retraction_amount": { "value": 7 },
+        "retraction_speed": { "value": 70 },
+        "speed_print": { "value": 60 },
+        "support_angle": { "value": 45 },
+        "support_enable": { "value": true },
+        "support_infill_rate": { "value": 15 },
+        "support_structure": { "value": "'normal'" },
+        "support_type": { "value": "'buildplate'" }
     }
 }

resources/definitions/biqu_b1_abl.def.json

@@ -1,44 +1,45 @@
 {
-    "name": "Biqu B1 ABL",
     "version": 2,
+    "name": "Biqu B1 ABL",
     "inherits": "biqu_base",
-    "metadata": {
+    "metadata":
-        "quality_definition": "biqu_base",
+    {
         "visible": true,
-        "has_machine_materials": true,
         "platform": "BIQU_SSS.stl",
+        "has_machine_materials": true,
         "platform_offset": [
             0,
             -7.4,
             5
-        ]
+        ],
+        "quality_definition": "biqu_base"
     },
-    "overrides": {
+    "overrides":
+    {
         "coasting_enable": { "value": true },
-        "retraction_amount": { "value": 7 },
+        "gantry_height": { "value": 27.5 },
-        "retraction_speed": { "value": 70 },
-        "support_enable": { "value": true },
-        "support_structure": { "value": "'normal'" },
-        "support_type": { "value": "'buildplate'" },
-        "support_angle": { "value": 45 },
-        "support_infill_rate": { "value": 15 },
         "infill_overlap_mm": { "value": 0.06 },
-        "speed_print": { "value": 60 },
-        "machine_name": { "default_value": "BIQU B1 ABL" },
-        "machine_width": { "value": 235 },
         "machine_depth": { "value": 235 },
-        "machine_height": { "value": 270 },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": { "default_value": [
+        {
+            "default_value": [
                 [-33, 35],
                 [-33, -23],
                 [33, -23],
                 [33, 35]
             ]
         },
-        "machine_start_gcode": {
+        "machine_height": { "value": 270 },
-            "default_value": "; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0}      ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0}      ; Wait for Heat Bed temperature\nM117 Pre-heating the extruder\nM104 S160                                     ; Set Extruder temperature\nM117 Homing axes\nG28                              ; Home all axes\nM117 ABL Probing\nG29\nM117 Getting the extruder up to temp\nM104 S{material_print_temperature_layer_0}    ; Set Extruder temperature\nM109 S{material_print_temperature_layer_0}    ; Wait for Extruder temperature\nG92 E0                                        ; Reset Extruder\nG1 Z2.0 F3000                    ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0         ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15  ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0      ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30     ; Draw the second line\nG92 E0                           ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000                    ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0           ; Move over to prevent blob squish"
+        "machine_name": { "default_value": "BIQU B1 ABL" },
-        },
+        "machine_start_gcode": { "default_value": "; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0}      ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0}      ; Wait for Heat Bed temperature\nM117 Pre-heating the extruder\nM104 S160                                     ; Set Extruder temperature\nM117 Homing axes\nG28                              ; Home all axes\nM117 ABL Probing\nG29\nM117 Getting the extruder up to temp\nM104 S{material_print_temperature_layer_0}    ; Set Extruder temperature\nM109 S{material_print_temperature_layer_0}    ; Wait for Extruder temperature\nG92 E0                                        ; Reset Extruder\nG1 Z2.0 F3000                    ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0         ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15  ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0      ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30     ; Draw the second line\nG92 E0                           ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000                    ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0           ; Move over to prevent blob squish" },
-
+        "machine_width": { "value": 235 },
-        "gantry_height": { "value": 27.5 }
+        "retraction_amount": { "value": 7 },
+        "retraction_speed": { "value": 70 },
+        "speed_print": { "value": 60 },
+        "support_angle": { "value": 45 },
+        "support_enable": { "value": true },
+        "support_infill_rate": { "value": 15 },
+        "support_structure": { "value": "'normal'" },
+        "support_type": { "value": "'buildplate'" }
     }
 }

resources/definitions/biqu_base.def.json

@@ -1,154 +1,128 @@
 {
-    "name": "Biqu Base Printer",
     "version": 2,
+    "name": "Biqu Base Printer",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": false,
         "author": "Luke Harrison",
         "manufacturer": "Biqu",
         "file_formats": "text/x-gcode",
-        "first_start_actions": ["MachineSettingsAction"],
+        "first_start_actions": [ "MachineSettingsAction" ],
-
+        "has_machine_quality": true,
-        "machine_extruder_trains": {
-            "0": "biqu_base_extruder_0"
-        },
-
         "has_materials": true,
         "has_variants": true,
-        "has_machine_quality": true,
+        "machine_extruder_trains": { "0": "biqu_base_extruder_0" },
-        "variants_name": "Nozzle Diameter",
+        "preferred_material": "generic_pla_175",
-
-        "preferred_variant_name": "0.4mm Nozzle",
         "preferred_quality_type": "standard",
-        "preferred_material": "generic_pla_175"
+        "preferred_variant_name": "0.4mm Nozzle",
+        "variants_name": "Nozzle Diameter"
     },
-    "overrides": {
+    "overrides":
-        "machine_name": { "default_value": "BIQU Base Printer" },
+    {
-        "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" },
+        "acceleration_enabled": { "value": false },
-        "machine_end_gcode": { "default_value": "                               ;BIQU Default End Gcode\nG91                            ;Relative positioning\nG1 E-2 F2700                   ;Retract a bit\nG1 E-2 Z0.2 F2400              ;Retract a bit more and raise Z\nG1 X5 Y5 F3000                 ;Wipe out\nG1 Z10                         ;Raise Z by 10mm\nG90                            ;Return to absolute positioning\n\nG1 X0 Y{machine_depth}         ;TaDaaaa\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_max_feedrate_x": { "value": 500 },
-        "machine_max_feedrate_y": { "value": 500 },
-        "machine_max_feedrate_z": { "value": 10 },
-        "machine_max_feedrate_e": { "value": 75 },
-
-        "machine_max_acceleration_x": { "value": 500 },
-        "machine_max_acceleration_y": { "value": 500 },
-        "machine_max_acceleration_z": { "value": 100 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_acceleration": { "value": 500 },
-
-        "machine_max_jerk_xy": { "value": 10 },
-        "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 },
-
-        "machine_heated_bed": { "default_value": true },
-
-        "material_diameter": { "default_value": 1.75 },
-
         "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'" },
+        "brim_replaces_support": { "value": false },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "value": 10 },
+        "fill_outline_gaps": { "value": false },
+        "infill_before_walls": { "value": false },
+        "infill_line_width": { "value": "line_width * 1.2" },
+        "infill_overlap": { "value": 30.0 },
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "infill_wipe_dist": { "value": 0.0 },
+        "jerk_enabled": { "value": false },
         "jerk_print": { "value": 8 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
-
+        "machine_acceleration": { "value": 500 },
-        "acceleration_enabled": { "value": false },
+        "machine_end_gcode": { "default_value": "                               ;BIQU Default End Gcode\nG91                            ;Relative positioning\nG1 E-2 F2700                   ;Retract a bit\nG1 E-2 Z0.2 F2400              ;Retract a bit more and raise Z\nG1 X5 Y5 F3000                 ;Wipe out\nG1 Z10                         ;Raise Z by 10mm\nG90                            ;Return to absolute positioning\n\nG1 X0 Y{machine_depth}         ;TaDaaaa\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" },
-        "jerk_enabled": { "value": false },
+        "machine_heated_bed": { "default_value": true },
-
+        "machine_max_acceleration_e": { "value": 5000 },
-        "speed_print": { "value": 50.0 } ,
+        "machine_max_acceleration_x": { "value": 500 },
-
+        "machine_max_acceleration_y": { "value": 500 },
-        "speed_wall_x": { "value": "speed_wall" },
+        "machine_max_acceleration_z": { "value": 100 },
-        "speed_roofing": { "value": "speed_topbottom" },
+        "machine_max_feedrate_e": { "value": 75 },
-        "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
+        "machine_max_feedrate_x": { "value": 500 },
-        "speed_layer_0": { "value": 20.0 },
+        "machine_max_feedrate_y": { "value": 500 },
-        "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+        "machine_max_feedrate_z": { "value": 10 },
-        "speed_prime_tower": { "value": "speed_topbottom" },
+        "machine_max_jerk_e": { "value": 5 },
-        "speed_support": { "value": "speed_wall_0" },
+        "machine_max_jerk_xy": { "value": 10 },
-        "speed_support_interface": { "value": "speed_topbottom" },
+        "machine_max_jerk_z": { "value": 0.4 },
-        "speed_z_hop": { "value": 5 },
+        "machine_name": { "default_value": "BIQU Base Printer" },
-
+        "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" },
-        "skirt_brim_speed": { "value": "speed_layer_0" },
+        "material_diameter": { "default_value": 1.75 },
-
-
-        "optimize_wall_printing_order": { "value": "True" },
-
-        "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
-        "z_seam_type": { "value": "'sharpest_corner'" },
+        "meshfix_maximum_resolution": { "value": "0.25" },
-        "z_seam_corner": { "value": "'z_seam_corner_inner'" },
+        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
-
+        "minimum_interface_area": { "value": 10 },
-        "infill_line_width": { "value": "line_width * 1.2" },
+        "minimum_support_area": { "value": 2 },
-        "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
+        "optimize_wall_printing_order": { "value": "True" },
-        "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 },
-
-        "fill_outline_gaps": { "value": false },
-
-        "retraction_speed": {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
-        },
-        "retraction_retract_speed": {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
-        },
-        "retraction_prime_speed": {
-            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200
-        },
-
-        "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
+        "retraction_count_max": { "value": 100 },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "retraction_min_travel": { "value": 1.5 },
+        "retraction_prime_speed":
+        {
+            "maximum_value": 200,
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
+        },
+        "retraction_retract_speed":
+        {
+            "maximum_value": 200,
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
+        },
+        "retraction_speed":
+        {
+            "maximum_value": 200,
+            "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')"
+        },
+        "skin_overlap": { "value": 10.0 },
+        "skirt_brim_speed": { "value": "speed_layer_0" },
+        "skirt_gap": { "value": 10.0 },
+        "skirt_line_count": { "value": 3 },
+        "speed_layer_0": { "value": 20.0 },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": 50.0 },
+        "speed_roofing": { "value": "speed_topbottom" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
+        "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "speed_z_hop": { "value": 5 },
+        "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
+        "support_brim_enable": { "value": true },
+        "support_brim_width": { "value": 4 },
+        "support_infill_rate": { "value": "0 if support_structure == 'tree' else 20" },
+        "support_interface_density": { "value": 75 },
+        "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "layer_height * 4" },
+        "support_interface_pattern": { "value": "'grid'" },
+        "support_interface_skip_height": { "value": 0.2 },
+        "support_pattern": { "value": "'zigzag'" },
+        "support_use_towers": { "value": false },
+        "support_wall_count": { "value": 1 },
+        "support_xy_distance": { "value": "wall_line_width_0 * 2" },
+        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
+        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
+        "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
+        "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" },
         "travel_avoid_other_parts": { "value": true },
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-
+        "wall_0_wipe_dist": { "value": 0.0 },
-        "retraction_count_max": { "value": 100 },
+        "wall_thickness": { "value": "line_width * 2" },
-        "retraction_extrusion_window": { "value": 10 },
+        "z_seam_corner": { "value": "'z_seam_corner_inner'" },
-        "retraction_min_travel": { "value": 1.5 },
+        "z_seam_type": { "value": "'sharpest_corner'" }
-
-        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_min_layer_time": { "value": 10 },
-
-        "adhesion_type": { "value": "'skirt'" },
-        "brim_replaces_support": { "value": false },
-        "skirt_gap": { "value": 10.0 },
-        "skirt_line_count": { "value": 3 },
-
-        "adaptive_layer_height_variation": { "value": 0.04 },
-        "adaptive_layer_height_variation_step": { "value": 0.04 },
-
-        "meshfix_maximum_resolution": { "value": "0.25" },
-        "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
-
-        "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
-        "support_pattern": { "value": "'zigzag'" },
-        "support_infill_rate": { "value": "0 if support_structure == 'tree' else 20" },
-        "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.16 else layer_height * 2" },
-        "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
-        "support_wall_count": { "value": 1 },
-        "support_brim_enable": { "value": true },
-        "support_brim_width": { "value": 4 },
-
-        "support_interface_enable": { "value": true },
-        "support_interface_height": { "value": "layer_height * 4" },
-        "support_interface_density": { "value": 75 },
-        "support_interface_pattern": { "value": "'grid'" },
-        "support_interface_skip_height": { "value": 0.2 },
-        "minimum_support_area": { "value": 2 },
-        "minimum_interface_area": { "value": 10 },
-        "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
-        "wall_thickness": {"value": "line_width * 2" }
     }
 }

resources/definitions/biqu_bx_abl.def.json

@@ -1,50 +1,51 @@
 {
-    "name": "Biqu BX",
     "version": 2,
+    "name": "Biqu BX",
     "inherits": "biqu_base",
-    "metadata": {
+    "metadata":
-        "quality_definition": "biqu_base",
+    {
         "visible": true,
-        "has_machine_materials": true,
         "platform": "BIQU_BX_PLATE.stl",
+        "has_machine_materials": true,
         "platform_offset": [
             7,
             -7.4,
             -3
-        ]
+        ],
+        "quality_definition": "biqu_base"
     },
-    "overrides": {
+    "overrides":
+    {
         "coasting_enable": { "value": false },
-        "retraction_amount": { "value": 1 },
-        "retraction_speed": { "value": 40 },
-        "retraction_extrusion_window": { "value": 1 },
-        "retract_at_layer_change": { "value": true },
-        "support_enable": { "value": false },
-        "support_structure": { "value": "'normal'" },
-        "support_type": { "value": "'buildplate'" },
-        "support_angle": { "value": 45 },
-        "support_infill_rate": { "value": 15 },
-        "infill_overlap": { "value": 15.0 },
-        "skin_overlap": { "value": 20.0 },
         "fill_outline_gaps": { "value": true },
-        "roofing_layer_count": { "value": 2 },
+        "gantry_height": { "value": 27.5 },
-        "xy_offset_layer_0": { "value": -0.1 },
+        "infill_overlap": { "value": 15.0 },
-        "speed_print": { "value": 50 },
-        "machine_name": { "default_value": "Biqu BX" },
-        "machine_width": { "value": 250 },
         "machine_depth": { "value": 250 },
-        "machine_height": { "value": 250 },
+        "machine_head_with_fans_polygon":
-        "machine_head_with_fans_polygon": { "default_value": [
+        {
+            "default_value": [
                 [-33, 35],
                 [-33, -23],
                 [33, -23],
                 [33, 35]
             ]
         },
-        "machine_start_gcode": {
+        "machine_height": { "value": 250 },
-            "default_value": "; BIQU BX Start G-code\r\n; For information on how to tune this profile and get the\r\n; most out of your BX visit: https:\/\/github.com\/looxonline\/Marlin\r\n; For the official github site visit: https:\/\/github.com\/bigtreetech\/BIQU-BX\r\n\r\nM117 Initial homing sequence.                         ; Home so that the probe is positioned to heat\r\nG28\r\n\r\nM117 Probe heating position\r\nG0 X65 Y5 Z1                                                   ; Move the probe to the heating position.\r\n\r\nM117 Getting the heaters up to temp!\r\nM104 S140                                                          ; Set Extruder temperature, no wait\r\nM140 S60                                                            ; Set Heat Bed temperature\r\nM190 S60                                                            ; Wait for Heat Bed temperature\r\n\r\nM117 Waiting for probe to warm!                        ; Wait another 90s for the probe to absorb heat.\r\nG4 S90 \r\n\r\nM117 Post warming re-home\r\nG28                                                                      ; Home all axes again after warming\r\n\r\nM117 Z-Dance of my people\r\nG34\r\n\r\nM117 ABL Probing\r\nG29\r\n\r\nM900 K0 L0 T0                                 ;Edit the K and L values if you have calibrated a k factor for your filament\r\nM900 T0 S0\r\n\r\nG1 Z2.0 F3000                                        ; Move Z Axis up little to prevent scratching of Heat Bed\r\nG1 X4.1 Y10 Z0.3 F5000.0                      ; Move to start position\r\n\r\nM117 Getting the extruder up to temp\r\nM140 S{material_bed_temperature_layer_0}      ; Set Heat Bed temperature\r\nM104 S{material_print_temperature_layer_0}    ; Set Extruder temperature\r\nM109 S{material_print_temperature_layer_0}    ; Wait for Extruder temperature\r\nM190 S{material_bed_temperature_layer_0}      ; Wait for Heat Bed temperature\r\n\r\nG92 E0                                        ; Reset Extruder\r\nM117 Purging\r\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15               ; Draw the first line\r\nG1 X4.4 Y200.0 Z0.3 F5000.0                   ; Move to side a little\r\nG1 X4.4 Y20 Z0.3 F1500.0 E30                  ; Draw the second line\r\nG92 E0                                        ; Reset Extruder\r\nM117 Lets make\r\nG1 X8 Y20 Z0.3 F5000.0                        ; Move over to prevent blob squish"
+        "machine_name": { "default_value": "Biqu BX" },
-        },
+        "machine_start_gcode": { "default_value": "; BIQU BX Start G-code\r\n; For information on how to tune this profile and get the\r\n; most out of your BX visit: https://github.com/looxonline/Marlin\r\n; For the official github site visit: https://github.com/bigtreetech/BIQU-BX\r\n\r\nM117 Initial homing sequence.                         ; Home so that the probe is positioned to heat\r\nG28\r\n\r\nM117 Probe heating position\r\nG0 X65 Y5 Z1                                                   ; Move the probe to the heating position.\r\n\r\nM117 Getting the heaters up to temp!\r\nM104 S140                                                          ; Set Extruder temperature, no wait\r\nM140 S60                                                            ; Set Heat Bed temperature\r\nM190 S60                                                            ; Wait for Heat Bed temperature\r\n\r\nM117 Waiting for probe to warm!                        ; Wait another 90s for the probe to absorb heat.\r\nG4 S90 \r\n\r\nM117 Post warming re-home\r\nG28                                                                      ; Home all axes again after warming\r\n\r\nM117 Z-Dance of my people\r\nG34\r\n\r\nM117 ABL Probing\r\nG29\r\n\r\nM900 K0 L0 T0                                 ;Edit the K and L values if you have calibrated a k factor for your filament\r\nM900 T0 S0\r\n\r\nG1 Z2.0 F3000                                        ; Move Z Axis up little to prevent scratching of Heat Bed\r\nG1 X4.1 Y10 Z0.3 F5000.0                      ; Move to start position\r\n\r\nM117 Getting the extruder up to temp\r\nM140 S{material_bed_temperature_layer_0}      ; Set Heat Bed temperature\r\nM104 S{material_print_temperature_layer_0}    ; Set Extruder temperature\r\nM109 S{material_print_temperature_layer_0}    ; Wait for Extruder temperature\r\nM190 S{material_bed_temperature_layer_0}      ; Wait for Heat Bed temperature\r\n\r\nG92 E0                                        ; Reset Extruder\r\nM117 Purging\r\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15               ; Draw the first line\r\nG1 X4.4 Y200.0 Z0.3 F5000.0                   ; Move to side a little\r\nG1 X4.4 Y20 Z0.3 F1500.0 E30                  ; Draw the second line\r\nG92 E0                                        ; Reset Extruder\r\nM117 Lets make\r\nG1 X8 Y20 Z0.3 F5000.0                        ; Move over to prevent blob squish" },
-
+        "machine_width": { "value": 250 },
-        "gantry_height": { "value": 27.5 }
+        "retract_at_layer_change": { "value": true },
+        "retraction_amount": { "value": 1 },
+        "retraction_extrusion_window": { "value": 1 },
+        "retraction_speed": { "value": 40 },
+        "roofing_layer_count": { "value": 2 },
+        "skin_overlap": { "value": 20.0 },
+        "speed_print": { "value": 50 },
+        "support_angle": { "value": 45 },
+        "support_enable": { "value": false },
+        "support_infill_rate": { "value": 15 },
+        "support_structure": { "value": "'normal'" },
+        "support_type": { "value": "'buildplate'" },
+        "xy_offset_layer_0": { "value": -0.1 }
     }
 }

resources/definitions/blv_mgn_cube_300.def.json

@@ -1,33 +1,23 @@
 {
-  "name": "BLV MGN Cube 300",
     "version": 2,
+    "name": "BLV MGN Cube 300",
     "inherits": "blv_mgn_cube_base",
-  "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "wolfgangmauer",
         "manufacturer": "BLV",
         "file_formats": "text/x-gcode",
-    "first_start_actions": [
+        "platform": "blv_mgn_cube_300_platform.3mf",
-      "MachineSettingsAction"
+        "first_start_actions": [ "MachineSettingsAction" ],
-    ],
+        "machine_extruder_trains": { "0": "blv_mgn_cube_extruder_0" },
-    "machine_extruder_trains": {
+        "quality_definition": "blv_mgn_cube_base"
-      "0": "blv_mgn_cube_extruder_0"
     },
-    "quality_definition": "blv_mgn_cube_base",
+    "overrides":
-    "platform": "blv_mgn_cube_300_platform.3mf"
+    {
-  },
+        "machine_depth": { "default_value": 300 },
-  "overrides": {
+        "machine_height": { "default_value": 465 },
-    "machine_name": {
+        "machine_name": { "default_value": "BLV mgn Cube 300" },
-      "default_value": "BLV mgn Cube 300"
+        "machine_width": { "default_value": 300 }
-    },
-    "machine_height": {
-      "default_value": 465
-    },
-    "machine_width": {
-      "default_value": 300
-    },
-    "machine_depth": {
-      "default_value": 300
-    }
     }
 }

resources/definitions/blv_mgn_cube_350.def.json

@@ -1,33 +1,23 @@
 {
-  "name": "BLV MGN Cube 350",
     "version": 2,
+    "name": "BLV MGN Cube 350",
     "inherits": "blv_mgn_cube_base",
-  "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "wolfgangmauer",
         "manufacturer": "BLV",
         "file_formats": "text/x-gcode",
-    "first_start_actions": [
+        "platform": "blv_mgn_cube_350_platform.3mf",
-      "MachineSettingsAction"
+        "first_start_actions": [ "MachineSettingsAction" ],
-    ],
+        "machine_extruder_trains": { "0": "blv_mgn_cube_extruder_0" },
-    "machine_extruder_trains": {
+        "quality_definition": "blv_mgn_cube_base"
-      "0": "blv_mgn_cube_extruder_0"
     },
-    "quality_definition": "blv_mgn_cube_base",
+    "overrides":
-    "platform": "blv_mgn_cube_350_platform.3mf"
+    {
-  },
+        "machine_depth": { "default_value": 350 },
-  "overrides": {
+        "machine_height": { "default_value": 465 },
-    "machine_name": {
+        "machine_name": { "default_value": "BLV mgn Cube350" },
-      "default_value": "BLV mgn Cube350"
+        "machine_width": { "default_value": 350 }
-    },
-    "machine_height": {
-      "default_value": 465
-    },
-    "machine_width": {
-      "default_value": 350
-    },
-    "machine_depth": {
-      "default_value": 350
-    }
     }
 }

resources/definitions/blv_mgn_cube_base.def.json

@@ -1,210 +1,105 @@
 {
-  "name": "BLV MGN Cube Base",
     "version": 2,
+    "name": "BLV MGN Cube Base",
     "inherits": "anet3d",
-  "metadata": {
+    "metadata":
+    {
         "visible": false,
         "author": "wolfgangmauer",
         "manufacturer": "BLV",
         "file_formats": "text/x-gcode",
-    "first_start_actions": [
+        "first_start_actions": [ "MachineSettingsAction" ],
-      "MachineSettingsAction"
+        "has_machine_quality": false,
-    ],
-    "preferred_quality_type": "normal",
-    "machine_extruder_trains": {
-      "0": "blv_mgn_cube_extruder_0"
-    },
-    "preferred_material": "generic_pla",
-    "has_variants": false,
         "has_materials": true,
-    "preferred_variant_name": "0.4mm Nozzle",
+        "has_variants": false,
-    "has_machine_quality": false
+        "machine_extruder_trains": { "0": "blv_mgn_cube_extruder_0" },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "normal",
+        "preferred_variant_name": "0.4mm Nozzle"
     },
-  "overrides": {
+    "overrides":
-    "machine_name": {
+    {
-      "default_value": "BLV mgn Cube"
+        "acceleration_enabled": { "value": false },
+        "adhesion_type": { "value": "'none'" },
+        "bottom_layers": { "value": 3 },
+        "bridge_fan_speed": { "default_value": 100 },
+        "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" },
+        "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" },
+        "bridge_settings_enabled": { "default_value": true },
+        "bridge_wall_coast": { "default_value": 10 },
+        "brim_width": { "default_value": 5 },
+        "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" },
+        "cool_fan_full_layer": { "value": 4 },
+        "cool_fan_speed_min": { "value": "cool_fan_speed" },
+        "cool_min_layer_time": { "value": 15 },
+        "cool_min_layer_time_fan_speed_max": { "default_value": 20 },
+        "fill_outline_gaps": { "value": true },
+        "infill_before_walls": { "value": true },
+        "infill_enable_travel_optimization": { "default_value": true },
+        "infill_overlap":
+        {
+            "maximum_value_warning": 100,
+            "minimum_value_warning": -50,
+            "value": "10 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0"
         },
-    "initial_layer_line_width_factor": {
+        "infill_pattern": { "value": "'tetrahedral'" },
-      "default_value": 130.0
+        "infill_randomize_start_location": { "default_value": true },
+        "initial_layer_line_width_factor": { "default_value": 130.0 },
+        "jerk_enabled": { "value": false },
+        "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" },
+        "line_width": { "value": "machine_nozzle_size" },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_end_gcode": { "default_value": "G91 ;relative positioning\nG1 Z5 F500; move nozzle relative to position\nG90 ;absolute positioning\nG1 X0 Y{machine_depth}\nG12 P1 T3\nM104 S0\nM140 S0\nG92 E0\nM84\nM109 S50\nM81\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_name": { "default_value": "BLV mgn Cube" },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG92 E0 ;zero the extruded length\nM104 S170 T0; start preheat hotend_0\nM140 S{material_bed_temperature_layer_0} ; start preheating the bed\nM190 S{material_bed_temperature_layer_0} ; heat to Cura Bed setting\nG28\nG12 P1 S2 T3\nG34\nG29\nG1 X0 Y0 Z1 F9000\nM109 S{material_print_temperature_layer_0} T0\nG1 X100 Y0 Z{layer_height_0} E30 F500 ;intro line\nG92 E0 ;zero the extruded length again\nM117 Printing...\n" },
+        "optimize_wall_printing_order": { "value": true },
+        "retraction_amount": { "default_value": 5.5 },
+        "retraction_combing": { "value": "'infill'" },
+        "retraction_combing_max_distance": { "value": 10 },
+        "retraction_count_max": { "value": 20 },
+        "retraction_extrusion_window": { "value": "retraction_amount" },
+        "retraction_hop": { "value": 0.4 },
+        "retraction_hop_enabled": { "value": true },
+        "retraction_prime_speed":
+        {
+            "maximum_value_warning": 130,
+            "value": "math.ceil(retraction_speed * 0.4)"
         },
-    "speed_slowdown_layers": {
+        "retraction_retract_speed": { "maximum_value_warning": 130 },
-      "default_value": 1
+        "retraction_speed":
-    },
+        {
-    "optimize_wall_printing_order": {
-      "value": true
-    },
-    "infill_enable_travel_optimization": {
-      "default_value": true
-    },
-    "machine_heated_bed": {
-      "default_value": true
-    },
-    "machine_center_is_zero": {
-      "default_value": false
-    },
-    "machine_gcode_flavor": {
-      "default_value": "RepRap (RepRap)"
-    },
-    "fill_outline_gaps": {
-      "value": true
-    },
-    "retraction_speed": {
             "default_value": 85,
             "maximum_value_warning": 130
         },
-    "retraction_amount": {
+        "skin_overlap": { "value": 10.0 },
-      "default_value": 5.5
+        "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" },
-    },
+        "speed_print":
-    "retraction_hop_enabled": {
+        {
-      "value": true
+            "maximum_value": 250,
-    },
-    "retraction_hop": {
-      "value": 0.4
-    },
-    "retraction_combing": {
-      "value": "'infill'"
-    },
-    "retraction_combing_max_distance": {
-      "value": 10
-    },
-    "machine_start_gcode": {
-      "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG92 E0 ;zero the extruded length\nM104 S170 T0; start preheat hotend_0\nM140 S{material_bed_temperature_layer_0} ; start preheating the bed\nM190 S{material_bed_temperature_layer_0} ; heat to Cura Bed setting\nG28\nG12 P1 S2 T3\nG34\nG29\nG1 X0 Y0 Z1 F9000\nM109 S{material_print_temperature_layer_0} T0\nG1 X100 Y0 Z{layer_height_0} E30 F500 ;intro line\nG92 E0 ;zero the extruded length again\nM117 Printing...\n"
-    },
-    "machine_end_gcode": {
-      "default_value": "G91 ;relative positioning\nG1 Z5 F500; move nozzle relative to position\nG90 ;absolute positioning\nG1 X0 Y{machine_depth}\nG12 P1 T3\nM104 S0\nM140 S0\nG92 E0\nM84\nM109 S50\nM81\n"
-    },
-    "top_bottom_pattern": {
-      "value": "'zigzag'"
-    },
-    "speed_layer_0": {
-      "value": "math.ceil(speed_print * 0.25)"
-    },
-    "adhesion_type": {
-      "value": "'none'"
-    },
-    "speed_travel": {
-      "value": 120,
-      "maximum_value_warning": 251,
-      "maximum_value": 300
-    },
-    "infill_pattern": {
-      "value": "'tetrahedral'"
-    },
-    "bridge_settings_enabled": {
-      "default_value": true
-    },
-    "layer_height_0": {
-      "resolve": "max(0.2, min(extruderValues('layer_height')))"
-    },
-    "line_width": {
-      "value": "machine_nozzle_size"
-    },
-    "wall_line_width": {
-      "value": "machine_nozzle_size"
-    },
-    "infill_before_walls": {
-      "value": true
-    },
-    "zig_zaggify_infill": {
-      "value": true
-    },
-    "acceleration_enabled": {
-      "value": false
-    },
-    "jerk_enabled": {
-      "value": false
-    },
-    "bridge_wall_coast": {
-      "default_value": 10
-    },
-    "bridge_fan_speed": {
-      "default_value": 100
-    },
-    "bridge_fan_speed_2": {
-      "resolve": "max(cool_fan_speed, 50)"
-    },
-    "bridge_fan_speed_3": {
-      "resolve": "max(cool_fan_speed, 20)"
-    },
-    "cool_min_layer_time_fan_speed_max": {
-      "default_value": 20
-    },
-    "cool_min_layer_time": {
-      "value": 15
-    },
-    "cool_fan_speed_min": {
-      "value": "cool_fan_speed"
-    },
-    "cool_fan_full_at_height": {
-      "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)"
-    },
-    "cool_fan_full_layer": {
-      "value": 4
-    },
-    "wall_line_count": {
-      "value": 3
-    },
-    "bottom_layers": {
-      "value": 3
-    },
-    "top_layers": {
-      "value": 3
-    },
-    "travel_retract_before_outer_wall": {
-      "value": false
-    },
-    "z_seam_type": {
-      "value": "'shortest'"
-    },
-    "brim_width": {
-      "default_value": 5
-    },
-    "infill_randomize_start_location": {
-      "default_value": true
-    },
-    "skin_overlap": {
-      "value": 10.0
-    },
-    "speed_travel_layer_0": {
-      "value": "math.ceil(speed_travel * 0.4)"
-    },
-    "speed_print": {
-      "value": 100,
             "maximum_value_warning": 151,
-      "maximum_value": 250
+            "value": 100
         },
-    "retraction_count_max": {
+        "speed_roofing": { "value": "math.ceil(speed_print * 0.33)" },
-      "value": 20
+        "speed_slowdown_layers": { "default_value": 1 },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 0.33)" },
+        "speed_travel":
+        {
+            "maximum_value": 300,
+            "maximum_value_warning": 251,
+            "value": 120
         },
-    "speed_wall": {
+        "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" },
-      "value": "math.ceil(speed_print * 0.33)"
+        "speed_wall": { "value": "math.ceil(speed_print * 0.33)" },
-    },
+        "speed_wall_0": { "value": "math.ceil(speed_print * 0.33)" },
-    "speed_wall_0": {
+        "speed_wall_x": { "value": "math.ceil(speed_print * 0.66)" },
-      "value": "math.ceil(speed_print * 0.33)"
+        "top_bottom_pattern": { "value": "'zigzag'" },
-    },
+        "top_layers": { "value": 3 },
-    "speed_wall_x": {
+        "travel_retract_before_outer_wall": { "value": false },
-      "value": "math.ceil(speed_print * 0.66)"
+        "wall_line_count": { "value": 3 },
-    },
+        "wall_line_width": { "value": "machine_nozzle_size" },
-    "speed_topbottom": {
+        "z_seam_type": { "value": "'shortest'" },
-      "value": "math.ceil(speed_print * 0.33)"
+        "zig_zaggify_infill": { "value": true }
-    },
-    "speed_roofing": {
-      "value": "math.ceil(speed_print * 0.33)"
-    },
-    "retraction_retract_speed": {
-      "maximum_value_warning": 130
-    },
-    "retraction_prime_speed": {
-      "value": "math.ceil(retraction_speed * 0.4)",
-      "maximum_value_warning": 130
-    },
-    "retraction_extrusion_window": {
-      "value": "retraction_amount"
-    },
-    "infill_overlap": {
-      "value": "10 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0",
-      "maximum_value_warning": 100,
-      "minimum_value_warning": -50
-    }
     }
 }

resources/definitions/bq_hephestos.def.json

@@ -1,64 +1,38 @@
 {
-    "name": "BQ Prusa i3 Hephestos",
     "version": 2,
+    "name": "BQ Prusa i3 Hephestos",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "BQ",
         "manufacturer": "BQ",
         "file_formats": "text/x-gcode",
         "platform": "bq_hephestos_platform.3mf",
-        "platform_offset": [ 0, -82, 0],
+        "firmware_file": "MarlinHephestos2.hex",
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "bq_hephestos_extruder_0" },
+        "platform_offset": [
+            0,
+            -82,
+            0
+        ]
+    },
+    "overrides":
     {
-            "0": "bq_hephestos_extruder_0"
+        "layer_height": { "default_value": 0.2 },
-        },
+        "layer_height_0": { "default_value": 0.2 },
-        "firmware_file": "MarlinHephestos2.hex"
+        "machine_center_is_zero": { "default_value": false },
-    },
+        "machine_depth": { "default_value": 210 },
-
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG1 Z10                  ;move extruder up 10 mm\nG90                     ;set to absolute positioning\nG1 X0 Y180 F1200        ;expose the platform\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
-    "overrides": {
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 180 },
         "machine_name": { "default_value": "BQ Prusa i3 Hephestos" },
-        "machine_start_gcode": {
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --" },
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --"
+        "machine_width": { "default_value": 215 },
-        },
+        "speed_print": { "default_value": 40 },
-        "machine_end_gcode": {
+        "support_enable": { "default_value": true },
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG1 Z10                  ;move extruder up 10 mm\nG90                     ;set to absolute positioning\nG1 X0 Y180 F1200        ;expose the platform\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        "top_bottom_thickness": { "default_value": 1 },
-        },
+        "wall_thickness": { "value": "1" }
-        "machine_width": {
-            "default_value": 215
-        },
-        "machine_depth": {
-            "default_value": 210
-        },
-        "machine_height": {
-            "default_value": 180
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
     }
 }

resources/definitions/bq_hephestos_2.def.json

@@ -2,36 +2,38 @@
     "version": 2,
     "name": "BQ Hephestos 2",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "BQ",
         "manufacturer": "BQ",
-        "platform": "bq_hephestos_2_platform.3mf",
-        "platform_offset": [6, 1320, 0 ],
         "file_formats": "text/x-gcode",
-        "machine_extruder_trains":
+        "platform": "bq_hephestos_2_platform.3mf",
-        {
+        "machine_extruder_trains": { "0": "bq_hephestos_2_extruder_0" },
-            "0": "bq_hephestos_2_extruder_0"
+        "platform_offset": [
-        }
+            6,
+            1320,
+            0
+        ]
     },
-
+    "overrides":
-    "overrides": {
+    {
-        "machine_name": { "default_value": "BQ Hephestos 2" },
+        "infill_sparse_density": { "default_value": 20 },
-        "machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature}\nG28 ; Zero-ing position\nG29 ; Auto bed-leveling\nG0 X4 Y297 Z15 F4000 ; Fast move to BQ's start position\nG90 ; Set to Absolute Positioning\nG92 E0 ; Reset extruder 0\nG1 F1800 ; Set default feedrate\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" },
-        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801        ; Marlin G-CODE to fire end print procedure\n; -- end of END GCODE --" },
-        "machine_width": { "default_value": 210 },
-        "machine_depth": { "default_value": 297 },
-        "machine_height": { "default_value": 220 },
-        "machine_heated_bed": { "default_value": false },
-        "machine_center_is_zero": { "default_value": false },
         "layer_height": { "default_value": 0.2 },
         "layer_height_0": { "default_value": 0.2 },
-        "wall_thickness": { "value": "1.2" },
+        "machine_center_is_zero": { "default_value": false },
-        "top_bottom_thickness": { "default_value": 1.2 },
+        "machine_depth": { "default_value": 297 },
-        "infill_sparse_density": { "default_value": 20 },
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801        ; Marlin G-CODE to fire end print procedure\n; -- end of END GCODE --" },
-        "speed_print": { "default_value": 60 },
+        "machine_heated_bed": { "default_value": false },
-        "skirt_line_count": { "default_value": 4 },
+        "machine_height": { "default_value": 220 },
+        "machine_name": { "default_value": "BQ Hephestos 2" },
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature}\nG28 ; Zero-ing position\nG29 ; Auto bed-leveling\nG0 X4 Y297 Z15 F4000 ; Fast move to BQ's start position\nG90 ; Set to Absolute Positioning\nG92 E0 ; Reset extruder 0\nG1 F1800 ; Set default feedrate\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" },
+        "machine_width": { "default_value": 210 },
         "skirt_brim_minimal_length": { "default_value": 30 },
-        "skirt_gap": { "default_value": 6 }
+        "skirt_gap": { "default_value": 6 },
+        "skirt_line_count": { "default_value": 4 },
+        "speed_print": { "default_value": 60 },
+        "top_bottom_thickness": { "default_value": 1.2 },
+        "wall_thickness": { "value": "1.2" }
     }
 }

resources/definitions/bq_hephestos_xl.def.json

@@ -2,62 +2,36 @@
     "version": 2,
     "name": "BQ Prusa i3 Hephestos XL",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
-        "manufacturer": "BQ",
         "author": "BQ",
+        "manufacturer": "BQ",
         "file_formats": "text/x-gcode",
         "platform": "bq_hephestos_platform.3mf",
-        "platform_offset": [ 0, -82, 0],
+        "machine_extruder_trains": { "0": "bq_hephestos_xl_extruder_0" },
-        "machine_extruder_trains":
+        "platform_offset": [
+            0,
+            -82,
+            0
+        ]
+    },
+    "overrides":
     {
-            "0": "bq_hephestos_xl_extruder_0"
+        "layer_height": { "default_value": 0.2 },
-        }
+        "layer_height_0": { "default_value": 0.2 },
-    },
+        "machine_center_is_zero": { "default_value": false },
-
+        "machine_depth": { "default_value": 300 },
-    "overrides": {
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG1 Z10                  ;move extruder up 10 mm\nG90                     ;set to absolute positioning\nG1 X0 Y180 F1200        ;expose the platform\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 180 },
         "machine_name": { "default_value": "BQ Prusa i3 Hephestos XL" },
-        "machine_start_gcode": {
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --" },
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --"
+        "machine_width": { "default_value": 200 },
-        },
+        "speed_print": { "default_value": 40 },
-        "machine_end_gcode": {
+        "support_enable": { "default_value": true },
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG1 Z10                  ;move extruder up 10 mm\nG90                     ;set to absolute positioning\nG1 X0 Y180 F1200        ;expose the platform\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        "top_bottom_thickness": { "default_value": 1 },
-        },
+        "wall_thickness": { "value": "1" }
-        "machine_width": {
-            "default_value": 200
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 180
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
     }
 }

resources/definitions/bq_witbox.def.json

@@ -2,64 +2,37 @@
     "version": 2,
     "name": "BQ Witbox",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "BQ",
         "manufacturer": "BQ",
         "file_formats": "text/x-gcode",
         "platform": "bq_witbox_platform.3mf",
-        "platform_offset": [ 0, -145, -38],
+        "firmware_file": "MarlinWitbox.hex",
-        "machine_extruder_trains":
+        "machine_extruder_trains": { "0": "bq_witbox_extruder_0" },
+        "platform_offset": [
+            0,
+            -145,
+            -38
+        ]
+    },
+    "overrides":
     {
-            "0": "bq_witbox_extruder_0"
+        "layer_height": { "default_value": 0.2 },
-        },
+        "layer_height_0": { "default_value": 0.2 },
-        "firmware_file": "MarlinWitbox.hex"
+        "machine_center_is_zero": { "default_value": false },
-    },
+        "machine_depth": { "default_value": 210 },
-
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG90                     ;set to absolute positioning\nG1 Z200                 ;move the platform to the bottom\nG28 X0 Y0               ;move to the X/Y origin (Home)\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
-    "overrides": {
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 200 },
         "machine_name": { "default_value": "BQ Witbox" },
-        "machine_start_gcode": {
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --" },
-            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --"
+        "machine_width": { "default_value": 297 },
-        },
+        "speed_print": { "default_value": 40 },
-        "machine_end_gcode": {
+        "support_enable": { "default_value": true },
-            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nG91                     ;set to relative positioning\nG1 E-20 F300            ;retract the filament a bit to release some of the pressure\nG90                     ;set to absolute positioning\nG1 Z200                 ;move the platform to the bottom\nG28 X0 Y0               ;move to the X/Y origin (Home)\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        "top_bottom_thickness": { "default_value": 1 },
-        },
+        "wall_thickness": { "value": "1" }
-        "machine_width": {
-            "default_value": 297
-        },
-        "machine_depth": {
-            "default_value": 210
-        },
-        "machine_height": {
-            "default_value": 200
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
-        },
-        "speed_print": {
-            "default_value": 40
-        },
-        "support_enable": {
-            "default_value": true
-        }
-
     }
 }

resources/definitions/bq_witbox_2.def.json

@@ -2,74 +2,40 @@
     "version": 2,
     "name": "BQ Witbox 2",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "BQ",
         "manufacturer": "BQ",
         "file_formats": "text/x-gcode",
         "platform": "bq_witbox_platform.3mf",
-        "platform_offset": [0, -145, -38],
+        "machine_extruder_trains": { "0": "bq_witbox_2_extruder_0" },
-        "machine_extruder_trains":
+        "platform_offset": [
+            0,
+            -145,
+            -38
+        ]
+    },
+    "overrides":
     {
-            "0": "bq_witbox_2_extruder_0"
+        "infill_sparse_density": { "default_value": 20 },
-        }
+        "layer_height": { "default_value": 0.2 },
-    },
+        "layer_height_0": { "default_value": 0.2 },
-
+        "machine_center_is_zero": { "default_value": false },
-    "overrides": {
+        "machine_depth": { "default_value": 210 },
+        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801        ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 200 },
         "machine_name": { "default_value": "BQ Witbox 2" },
-        "machine_start_gcode": {
+        "machine_start_gcode": { "default_value": "; -- START GCODE --\nM800        ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --" },
-            "default_value": "; -- START GCODE --\nM800        ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --"
+        "machine_width": { "default_value": 297 },
-        },
+        "skirt_brim_minimal_length": { "default_value": 30 },
-        "machine_end_gcode": {
+        "skirt_gap": { "default_value": 6 },
-            "default_value": "; -- END GCODE --\nM801        ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --"
+        "skirt_line_count": { "default_value": 4 },
-        },
+        "speed_print": { "default_value": 60 },
-        "machine_width": {
+        "support_enable": { "default_value": false },
-            "default_value": 297
+        "top_bottom_thickness": { "default_value": 1.2 },
-        },
+        "wall_thickness": { "value": "1.2" }
-        "machine_depth": {
-            "default_value": 210
-        },
-        "machine_height": {
-            "default_value": 200
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap (Marlin/Sprinter)"
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "wall_thickness": {
-            "value": "1.2"
-        },
-        "top_bottom_thickness": {
-            "default_value": 1.2
-        },
-        "infill_sparse_density": {
-            "default_value": 20
-        },
-        "speed_print": {
-            "default_value": 60
-        },
-        "skirt_line_count": {
-            "default_value": 4
-        },
-        "skirt_brim_minimal_length": {
-            "default_value": 30
-        },
-        "skirt_gap": {
-            "default_value": 6
-        },
-        "support_enable": {
-            "default_value": false
-        }
     }
 }

resources/definitions/builder_premium_large.def.json

@@ -2,58 +2,30 @@
     "version": 2,
     "name": "Builder Premium Large",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Builder SZ",
         "manufacturer": "Builder",
-        "quality_definition": "builder_premium_small",
         "file_formats": "text/x-gcode",
         "platform": "builder_premium_platform.3mf",
-        "platform_offset": [-126, -36, 117],
         "has_machine_quality": true,
-        "preferred_quality_type": "normal",
         "machine_extruder_trains":
         {
             "0": "builder_premium_large_rear",
             "1": "builder_premium_large_front"
-        }
         },
-
+        "platform_offset": [
-    "overrides": {
+            -126,
-        "machine_name": { "default_value": "Builder Premium Large" },
+            -36,
-        "machine_heated_bed": { "default_value": true },
+            117
-        "machine_width": { "default_value": 215 },
+        ],
-        "machine_height": { "default_value": 600 },
+        "preferred_quality_type": "normal",
-        "machine_depth": { "default_value": 205 },
+        "quality_definition": "builder_premium_small"
-
+    },
-        "infill_pattern": {"value": "'triangles'" },
+    "overrides":
-        "infill_before_walls": {"value": false },
+    {
-
-        "default_material_print_temperature": { "value": "215" },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
-        "material_standby_temperature": { "value": "material_print_temperature" },
-
-        "switch_extruder_retraction_speeds": {"default_value": 15 },
-        "switch_extruder_retraction_amount": {"value": 1 },
         "acceleration_enabled": { "value": true },
-        "speed_travel": { "value": "100" },
-        "speed_layer_0": { "value": "20" },
-        "speed_prime_tower": { "value": "speed_topbottom" },
-        "speed_print": { "value": "40" },
-        "speed_support": { "value": "speed_wall_0" },
-        "speed_support_interface": { "value": "speed_topbottom" },
-        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
-        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
-        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
-        "speed_wall_x": { "value": "speed_wall" },
-
-        "prime_tower_position_x": { "value": "175" },
-        "prime_tower_position_y": { "value": "178" },
-        "prime_tower_wipe_enabled": { "default_value": false },
-        "prime_tower_min_volume": { "default_value": 50 },
-
-        "prime_blob_enable": { "enabled": true },
-
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },
@@ -63,10 +35,13 @@
         "acceleration_travel": { "value": "acceleration_print" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
-
+        "adhesion_type": { "default_value": "skirt" },
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
         "cool_min_layer_time": { "default_value": 10 },
-
+        "default_material_print_temperature": { "value": "215" },
+        "gantry_height": { "value": "55" },
+        "infill_before_walls": { "value": false },
+        "infill_pattern": { "value": "'triangles'" },
         "jerk_enabled": { "value": "True" },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
@@ -76,31 +51,55 @@
         "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
         "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
         "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
-
+        "machine_acceleration": { "default_value": 1000 },
-        "wall_thickness": { "value": "1.2" },
+        "machine_depth": { "default_value": 205 },
-
+        "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" },
-        "retraction_amount": { "default_value": 3 },
+        "machine_extruder_count": { "default_value": 2 },
-        "retraction_speed": { "default_value": 15 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "travel_retract_before_outer_wall": { "default_value": true },
+        "machine_head_with_fans_polygon":
-        "skin_overlap": { "value": "15" },
+        {
-        "adhesion_type": { "default_value": "skirt" },
+            "default_value": [
-        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+                [-75, -18],
-        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+                [-75, 35],
-        "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
+                [18, 35],
-        "gantry_height": { "value": "55" },
+                [18, -18]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 600 },
+        "machine_max_acceleration_z": { "default_value": 500 },
         "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },
         "machine_max_feedrate_z": { "default_value": 40 },
-        "machine_max_acceleration_z": { "default_value": 500 },
-        "machine_acceleration": { "default_value": 1000 },
         "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_name": { "default_value": "Builder Premium Large" },
-        "machine_start_gcode": {
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
-            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..."
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
-        },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." },
-        "machine_end_gcode": {
+        "machine_width": { "default_value": 215 },
-            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
-        },
+        "material_standby_temperature": { "value": "material_print_temperature" },
-        "machine_extruder_count": { "default_value": 2 }
+        "prime_blob_enable": { "enabled": true },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "prime_tower_position_x": { "value": "175" },
+        "prime_tower_position_y": { "value": "178" },
+        "prime_tower_wipe_enabled": { "default_value": false },
+        "retraction_amount": { "default_value": 3 },
+        "retraction_speed": { "default_value": 15 },
+        "skin_overlap": { "value": "15" },
+        "speed_layer_0": { "value": "20" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": "40" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
+        "speed_travel": { "value": "100" },
+        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
+        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "switch_extruder_retraction_amount": { "value": 1 },
+        "switch_extruder_retraction_speeds": { "default_value": 15 },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "wall_thickness": { "value": "1.2" }
     }
 }

resources/definitions/builder_premium_medium.def.json

@@ -2,58 +2,30 @@
     "version": 2,
     "name": "Builder Premium Medium",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Builder SZ",
         "manufacturer": "Builder",
-        "quality_definition": "builder_premium_small",
         "file_formats": "text/x-gcode",
         "platform": "builder_premium_platform.3mf",
-        "platform_offset": [-126, -36, 117],
         "has_machine_quality": true,
-        "preferred_quality_type": "normal",
         "machine_extruder_trains":
         {
             "0": "builder_premium_medium_rear",
             "1": "builder_premium_medium_front"
-        }
         },
-
+        "platform_offset": [
-    "overrides": {
+            -126,
-        "machine_name": { "default_value": "Builder Premium Medium" },
+            -36,
-        "machine_heated_bed": { "default_value": true },
+            117
-        "machine_width": { "default_value": 215 },
+        ],
-        "machine_height": { "default_value": 400 },
+        "preferred_quality_type": "normal",
-        "machine_depth": { "default_value": 205 },
+        "quality_definition": "builder_premium_small"
-
+    },
-        "infill_pattern": {"value": "'triangles'" },
+    "overrides":
-        "infill_before_walls": {"value": false },
+    {
         "acceleration_enabled": { "value": true },
-        "default_material_print_temperature": { "value": "215" },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
-        "material_standby_temperature": { "value": "material_print_temperature" },
-
-        "switch_extruder_retraction_speeds": {"default_value": 15 },
-        "switch_extruder_retraction_amount": {"value": 1 },
-
-        "speed_travel": { "value": "100" },
-        "speed_layer_0": { "value": "20" },
-        "speed_prime_tower": { "value": "speed_topbottom" },
-        "speed_print": { "value": "40" },
-        "speed_support": { "value": "speed_wall_0" },
-        "speed_support_interface": { "value": "speed_topbottom" },
-        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
-        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
-        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
-        "speed_wall_x": { "value": "speed_wall" },
-
-        "prime_tower_position_x": { "value": "175" },
-        "prime_tower_position_y": { "value": "178" },
-        "prime_tower_wipe_enabled": { "default_value": false },
-        "prime_tower_min_volume": { "default_value": 50 },
-
-        "prime_blob_enable": { "enabled": true },
-
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },
@@ -63,10 +35,13 @@
         "acceleration_travel": { "value": "acceleration_print" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
-
+        "adhesion_type": { "default_value": "skirt" },
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
         "cool_min_layer_time": { "default_value": 10 },
-
+        "default_material_print_temperature": { "value": "215" },
+        "gantry_height": { "value": "55" },
+        "infill_before_walls": { "value": false },
+        "infill_pattern": { "value": "'triangles'" },
         "jerk_enabled": { "value": "True" },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
@@ -76,31 +51,55 @@
         "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
         "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
         "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
-
+        "machine_acceleration": { "default_value": 1000 },
-        "wall_thickness": { "value": "1.2" },
+        "machine_depth": { "default_value": 205 },
-
+        "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" },
-        "retraction_amount": { "default_value": 3 },
+        "machine_extruder_count": { "default_value": 2 },
-        "retraction_speed": { "default_value": 15 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "travel_retract_before_outer_wall": { "default_value": true },
+        "machine_head_with_fans_polygon":
-        "skin_overlap": { "value": "15" },
+        {
-        "adhesion_type": { "default_value": "skirt" },
+            "default_value": [
-        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+                [-75, -18],
-        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+                [-75, 35],
-        "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
+                [18, 35],
-        "gantry_height": { "value": "55" },
+                [18, -18]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 400 },
+        "machine_max_acceleration_z": { "default_value": 500 },
         "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },
         "machine_max_feedrate_z": { "default_value": 40 },
-        "machine_max_acceleration_z": { "default_value": 500 },
-        "machine_acceleration": { "default_value": 1000 },
         "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_name": { "default_value": "Builder Premium Medium" },
-        "machine_start_gcode": {
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
-            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..."
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
-        },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." },
-        "machine_end_gcode": {
+        "machine_width": { "default_value": 215 },
-            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
-        },
+        "material_standby_temperature": { "value": "material_print_temperature" },
-        "machine_extruder_count": { "default_value": 2 }
+        "prime_blob_enable": { "enabled": true },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "prime_tower_position_x": { "value": "175" },
+        "prime_tower_position_y": { "value": "178" },
+        "prime_tower_wipe_enabled": { "default_value": false },
+        "retraction_amount": { "default_value": 3 },
+        "retraction_speed": { "default_value": 15 },
+        "skin_overlap": { "value": "15" },
+        "speed_layer_0": { "value": "20" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": "40" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
+        "speed_travel": { "value": "100" },
+        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
+        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "switch_extruder_retraction_amount": { "value": 1 },
+        "switch_extruder_retraction_speeds": { "default_value": 15 },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "wall_thickness": { "value": "1.2" }
     }
 }

resources/definitions/builder_premium_small.def.json

@@ -2,57 +2,29 @@
     "version": 2,
     "name": "Builder Premium Small",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Builder SZ",
         "manufacturer": "Builder",
         "file_formats": "text/x-gcode",
         "platform": "builder_premium_platform.3mf",
-        "platform_offset": [-126, -36, 117],
         "has_machine_quality": true,
-        "preferred_quality_type": "normal",
         "machine_extruder_trains":
         {
             "0": "builder_premium_small_rear",
             "1": "builder_premium_small_front"
-        }
         },
-
+        "platform_offset": [
-    "overrides": {
+            -126,
-        "machine_name": { "default_value": "Builder Premium Small" },
+            -36,
-        "machine_heated_bed": { "default_value": true },
+            117
-        "machine_width": { "default_value": 215 },
+        ],
-        "machine_height": { "default_value": 200 },
+        "preferred_quality_type": "normal"
-        "machine_depth": { "default_value": 205 },
+    },
-
+    "overrides":
-        "infill_pattern": {"value": "'triangles'" },
+    {
-        "infill_before_walls": {"value": false },
-
-        "default_material_print_temperature": { "value": "215" },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
-        "material_standby_temperature": { "value": "material_print_temperature" },
-
-        "switch_extruder_retraction_speeds": {"default_value": 15 },
-        "switch_extruder_retraction_amount": {"value": 1 },
         "acceleration_enabled": { "value": true },
-        "speed_travel": { "value": "100" },
-        "speed_layer_0": { "value": "20" },
-        "speed_prime_tower": { "value": "speed_topbottom" },
-        "speed_print": { "value": "40" },
-        "speed_support": { "value": "speed_wall_0" },
-        "speed_support_interface": { "value": "speed_topbottom" },
-        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
-        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
-        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
-        "speed_wall_x": { "value": "speed_wall" },
-
-        "prime_tower_position_x": { "value": "175" },
-        "prime_tower_position_y": { "value": "178" },
-        "prime_tower_wipe_enabled": { "default_value": false },
-        "prime_tower_min_volume": { "default_value": 50 },
-
-        "prime_blob_enable": { "enabled": true },
-
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },
@@ -62,10 +34,13 @@
         "acceleration_travel": { "value": "acceleration_print" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
-
+        "adhesion_type": { "default_value": "skirt" },
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
         "cool_min_layer_time": { "default_value": 10 },
-
+        "default_material_print_temperature": { "value": "215" },
+        "gantry_height": { "value": "55" },
+        "infill_before_walls": { "value": false },
+        "infill_pattern": { "value": "'triangles'" },
         "jerk_enabled": { "value": "True" },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
@@ -75,31 +50,55 @@
         "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
         "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
         "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
-
+        "machine_acceleration": { "default_value": 1000 },
-        "wall_thickness": { "value": "1.2" },
+        "machine_depth": { "default_value": 205 },
-
+        "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" },
-        "retraction_amount": { "default_value": 3 },
+        "machine_extruder_count": { "default_value": 2 },
-        "retraction_speed": { "default_value": 15 },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "travel_retract_before_outer_wall": { "default_value": true },
+        "machine_head_with_fans_polygon":
-        "skin_overlap": { "value": "15" },
+        {
-        "adhesion_type": { "default_value": "skirt" },
+            "default_value": [
-        "machine_nozzle_heat_up_speed": { "default_value": 2 },
+                [-75, -18],
-        "machine_nozzle_cool_down_speed": { "default_value": 2 },
+                [-75, 35],
-        "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
+                [18, 35],
-        "gantry_height": { "value": "55" },
+                [18, -18]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 200 },
+        "machine_max_acceleration_z": { "default_value": 500 },
         "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },
         "machine_max_feedrate_z": { "default_value": 40 },
-        "machine_max_acceleration_z": { "default_value": 500 },
-        "machine_acceleration": { "default_value": 1000 },
         "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_name": { "default_value": "Builder Premium Small" },
-        "machine_start_gcode": {
+        "machine_nozzle_cool_down_speed": { "default_value": 2 },
-            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..."
+        "machine_nozzle_heat_up_speed": { "default_value": 2 },
-        },
+        "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." },
-        "machine_end_gcode": {
+        "machine_width": { "default_value": 215 },
-            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
-        },
+        "material_standby_temperature": { "value": "material_print_temperature" },
-        "machine_extruder_count": { "default_value": 2 }
+        "prime_blob_enable": { "enabled": true },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "prime_tower_position_x": { "value": "175" },
+        "prime_tower_position_y": { "value": "178" },
+        "prime_tower_wipe_enabled": { "default_value": false },
+        "retraction_amount": { "default_value": 3 },
+        "retraction_speed": { "default_value": 15 },
+        "skin_overlap": { "value": "15" },
+        "speed_layer_0": { "value": "20" },
+        "speed_prime_tower": { "value": "speed_topbottom" },
+        "speed_print": { "value": "40" },
+        "speed_support": { "value": "speed_wall_0" },
+        "speed_support_interface": { "value": "speed_topbottom" },
+        "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
+        "speed_travel": { "value": "100" },
+        "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" },
+        "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "switch_extruder_retraction_amount": { "value": 1 },
+        "switch_extruder_retraction_speeds": { "default_value": 15 },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "wall_thickness": { "value": "1.2" }
     }
 }