Applied printer-linter format

To make sure we have uniform diffs with our PR's

resources/definitions/101Hero.def.json

@@ -1,52 +1,46 @@
 {
-    "version": 2, 
+    "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":
-        {
-            "0": "101Hero_extruder_0"
-        }
+        "supports_usb_connection": true
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "101Hero" },
-        "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 },
+    "overrides":
+    {
+        "gantry_height": { "value": "0" },
         "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 },
-        "speed_travel": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print * 0.7" },
-        "speed_topbottom": { "value": "speed_print * 0.7" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 99.822 },
+        "machine_name": { "default_value": "101Hero" },
+        "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" },
-        "retraction_speed": { "default_value" : 10 },
-        "retraction_amount": { "default_value" : 2.5 },
-        "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 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"
-        }
+        "speed_print": { "default_value": 14 },
+        "speed_topbottom": { "value": "speed_print * 0.7" },
+        "speed_travel": { "value": "speed_print" },
+        "speed_wall": { "value": "speed_print * 0.7" }
     }
-}
+}

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":
-        {
-            "0": "3dator_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "3dator_extruder_0" },
+        "supports_usb_connection": true
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "3Dator" },
-        "prime_tower_size": { "default_value": 8.660254037844387 },
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "none" },
+        "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 },
-        "retraction_speed": {"default_value":100},
-        "adhesion_type": { "default_value": "none" },
-        "machine_head_with_fans_polygon": {
+        "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" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_head_with_fans_polygon":
+        {
             "default_value": [
                 [-15, -25],
                 [-15, 35],
@@ -37,13 +31,13 @@
                 [40, -25]
             ]
         },
-        "gantry_height": {
-            "value": "30"
-        },
-        "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"      },
-        "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"
-        }
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 260 },
+        "machine_name": { "default_value": "3Dator" },
+        "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" },
+        "machine_width": { "default_value": 180 },
+        "prime_tower_size": { "default_value": 8.660254037844387 },
+        "retraction_speed": { "default_value": 100 },
+        "speed_print": { "default_value": 50 }
     }
-}
+}

resources/definitions/3di_base.def.json

@@ -1,49 +1,26 @@
-{
-    "version": 2,
-    "name": "3DI Base Printer",
-    "inherits": "fdmprinter",
-    "metadata": {
-        "visible": false,
-        "author": "Vaibhav Jain",
-        "manufacturer": "3Deometry Innovations",
-        "file_formats": "text/x-gcode",
-        "machine_extruder_trains":
-        {
-            "0": "3di_base_extruder_0"
-        }
-    },
-
-    "overrides": {
-		"machine_name":{
-			"default_value": "3DI Base Printer"
-		},
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "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"
-        }
-    }
-}
-
+{
+    "version": 2,
+    "name": "3DI Base Printer",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": false,
+        "author": "Vaibhav Jain",
+        "manufacturer": "3Deometry Innovations",
+        "file_formats": "text/x-gcode",
+        "machine_extruder_trains": { "0": "3di_base_extruder_0" }
+    },
+    "overrides":
+    {
+        "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)" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 220 },
+        "machine_name": { "default_value": "3DI Base Printer" },
+        "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 ;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_width": { "default_value": 220 }
+    }
+}

resources/definitions/3di_d300.def.json

@@ -1,26 +1,22 @@
-{
-    "version": 2,
-    "name": "3DI D300",
-    "inherits": "3di_base",
-    "metadata": {
-        "visible": true,
-        "platform": "3di_d300_platform.STL",
-        "platform_offset": [-200, -5, 173.205]
-    },
-
-    "overrides": {
-		"machine_name": { 
-		    "default_value": "3DI D300" 
-			},
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        }
-    }
-}
-
+{
+    "version": 2,
+    "name": "3DI D300",
+    "inherits": "3di_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "3di_d300_platform.STL",
+        "platform_offset": [
+            -200,
+            -5,
+            173.205
+        ]
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 300 },
+        "machine_name": { "default_value": "3DI D300" },
+        "machine_width": { "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": { "0": "3dtech_semi_professional_extruder_0" },
+        "platform_offset": [
+            0,
+            -2.5,
+            0
+        ]
     },
-    "overrides": {
+    "overrides":
+    {
+        "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" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_height": { "default_value": 300 },
         "machine_name": { "default_value": "3DTECH SP Control" },
-        "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"
-        }
+        "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_width": { "default_value": 250 }
     }
-}
+}

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": { "0": "I3MetalMotion_extruder_0" },
+        "preferred_material": "emotiontech_pla"
     },
-
-    "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 },
+    "overrides":
+    {
         "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": {
-            "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_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_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 200 },
+        "machine_name": { "default_value": "I3MetalMotion" },
+        "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" },
+        "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": {
-        "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
-        },
-        "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"
-        },
+    "overrides":
+    {
+        "acceleration_enabled": { "default_value": true },
         "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": 0.0,
+            "enabled": false
+        },
+        "extruder_prime_pos_y":
         {
-            "default_value": true
+            "default_value": 0.0,
+            "enabled": false
         },
-        "jerk_travel":
+        "extruder_prime_pos_z":
         {
-            "value": "jerk_print if magic_spiralize else 20"
+            "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)" },
-        "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_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x":
         {
             "default_value": 105.0,
@@ -185,19 +75,93 @@
             "default_value": 27.0,
             "enabled": false
         },
-        "prime_tower_position_x": {
-            "value": "185"
-        },
-        "prime_tower_position_y": {
-            "value": "160"
+        "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
+        "machine_acceleration": { "default_value": 3000 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 223 },
+        "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, -87.5],
+                    [115, -87.5],
+                    [115, -112.5]
+                ],
+                [
+                    [-115, 72.5],
+                    [-97, 72.5],
+                    [-97, -112.5],
+                    [-115, -112.5]
+                ]
+            ]
         },
-        "machine_disallowed_areas": {
+        "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": [
-                [[-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, -87.5], [ 115, -87.5], [ 115, -112.5]],
-                [[-115, 72.5], [-97, 72.5], [-97, -112.5], [-115, -112.5]]
+                [-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/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":
-        {
-            "0": "abax_pri3_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "abax_pri3_extruder_0" }
     },
-    "overrides": {
-        "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_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 --"
-        },
-        "machine_width": {
-            "default_value": 225
-        },
-        "machine_depth": {
-            "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
-        }
+    "overrides":
+    {
+        "layer_height": { "default_value": 0.2 },
+        "layer_height_0": { "default_value": 0.2 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 220 },
+        "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 --" },
+        "machine_gcode_flavor": { "default_value": "RepRap" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 200 },
+        "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 },
+        "speed_print": { "default_value": 40 },
+        "support_enable": { "default_value": true },
+        "top_bottom_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" }
     }
-}
+}

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":
-        {
-            "0": "abax_pri5_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "abax_pri5_extruder_0" }
     },
-    "overrides": {
-        "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_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 --"
-        },
-        "machine_width": {
-            "default_value": 310
-        },
-        "machine_depth": {
-            "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
-        }
+    "overrides":
+    {
+        "layer_height": { "default_value": 0.2 },
+        "layer_height_0": { "default_value": 0.2 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 310 },
+        "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 --" },
+        "machine_gcode_flavor": { "default_value": "RepRap" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 300 },
+        "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 },
+        "speed_print": { "default_value": 40 },
+        "support_enable": { "default_value": true },
+        "top_bottom_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" }
     }
-}
+}

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":
-        {
-            "0": "abax_titan_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "abax_titan_extruder_0" }
     },
-    "overrides": {
-        "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_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 --"
-        },
-        "machine_width": {
-            "default_value": 310
-        },
-        "machine_depth": {
-            "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
-        }
+    "overrides":
+    {
+        "layer_height": { "default_value": 0.2 },
+        "layer_height_0": { "default_value": 0.2 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 310 },
+        "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 --" },
+        "machine_gcode_flavor": { "default_value": "RepRap" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 300 },
+        "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 },
+        "speed_print": { "default_value": 40 },
+        "support_enable": { "default_value": true },
+        "top_bottom_thickness": { "default_value": 1 },
+        "wall_thickness": { "value": "1" }
     }
-}
+}