diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json index 8e3793bec6..06c2024dd2 100644 --- a/resources/machines/RigidBot.json +++ b/resources/machines/RigidBot.json @@ -8,7 +8,7 @@ "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_width": { "default": 254 }, "machine_depth": { "default": 254 }, @@ -32,10 +32,8 @@ }, "machine_end_gcode": { "default": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" - } - }, + }, - "overrides": { "layer_height": { "default": 0.2 }, "shell_thickness": { "default": 0.8 }, "wall_thickness": { "default": 0.8 }, diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json index 6518444db0..d14174e9b8 100644 --- a/resources/machines/RigidBotBig.json +++ b/resources/machines/RigidBotBig.json @@ -8,7 +8,7 @@ "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_width": { "default": 400 }, "machine_depth": { "default": 300 }, @@ -30,10 +30,8 @@ }, "machine_end_gcode": { "default": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" - } - }, + }, - "overrides": { "layer_height": { "default": 0.2 }, "shell_thickness": { "default": 0.8}, "wall_thickness": { "default": 0.8 }, diff --git a/resources/machines/bq_hephestos.json b/resources/machines/bq_hephestos.json index 0ab0964263..58f4acfc17 100644 --- a/resources/machines/bq_hephestos.json +++ b/resources/machines/bq_hephestos.json @@ -7,7 +7,7 @@ "platform": "bq_hephestos_platform.stl", "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_start_gcode": { "default": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" }, @@ -34,9 +34,7 @@ }, "machine_platform_offset": { "default": [0, -82, 0] - } - }, - "overrides": { + }, "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, "shell_thickness": { "default": 1.0 }, diff --git a/resources/machines/bq_hephestos_2.json b/resources/machines/bq_hephestos_2.json index 07be8d2467..92fcf840aa 100644 --- a/resources/machines/bq_hephestos_2.json +++ b/resources/machines/bq_hephestos_2.json @@ -7,7 +7,7 @@ "platform": "bq_hephestos_2_platform.stl", "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_start_gcode": { "default": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --" }, @@ -35,8 +35,6 @@ "machine_platform_offset": { "default": [-6, 1320, 0] } - }, - "overrides": { "material_print_temperature": { "default": 210.0, "visible": true }, "material_bed_temperature": { "default": 0 }, "material_diameter": { "default": 1.75 }, diff --git a/resources/machines/bq_hephestos_xl.json b/resources/machines/bq_hephestos_xl.json index 29b4c9cb77..4e326d03ca 100644 --- a/resources/machines/bq_hephestos_xl.json +++ b/resources/machines/bq_hephestos_xl.json @@ -7,7 +7,7 @@ "platform": "bq_hephestos_platform.stl", "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_start_gcode": { "default": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" }, @@ -34,9 +34,7 @@ }, "machine_platform_offset": { "default": [0, -82, 0] - } - }, - "overrides": { + }, "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, "shell_thickness": { "default": 1.0 }, diff --git a/resources/machines/bq_witbox.json b/resources/machines/bq_witbox.json index 445859b141..fa89cedb22 100644 --- a/resources/machines/bq_witbox.json +++ b/resources/machines/bq_witbox.json @@ -7,7 +7,7 @@ "platform": "bq_witbox_platform.stl", "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_start_gcode": { "default": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/sec\n; -- end of START GCODE --" }, @@ -34,9 +34,7 @@ }, "machine_platform_offset": { "default": [0, -145, -38] - } - }, - "overrides": { + }, "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, "shell_thickness": { "default": 1.0 }, diff --git a/resources/machines/bq_witbox_2.json b/resources/machines/bq_witbox_2.json index 62bbc2c5ff..2766840ae5 100644 --- a/resources/machines/bq_witbox_2.json +++ b/resources/machines/bq_witbox_2.json @@ -7,7 +7,7 @@ "platform": "bq_witbox_platform.stl", "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_start_gcode": { "default": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --" }, @@ -34,9 +34,7 @@ }, "machine_platform_offset": { "default": [0, -145, -38] - } - }, - "overrides": { + }, "material_print_temperature": { "default": 210.0, "visible": true }, "material_bed_temperature": { "default": 0 }, "material_diameter": { "default": 1.75 }, diff --git a/resources/machines/grr_neo.json b/resources/machines/grr_neo.json index 488909c79c..a491d71ae9 100644 --- a/resources/machines/grr_neo.json +++ b/resources/machines/grr_neo.json @@ -10,7 +10,7 @@ "inherits": "fdmprinter.json", "visible": "true", - "machine_settings": { + "overrides": { "machine_width": { "default": 150 }, "machine_height": { "default": 150 }, "machine_depth": { "default": 150 }, @@ -30,10 +30,8 @@ }, "machine_end_gcode": { "default": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - } - }, + }, - "overrides": { "material_bed_temperature": { "visible": false } } } diff --git a/resources/machines/maker_starter.json b/resources/machines/maker_starter.json index 7e4e08f175..2799faa87d 100644 --- a/resources/machines/maker_starter.json +++ b/resources/machines/maker_starter.json @@ -9,7 +9,7 @@ "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_width": { "default": 210 }, "machine_depth": { "default": 185 }, "machine_height": { "default": 200 }, @@ -30,10 +30,8 @@ "machine_nozzle_tip_outer_diameter": { "default": 1.0 }, "machine_nozzle_head_distance": { "default": 3.0 }, - "machine_nozzle_expansion_angle": { "default": 45 } - }, + "machine_nozzle_expansion_angle": { "default": 45 }, - "overrides": { "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, "wall_line_count": { "default": 2, "visible": true }, diff --git a/resources/machines/prusa_i3.json b/resources/machines/prusa_i3.json index 997a246601..50b4da4205 100644 --- a/resources/machines/prusa_i3.json +++ b/resources/machines/prusa_i3.json @@ -9,7 +9,7 @@ "inherits": "fdmprinter.json", - "machine_settings": { + "overrides": { "machine_heated_bed": { "default": true }, "machine_width": { "default": 200 }, "machine_height": { "default": 200 }, diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index ec03ea4a0a..7825650bdc 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -36,7 +36,7 @@ } } ], - "machine_settings": { + "overrides": { "machine_start_gcode" : { "default": "" }, "machine_end_gcode" : { "default": "" }, "machine_width": { "default": 230 }, @@ -82,10 +82,8 @@ "machine_nozzle_tip_outer_diameter": { "default": 1.0 }, "machine_nozzle_head_distance": { "default": 3.0 }, - "machine_nozzle_expansion_angle": { "default": 45 } - }, - - "overrides": { + "machine_nozzle_expansion_angle": { "default": 45 }, + "material_print_temperature": { "enabled": "False" }, "material_bed_temperature": { "enabled": "False" }, "material_diameter": { "enabled": "False" }, diff --git a/resources/machines/ultimaker2_extended.json b/resources/machines/ultimaker2_extended.json index 6a04241d59..547525ef65 100644 --- a/resources/machines/ultimaker2_extended.json +++ b/resources/machines/ultimaker2_extended.json @@ -10,7 +10,7 @@ "inherits": "ultimaker2.json", - "machine_settings": { + "overrides": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, "machine_height": { "default": 315 } diff --git a/resources/machines/ultimaker2_go.json b/resources/machines/ultimaker2_go.json index 243b612198..e6456ddadc 100644 --- a/resources/machines/ultimaker2_go.json +++ b/resources/machines/ultimaker2_go.json @@ -10,7 +10,7 @@ "inherits": "ultimaker2.json", - "machine_settings": { + "overrides": { "machine_width": { "default": 120 }, "machine_depth": { "default": 120 }, "machine_height": { "default": 115 }, diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json index 4c94d5e4c4..14ff6c312b 100644 --- a/resources/machines/ultimaker_original.json +++ b/resources/machines/ultimaker_original.json @@ -41,7 +41,7 @@ } } ], - "machine_settings": { + "overrides": { "machine_width": { "default": 205 }, "machine_height": { "default": 200 }, "machine_depth": { "default": 205 }, diff --git a/resources/machines/ultimaker_original_plus.json b/resources/machines/ultimaker_original_plus.json index 4bb4b94a45..f4e55149de 100644 --- a/resources/machines/ultimaker_original_plus.json +++ b/resources/machines/ultimaker_original_plus.json @@ -16,7 +16,7 @@ "BedLeveling" ], - "machine_settings": { + "overrides": { "machine_heated_bed": { "default": true } } }