Applied printer-linter format

resources/definitions/geeetech_A10.def.json

@@ -2,58 +2,48 @@
     "version": 2,
     "name": "Geeetech A10",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Amit L",
         "manufacturer": "Geeetech",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "machine_extruder_trains":
-        {
-            "0": "geeetech_A10_1"
-        }
-
+        "machine_extruder_trains": { "0": "geeetech_A10_1" }
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Geeetech A10" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 260
-        },
-        "machine_depth": {
-            "default_value": 220
-        },        
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "layer_height": { "default_value": 0.1 },
-        "layer_height_0": { "default_value": 0.15 },
-        "retraction_amount": { "default_value": 0.8 },
-        "retraction_speed": { "default_value": 35 },
+    "overrides":
+    {
         "adhesion_type": { "default_value": "skirt" },
-        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
         "gantry_height": { "value": "28" },
-        "machine_max_feedrate_z": { "default_value": 12 },
-        "machine_max_feedrate_e": { "default_value": 120 },
-        "machine_max_acceleration_z": { "default_value": 500 },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.15 },
         "machine_acceleration": { "default_value": 1000 },
-        "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_max_jerk_z": { "default_value": 0.2 },
-        "machine_max_jerk_e": { "default_value": 2.5 },
-        "machine_heated_bed": { "default_value": true },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" },
+        "machine_extruder_count": { "default_value": 1 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": {
-            "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home"
-        },
-        "machine_end_gcode": {
-            "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers"
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-31, 31],
+                [34, 31],
+                [34, -40],
+                [-31, -40]
+            ]
         },
-        "machine_extruder_count": {
-            "default_value": 1
-        }
-
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 260 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 12 },
+        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.2 },
+        "machine_name": { "default_value": "Geeetech A10" },
+        "machine_start_gcode": { "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" },
+        "machine_width": { "default_value": 220 },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_speed": { "default_value": 35 }
     }
-}
+}

resources/definitions/geeetech_A10M.def.json

@@ -2,7 +2,8 @@
     "version": 2,
     "name": "Geeetech A10M",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Amit L",
         "manufacturer": "Geeetech",
@@ -13,46 +14,39 @@
             "0": "geeetech_A10M_1",
             "1": "geeetech_A10M_2"
         }
-
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Geeetech A10M" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 260
-        },
-        "machine_depth": {
-            "default_value": 220
-        },        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "layer_height": { "default_value": 0.1 },
-        "layer_height_0": { "default_value": 0.15 },
-        "retraction_amount": { "default_value": 0.8 },
-        "retraction_speed": { "default_value": 35 },
+    "overrides":
+    {
         "adhesion_type": { "default_value": "skirt" },
-        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
         "gantry_height": { "value": "28" },
-        "machine_max_feedrate_z": { "default_value": 12 },
-        "machine_max_feedrate_e": { "default_value": 120 },
-        "machine_max_acceleration_z": { "default_value": 500 },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.15 },
         "machine_acceleration": { "default_value": 1000 },
-        "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_max_jerk_z": { "default_value": 0.2 },
-        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" },
+        "machine_extruder_count": { "default_value": 2 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": {
-            "default_value": ";GeeeTech A10M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script"
-        },
-        "machine_end_gcode": {
-            "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84"
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-31, 31],
+                [34, 31],
+                [34, -40],
+                [-31, -40]
+            ]
         },
-        "machine_extruder_count": {
-            "default_value": 2
-        }
-
+        "machine_height": { "default_value": 260 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 12 },
+        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.2 },
+        "machine_name": { "default_value": "Geeetech A10M" },
+        "machine_start_gcode": { "default_value": ";GeeeTech A10M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script" },
+        "machine_width": { "default_value": 220 },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_speed": { "default_value": 35 }
     }
-}
+}

resources/definitions/geeetech_A10T.def.json

@@ -2,7 +2,8 @@
     "version": 2,
     "name": "Geeetech A10T",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Amit L",
         "manufacturer": "Geeetech",
@@ -14,47 +15,39 @@
             "1": "geeetech_A10T_2",
             "2": "geeetech_A10T_3"
         }
-
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Geeetech A10T" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 260
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "layer_height": { "default_value": 0.1 },
-        "layer_height_0": { "default_value": 0.15 },
-        "retraction_amount": { "default_value": 0.8 },
-        "retraction_speed": { "default_value": 35 },
+    "overrides":
+    {
         "adhesion_type": { "default_value": "skirt" },
-        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
         "gantry_height": { "value": "28" },
-        "machine_max_feedrate_z": { "default_value": 12 },
-        "machine_max_feedrate_e": { "default_value": 120 },
-        "machine_max_acceleration_z": { "default_value": 500 },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.15 },
         "machine_acceleration": { "default_value": 1000 },
-        "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_max_jerk_z": { "default_value": 0.2 },
-        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 260 },
+        "machine_end_gcode": { "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" },
+        "machine_extruder_count": { "default_value": 3 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": {
-            "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X180 E40\nG1 F1200 Z2\nG92 E0\nG28"
-        },
-        "machine_end_gcode": {
-            "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84"
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-31, 31],
+                [34, 31],
+                [34, -40],
+                [-31, -40]
+            ]
         },
-        "machine_extruder_count": {
-            "default_value": 3
-        }
-
+        "machine_height": { "default_value": 220 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 12 },
+        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.2 },
+        "machine_name": { "default_value": "Geeetech A10T" },
+        "machine_start_gcode": { "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X180 E40\nG1 F1200 Z2\nG92 E0\nG28" },
+        "machine_width": { "default_value": 220 },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_speed": { "default_value": 35 }
     }
-}
+}

resources/definitions/geeetech_A20.def.json

@@ -2,56 +2,47 @@
     "version": 2,
     "name": "Geeetech A20",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Amit L",
         "manufacturer": "Geeetech",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "machine_extruder_trains":
-        {
-            "0": "geeetech_A20_1"
-        }
-
+        "machine_extruder_trains": { "0": "geeetech_A20_1" }
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Geeetech A20" },
-        "machine_width": {
-            "default_value": 250
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_depth": {
-            "default_value": 250
-        },        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "layer_height": { "default_value": 0.1 },
-        "layer_height_0": { "default_value": 0.15 },
-        "retraction_amount": { "default_value": 0.8 },
-        "retraction_speed": { "default_value": 35 },
+    "overrides":
+    {
         "adhesion_type": { "default_value": "skirt" },
-        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
         "gantry_height": { "value": "28" },
-        "machine_max_feedrate_z": { "default_value": 12 },
-        "machine_max_feedrate_e": { "default_value": 120 },
-        "machine_max_acceleration_z": { "default_value": 500 },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.15 },
         "machine_acceleration": { "default_value": 1000 },
-        "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_max_jerk_z": { "default_value": 0.2 },
-        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 250 },
+        "machine_end_gcode": { "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" },
+        "machine_extruder_count": { "default_value": 1 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": {
-            "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28"
-        },
-        "machine_end_gcode": {
-            "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84"
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-31, 31],
+                [34, 31],
+                [34, -40],
+                [-31, -40]
+            ]
         },
-        "machine_extruder_count": {
-            "default_value": 1
-        }
-
+        "machine_height": { "default_value": 250 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 12 },
+        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.2 },
+        "machine_name": { "default_value": "Geeetech A20" },
+        "machine_start_gcode": { "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28" },
+        "machine_width": { "default_value": 250 },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_speed": { "default_value": 35 }
     }
-}
+}

resources/definitions/geeetech_A20M.def.json

@@ -2,7 +2,8 @@
     "version": 2,
     "name": "Geeetech A20M",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Amit L",
         "manufacturer": "Geeetech",
@@ -13,46 +14,39 @@
             "0": "geeetech_A20M_1",
             "1": "geeetech_A20M_2"
         }
-
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Geeetech A20M" },
-        "machine_width": {
-            "default_value": 250
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_depth": {
-            "default_value": 250
-        },        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "layer_height": { "default_value": 0.1 },
-        "layer_height_0": { "default_value": 0.15 },
-        "retraction_amount": { "default_value": 0.8 },
-        "retraction_speed": { "default_value": 35 },
+    "overrides":
+    {
         "adhesion_type": { "default_value": "skirt" },
-        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
         "gantry_height": { "value": "28" },
-        "machine_max_feedrate_z": { "default_value": 12 },
-        "machine_max_feedrate_e": { "default_value": 120 },
-        "machine_max_acceleration_z": { "default_value": 500 },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.15 },
         "machine_acceleration": { "default_value": 1000 },
-        "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_max_jerk_z": { "default_value": 0.2 },
-        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 250 },
+        "machine_end_gcode": { "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" },
+        "machine_extruder_count": { "default_value": 2 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": {
-            "default_value": ";GeeeTech A20M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script"
-        },
-        "machine_end_gcode": {
-            "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84"
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-31, 31],
+                [34, 31],
+                [34, -40],
+                [-31, -40]
+            ]
         },
-        "machine_extruder_count": {
-            "default_value": 2
-        }
-
+        "machine_height": { "default_value": 250 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 12 },
+        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.2 },
+        "machine_name": { "default_value": "Geeetech A20M" },
+        "machine_start_gcode": { "default_value": ";GeeeTech A20M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script" },
+        "machine_width": { "default_value": 250 },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_speed": { "default_value": 35 }
     }
-}
+}

resources/definitions/geeetech_A20T.def.json

@@ -2,7 +2,8 @@
     "version": 2,
     "name": "Geeetech A20T",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Amit L",
         "manufacturer": "Geeetech",
@@ -14,46 +15,39 @@
             "1": "geeetech_A20T_2",
             "2": "geeetech_A20T_3"
         }
-
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Geeetech A20T" },
-        "machine_width": {
-            "default_value": 250
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_depth": {
-            "default_value": 250
-        },        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "layer_height": { "default_value": 0.1 },
-        "layer_height_0": { "default_value": 0.15 },
-        "retraction_amount": { "default_value": 0.8 },
-        "retraction_speed": { "default_value": 35 },
+    "overrides":
+    {
         "adhesion_type": { "default_value": "skirt" },
-        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
         "gantry_height": { "value": "28" },
-        "machine_max_feedrate_z": { "default_value": 12 },
-        "machine_max_feedrate_e": { "default_value": 120 },
-        "machine_max_acceleration_z": { "default_value": 500 },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.15 },
         "machine_acceleration": { "default_value": 1000 },
-        "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_max_jerk_z": { "default_value": 0.2 },
-        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 250 },
+        "machine_end_gcode": { "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" },
+        "machine_extruder_count": { "default_value": 3 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": {
-            "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28"
-        },
-        "machine_end_gcode": {
-            "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84"
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-31, 31],
+                [34, 31],
+                [34, -40],
+                [-31, -40]
+            ]
         },
-        "machine_extruder_count": {
-            "default_value": 3
-        }
-
+        "machine_height": { "default_value": 250 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 12 },
+        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.2 },
+        "machine_name": { "default_value": "Geeetech A20T" },
+        "machine_start_gcode": { "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28" },
+        "machine_width": { "default_value": 250 },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_speed": { "default_value": 35 }
     }
-}
+}

resources/definitions/geeetech_Mizar_S.def.json

@@ -2,58 +2,48 @@
     "version": 2,
     "name": "Geeetech Mizar_S (legacy)",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "Amit L",
         "manufacturer": "Geeetech",
         "file_formats": "text/x-gcode",
         "has_materials": true,
-        "machine_extruder_trains":
-        {
-            "0": "geeetech_Mizar_S_1"
-        }
-
+        "machine_extruder_trains": { "0": "geeetech_Mizar_S_1" }
     },
-
-    "overrides": {
-        "machine_name": { "default_value": "Geeetech Mizar_S (legacy)" },
-        "machine_width": {
-            "default_value": 255
-        },
-        "machine_height": {
-            "default_value": 260
-        },
-        "machine_depth": {
-            "default_value": 255
-        },        
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "layer_height": { "default_value": 0.1 },
-        "layer_height_0": { "default_value": 0.15 },
-        "retraction_amount": { "default_value": 0.8 },
-        "retraction_speed": { "default_value": 35 },
+    "overrides":
+    {
         "adhesion_type": { "default_value": "skirt" },
-        "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
         "gantry_height": { "value": "28" },
-        "machine_max_feedrate_z": { "default_value": 12 },
-        "machine_max_feedrate_e": { "default_value": 120 },
-        "machine_max_acceleration_z": { "default_value": 500 },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.15 },
         "machine_acceleration": { "default_value": 1000 },
-        "machine_max_jerk_xy": { "default_value": 10 },
-        "machine_max_jerk_z": { "default_value": 0.2 },
-        "machine_max_jerk_e": { "default_value": 2.5 },
-        "machine_heated_bed": { "default_value": true },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 255 },
+        "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" },
+        "machine_extruder_count": { "default_value": 1 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
-        "machine_start_gcode": {
-            "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home"
-        },
-        "machine_end_gcode": {
-            "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers"
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-31, 31],
+                [34, 31],
+                [34, -40],
+                [-31, -40]
+            ]
         },
-        "machine_extruder_count": {
-            "default_value": 1
-        }
-
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 260 },
+        "machine_max_acceleration_z": { "default_value": 500 },
+        "machine_max_feedrate_e": { "default_value": 120 },
+        "machine_max_feedrate_z": { "default_value": 12 },
+        "machine_max_jerk_e": { "default_value": 2.5 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 0.2 },
+        "machine_name": { "default_value": "Geeetech Mizar_S (legacy)" },
+        "machine_start_gcode": { "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" },
+        "machine_width": { "default_value": 255 },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_speed": { "default_value": 35 }
     }
-}
+}

resources/definitions/geeetech_a30.def.json

@@ -2,64 +2,29 @@
     "version": 2,
     "name": "Geeetech A30",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
+        "visible": true,
         "author": "William & Cataldo URSO",
         "manufacturer": "Geeetech",
         "file_formats": "text/x-gcode",
-        "visible": true,
         "has_materials": true,
-        "preferred_quality_type": "draft",
-        "machine_extruder_trains": {
-            "0": "geeetech_a30_extruder_0"
-        }
+        "machine_extruder_trains": { "0": "geeetech_a30_extruder_0" },
+        "preferred_quality_type": "draft"
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "Geeetech A30"
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84"
-        },
-        "machine_width": {
-            "default_value": 320
-        },
-        "machine_height": {
-            "default_value": 420
-        },
-        "machine_depth": {
-            "default_value": 320
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "material_diameter": {
-            "default_value": 1.75
-        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
-        "layer_height": {
-            "default_value": 0.1
-        },
-        "layer_height_0": {
-            "default_value": 0.3
-        },
-        "retraction_amount": {
-            "default_value": 2
-        },
-        "retraction_speed": {
-            "default_value": 25
-        },
-        "adhesion_type": {
-            "default_value": "skirt"
-        },
-        "machine_head_with_fans_polygon": {
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "skirt" },
+        "gantry_height": { "value": "55" },
+        "layer_height": { "default_value": 0.1 },
+        "layer_height_0": { "default_value": 0.3 },
+        "machine_acceleration": { "default_value": 2000 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 320 },
+        "machine_end_gcode": { "default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84" },
+        "machine_gcode_flavor": { "default_value": "Repetier" },
+        "machine_head_with_fans_polygon":
+        {
             "default_value": [
                 [-75, 35],
                 [18, 35],
@@ -67,47 +32,25 @@
                 [-75, -18]
             ]
         },
-        "gantry_height": {
-            "value": "55"
-        },
-        "machine_max_feedrate_x": {
-            "default_value": 300
-        },
-        "machine_max_feedrate_y": {
-            "default_value": 300
-        },
-        "machine_max_feedrate_z": {
-            "default_value": 7
-        },
-        "machine_max_feedrate_e": {
-            "default_value": 50
-        },
-        "machine_max_acceleration_x": {
-            "default_value": 2000
-        },
-        "machine_max_acceleration_y": {
-            "default_value": 2000
-        },
-        "machine_max_acceleration_z": {
-            "default_value": 100
-        },
-        "machine_max_acceleration_e": {
-            "default_value": 10000
-        },
-        "machine_acceleration": {
-            "default_value": 2000
-        },
-        "machine_max_jerk_xy": {
-            "default_value": 10
-        },
-        "machine_max_jerk_z": {
-            "default_value": 1
-        },
-        "machine_max_jerk_e": {
-            "default_value": 5
-        },
-        "machine_gcode_flavor": {
-            "default_value": "Repetier"
-        }
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 420 },
+        "machine_max_acceleration_e": { "default_value": 10000 },
+        "machine_max_acceleration_x": { "default_value": 2000 },
+        "machine_max_acceleration_y": { "default_value": 2000 },
+        "machine_max_acceleration_z": { "default_value": 100 },
+        "machine_max_feedrate_e": { "default_value": 50 },
+        "machine_max_feedrate_x": { "default_value": 300 },
+        "machine_max_feedrate_y": { "default_value": 300 },
+        "machine_max_feedrate_z": { "default_value": 7 },
+        "machine_max_jerk_e": { "default_value": 5 },
+        "machine_max_jerk_xy": { "default_value": 10 },
+        "machine_max_jerk_z": { "default_value": 1 },
+        "machine_name": { "default_value": "Geeetech A30" },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "machine_start_gcode": { "default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0" },
+        "machine_width": { "default_value": 320 },
+        "material_diameter": { "default_value": 1.75 },
+        "retraction_amount": { "default_value": 2 },
+        "retraction_speed": { "default_value": 25 }
     }
-}
+}

resources/extruders/geeetech_A10M_1.def.json

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

resources/extruders/geeetech_A10M_2.def.json

@@ -2,18 +2,19 @@
     "version": 2,
     "name": "Extruder 2",
     "inherits": "fdmextruder",
-    "metadata": {
+    "metadata":
+    {
         "machine": "geeetech_A10M",
         "position": "1"
     },
-
-    "overrides": {
-        "extruder_nr": {
+    "overrides":
+    {
+        "extruder_nr":
+        {
             "default_value": 1,
             "maximum_value": "1"
         },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
-
     }
-}
+}