Browse Source

Applied printer-linter formatting

Contributes to CURA-10101
jspijker 2 years ago
parent
commit
5f5e758490

+ 21 - 31
resources/definitions/blocks_mkii.def.json

@@ -1,32 +1,22 @@
-{
-  "name": "Blocks One MKII",
-  "version": 2,
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-
-    "quality_definition": "blocks_base",
-
-    "platform": "blocks_mk2_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_mkii_extruder_0"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks One MKII" },
-
-    "machine_width": { "default_value": 200 },
-    "machine_height": { "default_value": 210 },
-    "machine_depth": { "default_value": 210 },
-
-    "retraction_retract_speed": { "value": 50 },
-
-    "machine_start_gcode": {
-      "default_value": "G21\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\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\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 before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;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\n"
-    }
-  }
+{
+    "version": 2,
+    "name": "Blocks One MKII",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_mk2_platform.stl",
+        "machine_extruder_trains": { "0": "blocks_mkii_extruder_0" },
+        "quality_definition": "blocks_base"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 210 },
+        "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 F6000 ;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\n" },
+        "machine_height": { "default_value": 210 },
+        "machine_name": { "default_value": "Blocks One MKII" },
+        "machine_start_gcode": { "default_value": "G21\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\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" },
+        "machine_width": { "default_value": 200 },
+        "retraction_retract_speed": { "value": 50 }
+    }
 }

+ 21 - 31
resources/definitions/blocks_one.def.json

@@ -1,32 +1,22 @@
-{
-  "name": "Blocks One",
-  "version": 2,
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-
-    "quality_definition": "blocks_base",
-
-    "platform": "blocks_mk2_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_one_extruder_0"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks One" },
-
-    "machine_width": { "default_value": 200 },
-    "machine_height": { "default_value": 200 },
-    "machine_depth": { "default_value": 200 },
-
-    "retraction_retract_speed": { "value": 50 },
-
-    "machine_start_gcode": {
-      "default_value": "G21\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 F6000\nG92 E0\nG1 F200 E3\nG92 E0\nG1 F6000\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 before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;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\n"
-    }
-  }
+{
+    "version": 2,
+    "name": "Blocks One",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_mk2_platform.stl",
+        "machine_extruder_trains": { "0": "blocks_one_extruder_0" },
+        "quality_definition": "blocks_base"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 200 },
+        "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 F6000 ;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\n" },
+        "machine_height": { "default_value": 200 },
+        "machine_name": { "default_value": "Blocks One" },
+        "machine_start_gcode": { "default_value": "G21\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 F6000\nG92 E0\nG1 F200 E3\nG92 E0\nG1 F6000\nM117 Printing...\n" },
+        "machine_width": { "default_value": 200 },
+        "retraction_retract_speed": { "value": 50 }
+    }
 }

+ 22 - 33
resources/definitions/blocks_pros100.def.json

@@ -1,34 +1,23 @@
-{
-  "name": "Blocks Pro S100",
-  "version": 2,
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-
-    "quality_definition": "blocks_base",
-
-    "preferred_variant_name": "0.8mm Nozzle",
-
-    "platform": "blocks_r100_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_pros100_extruder_0"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks Pro S100" },
-
-    "machine_width": { "default_value": 1000 },
-    "machine_height": { "default_value": 1000 },
-    "machine_depth": { "default_value": 1000 },
-
-    "retraction_retract_speed": { "value": 50 },
-
-    "machine_start_gcode": {
-      "default_value": "G21\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\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\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 before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;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\n"
-    }
-  }
+{
+    "version": 2,
+    "name": "Blocks Pro S100",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_r100_platform.stl",
+        "machine_extruder_trains": { "0": "blocks_pros100_extruder_0" },
+        "preferred_variant_name": "0.8mm Nozzle",
+        "quality_definition": "blocks_base"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 1000 },
+        "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 F6000 ;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\n" },
+        "machine_height": { "default_value": 1000 },
+        "machine_name": { "default_value": "Blocks Pro S100" },
+        "machine_start_gcode": { "default_value": "G21\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\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" },
+        "machine_width": { "default_value": 1000 },
+        "retraction_retract_speed": { "value": 50 }
+    }
 }

+ 21 - 31
resources/definitions/blocks_pros30.def.json

@@ -1,32 +1,22 @@
-{
-  "version": 2,
-  "name": "Blocks Pro S30",
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-
-    "quality_definition": "blocks_base",
-
-    "platform": "blocks_pros30_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_pros30_extruder_0"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks Pro S30" },
-
-    "machine_width": { "default_value": 310 },
-    "machine_height": { "default_value": 290 },
-    "machine_depth": { "default_value": 310 },
-
-    "retraction_retract_speed": { "value": 40 },
-
-    "machine_start_gcode": {
-      "default_value": "G21\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\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\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 before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;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\n"
-    }
-  }
+{
+    "version": 2,
+    "name": "Blocks Pro S30",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_pros30_platform.stl",
+        "machine_extruder_trains": { "0": "blocks_pros30_extruder_0" },
+        "quality_definition": "blocks_base"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 310 },
+        "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 F6000 ;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\n" },
+        "machine_height": { "default_value": 290 },
+        "machine_name": { "default_value": "Blocks Pro S30" },
+        "machine_start_gcode": { "default_value": "G21\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\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" },
+        "machine_width": { "default_value": 310 },
+        "retraction_retract_speed": { "value": 40 }
+    }
 }

+ 29 - 38
resources/definitions/blocks_r21.def.json

@@ -1,39 +1,30 @@
-{
-  "name": "Blocks R21",
-  "version": 2,
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-    "first_start_actions": ["MachineSettingsAction"],
-    "has_materials": true,
-    "has_variants": true,
-    "has_machine_quality": true,
-    "preferred_variant_name": "ST - 0.4mm",
-    "preferred_quality_type": "normal",
-    "preferred_material": "generic_pla",
-    "variants_name": "Print Core",
-    "quality_definition": "blocks_base",
-    
-    "platform": "blocks_r21_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_r21_extruder_0"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks R21" },
-
-    "machine_width": { "default_value": 300 },
-    "machine_height": { "default_value": 250 },
-    "machine_depth": { "default_value": 210 },
-
-    "retraction_retract_speed": { "value": 50 },
-
-    "machine_start_gcode": {
-      "default_value": "G21\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\nG29\nM117 ; Purge extruder\nG92 E0 ; Reset Extruder\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.4 Y200.0 Z0.3 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 Z1.0 F3000\nG1 X0.1 Y15 F3000.0\nG1 Z0.1 F3000.0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\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 before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0;move X/Y to min endstops, so the head is out of the way\nG1 Y210 F5000.0\nG1 Z+70\nM84 ;steppers off\nG90 ;absolute positioning\n"
-    }
-  }
+{
+    "version": 2,
+    "name": "Blocks R21",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_r21_platform.stl",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains": { "0": "blocks_r21_extruder_0" },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "normal",
+        "preferred_variant_name": "ST - 0.4mm",
+        "quality_definition": "blocks_base",
+        "variants_name": "Print Core"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 210 },
+        "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 F6000 ;move Z up a bit and retract filament even more\nG28 X0;move X/Y to min endstops, so the head is out of the way\nG1 Y210 F5000.0\nG1 Z+70\nM84 ;steppers off\nG90 ;absolute positioning\n" },
+        "machine_height": { "default_value": 250 },
+        "machine_name": { "default_value": "Blocks R21" },
+        "machine_start_gcode": { "default_value": "G21\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\nG29\nM117 ; Purge extruder\nG92 E0 ; Reset Extruder\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.4 Y200.0 Z0.3 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 Z1.0 F3000\nG1 X0.1 Y15 F3000.0\nG1 Z0.1 F3000.0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nM117 Printing...\n" },
+        "machine_width": { "default_value": 300 },
+        "retraction_retract_speed": { "value": 50 }
+    }
 }

+ 34 - 43
resources/definitions/blocks_rd50.def.json

@@ -1,44 +1,35 @@
-{
-  "name": "Blocks RD50",
-  "version": 2,
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-    "first_start_actions": ["MachineSettingsAction"],
-    "has_materials": true,
-    "has_variants": true,
-    "has_machine_quality": true,
-    "preferred_variant_name": "ST - 0.4mm",
-    "preferred_quality_type": "normal",
-    "preferred_material": "generic_pla",
-    "variants_name": "Print Core",
-    "quality_definition": "blocks_base",
-    
-    "platform": "blocks_rd50_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_rd50_extruder_0",
-      "1": "blocks_rd50_extruder_1"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks RD50" },
-
-    "machine_width": { "default_value": 500 },
-    "machine_height": { "default_value": 500 },
-    "machine_depth": { "default_value": 500 },
-
-    "retraction_retract_speed": { "value": 50 },
-    
-    "machine_extruder_count": {
-      "default_value": 2
-    },
-
-    "machine_start_gcode": {
-      "default_value": "G21\nG90 ;absolute positioning\nG28 X0 Y0  ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\n;PREHEAT\nM140 S{material_bed_temperature_layer_0}   ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nG1 X-60 Y0 F6000\nG92 E0       ;zero the extruded length\nM190 S{material_bed_temperature_layer_0}   ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG1 F600 E20 ;extrude 10mm of feed stock\nG1 F200 E80 ;extrude 10mm of feed stock\nG12\nG92 E0       ;zero the extruded length again\nG29\nG1 Z0.2 F6000\nG1 F6000\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 before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;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\n"
-    }
-  }    
+{
+    "version": 2,
+    "name": "Blocks RD50",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_rd50_platform.stl",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains":
+        {
+            "0": "blocks_rd50_extruder_0",
+            "1": "blocks_rd50_extruder_1"
+        },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "normal",
+        "preferred_variant_name": "ST - 0.4mm",
+        "quality_definition": "blocks_base",
+        "variants_name": "Print Core"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 500 },
+        "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 F6000 ;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\n" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_height": { "default_value": 500 },
+        "machine_name": { "default_value": "Blocks RD50" },
+        "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nG28 X0 Y0  ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\n;PREHEAT\nM140 S{material_bed_temperature_layer_0}   ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nG1 X-60 Y0 F6000\nG92 E0       ;zero the extruded length\nM190 S{material_bed_temperature_layer_0}   ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG1 F600 E20 ;extrude 10mm of feed stock\nG1 F200 E80 ;extrude 10mm of feed stock\nG12\nG92 E0       ;zero the extruded length again\nG29\nG1 Z0.2 F6000\nG1 F6000\n" },
+        "machine_width": { "default_value": 500 },
+        "retraction_retract_speed": { "value": 50 }
+    }
 }

+ 34 - 43
resources/definitions/blocks_rd50duplicate.def.json

@@ -1,44 +1,35 @@
-{
-  "name": "Blocks RD50 - Duplication Mode",
-  "version": 2,
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-    "first_start_actions": ["MachineSettingsAction"],
-    "has_materials": true,
-    "has_variants": true,
-    "has_machine_quality": true,
-    "preferred_variant_name": "ST - 0.4mm",
-    "preferred_quality_type": "normal",
-    "preferred_material": "generic_pla",
-    "variants_name": "Print Core",
-    "quality_definition": "blocks_base",
-    
-    "platform": "blocks_rd50_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_rd50_extruder_0",
-      "1": "blocks_rd50_extruder_1"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks RD50 - Duplication Mode" },
-
-    "machine_width": { "default_value": 500 },
-    "machine_height": { "default_value": 500 },
-    "machine_depth": { "default_value": 500 },
-
-    "retraction_retract_speed": { "value": 50 },
-    
-    "machine_extruder_count": {
-      "default_value": 2
-    },
-
-    "machine_start_gcode": {
-      "default_value": ";INITIALIZE DUPLICATION MODE\nM605 S1      ; AUTO-PARK MODE\nT0           ; Set tool 0\nG28          ; Home all axes\nG28 X\nM605 S2      ; Set duplication mode\n; PREHEAT\nM140 S{material_bed_temperature_layer_0}   ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM190 S{material_bed_temperature_layer_0}   ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\n;SET DUPLICATION MODE\nM605 S2 X622 ; Set duplication mode and nozzle offset\nG28 X\nG1 X-60 F3000\nM605 S3 X622 ; Set mirror mode and nozzle offset\nM82\nG92 E0       ; Reset Extruder\nG1 F400\nG1 E40 F400  ; Prime\nG12          ; Clean Nozzle\nM605 S2 X250\nG28 X\nG92 E0 ; Reset Extruder\nG1 X0 F3000\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 before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nM605 S1      ; AUTO-PARK MODE\nG28 X Y ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n"
-    }
-  }    
+{
+    "version": 2,
+    "name": "Blocks RD50 - Duplication Mode",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_rd50_platform.stl",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains":
+        {
+            "0": "blocks_rd50_extruder_0",
+            "1": "blocks_rd50_extruder_1"
+        },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "normal",
+        "preferred_variant_name": "ST - 0.4mm",
+        "quality_definition": "blocks_base",
+        "variants_name": "Print Core"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 500 },
+        "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+1 E-1 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nM605 S1      ; AUTO-PARK MODE\nG28 X Y ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_height": { "default_value": 500 },
+        "machine_name": { "default_value": "Blocks RD50 - Duplication Mode" },
+        "machine_start_gcode": { "default_value": ";INITIALIZE DUPLICATION MODE\nM605 S1      ; AUTO-PARK MODE\nT0           ; Set tool 0\nG28          ; Home all axes\nG28 X\nM605 S2      ; Set duplication mode\n; PREHEAT\nM140 S{material_bed_temperature_layer_0}   ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM190 S{material_bed_temperature_layer_0}   ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\n;SET DUPLICATION MODE\nM605 S2 X622 ; Set duplication mode and nozzle offset\nG28 X\nG1 X-60 F3000\nM605 S3 X622 ; Set mirror mode and nozzle offset\nM82\nG92 E0       ; Reset Extruder\nG1 F400\nG1 E40 F400  ; Prime\nG12          ; Clean Nozzle\nM605 S2 X250\nG28 X\nG92 E0 ; Reset Extruder\nG1 X0 F3000\n" },
+        "machine_width": { "default_value": 500 },
+        "retraction_retract_speed": { "value": 50 }
+    }
 }

+ 34 - 43
resources/definitions/blocks_rd50mirror.def.json

@@ -1,44 +1,35 @@
-{
-  "name": "Blocks RD50 - Mirror Mode",
-  "version": 2,
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-    "first_start_actions": ["MachineSettingsAction"],
-    "has_materials": true,
-    "has_variants": true,
-    "has_machine_quality": true,
-    "preferred_variant_name": "ST - 0.4mm",
-    "preferred_quality_type": "normal",
-    "preferred_material": "generic_pla",
-    "variants_name": "Print Core",
-    "quality_definition": "blocks_base",
-    
-    "platform": "blocks_rd50_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_rd50_extruder_0",
-      "1": "blocks_rd50_extruder_1"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks RD50 - Mirror Mode" },
-
-    "machine_width": { "default_value": 500 },
-    "machine_height": { "default_value": 500 },
-    "machine_depth": { "default_value": 500 },
-
-    "retraction_retract_speed": { "value": 50 },
-    
-    "machine_extruder_count": {
-      "default_value": 2
-    },
-
-    "machine_start_gcode": {
-      "default_value": ";INITIALIZE MIRROR MODE\nM605 S1      ; AUTO-PARK MODE\nT0           ; Set tool 0\nG28          ; Home all axes\nG28 X ; Home x axes\nM605 S2      ; Set duplication mode\n; PREHEAT\nM140 S{material_bed_temperature_layer_0}   ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM190 S{material_bed_temperature_layer_0}   ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\n;SET MIRROR MODE\nM605 S2 X622 ; Set duplication mode and nozzle offset\nG28 X\nG1 X-60 F3000\nM605 S3 X622 ; Set mirror mode and nozzle offset\nM82\nG92 E0       ; Reset Extruder\nG1 F200\nG1 E30 F200  ; Prime\nG12          ; Clean Nozzle\nG1 X125 F3000\nG92 E0 ; Reset Extruder\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 before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nM605 S1      ; AUTO-PARK MODE\nG28 X Y ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n"
-    }
-  }    
+{
+    "version": 2,
+    "name": "Blocks RD50 - Mirror Mode",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_rd50_platform.stl",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains":
+        {
+            "0": "blocks_rd50_extruder_0",
+            "1": "blocks_rd50_extruder_1"
+        },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "normal",
+        "preferred_variant_name": "ST - 0.4mm",
+        "quality_definition": "blocks_base",
+        "variants_name": "Print Core"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 500 },
+        "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+1 E-1 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nM605 S1      ; AUTO-PARK MODE\nG28 X Y ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_height": { "default_value": 500 },
+        "machine_name": { "default_value": "Blocks RD50 - Mirror Mode" },
+        "machine_start_gcode": { "default_value": ";INITIALIZE MIRROR MODE\nM605 S1      ; AUTO-PARK MODE\nT0           ; Set tool 0\nG28          ; Home all axes\nG28 X ; Home x axes\nM605 S2      ; Set duplication mode\n; PREHEAT\nM140 S{material_bed_temperature_layer_0}   ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM190 S{material_bed_temperature_layer_0}   ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\n;SET MIRROR MODE\nM605 S2 X622 ; Set duplication mode and nozzle offset\nG28 X\nG1 X-60 F3000\nM605 S3 X622 ; Set mirror mode and nozzle offset\nM82\nG92 E0       ; Reset Extruder\nG1 F200\nG1 E30 F200  ; Prime\nG12          ; Clean Nozzle\nG1 X125 F3000\nG92 E0 ; Reset Extruder\n" },
+        "machine_width": { "default_value": 500 },
+        "retraction_retract_speed": { "value": 50 }
+    }
 }

+ 22 - 33
resources/definitions/blocks_zero.def.json

@@ -1,34 +1,23 @@
-{
-  "name": "Blocks Zero",
-  "version": 2,
-  "inherits": "blocks_base",
-  "metadata": {
-    "visible": true,
-
-    "quality_definition": "blocks_base",
-
-    "platform": "blocks_zero_platform.stl",
-
-    "machine_extruder_trains": {
-      "0": "blocks_zero_extruder_0"
-    }
-  },
-  "overrides": {
-    "machine_name": { "default_value": "Blocks Zero" },
-
-    "machine_heated_bed": { "default_value": false },
-
-    "machine_width": { "default_value": 120 },
-    "machine_height": { "default_value": 120 },
-    "machine_depth": { "default_value": 140 },
-
-    "retraction_retract_speed": { "value": 50 },
-
-    "machine_start_gcode": {
-      "default_value": "G21\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 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\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 before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;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\n"
-    }
-  }
+{
+    "version": 2,
+    "name": "Blocks Zero",
+    "inherits": "blocks_base",
+    "metadata":
+    {
+        "visible": true,
+        "platform": "blocks_zero_platform.stl",
+        "machine_extruder_trains": { "0": "blocks_zero_extruder_0" },
+        "quality_definition": "blocks_base"
+    },
+    "overrides":
+    {
+        "machine_depth": { "default_value": 140 },
+        "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 F6000 ;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\n" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 120 },
+        "machine_name": { "default_value": "Blocks Zero" },
+        "machine_start_gcode": { "default_value": "G21\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 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" },
+        "machine_width": { "default_value": 120 },
+        "retraction_retract_speed": { "value": 50 }
+    }
 }

+ 15 - 14
resources/extruders/blocks_pros100_extruder_0.def.json

@@ -1,15 +1,16 @@
-{
-    "version": 2,
-    "name": "Extruder 1",
-    "inherits": "fdmextruder",
-    "metadata": {
-        "machine": "blocks_pros100",
-        "position": "0"
-    },
-
-    "overrides": {
-        "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.8 },
-        "material_diameter": { "default_value": 1.75 }
-    }
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "blocks_pros100",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.8 },
+        "material_diameter": { "default_value": 1.75 }
+    }
 }

Some files were not shown because too many files changed in this diff