diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json index 561bc064bf..c0737afc51 100644 --- a/resources/machines/RigidBot.json +++ b/resources/machines/RigidBot.json @@ -5,7 +5,7 @@ "manufacturer": "Other", "author": "RBC", "platform": "rigidbot_platform.stl", - + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -32,9 +32,6 @@ }, "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}" - }, - "machine_file_formats": { - "default": "text/x-gcode", } }, diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json index d425a8d1a3..d78b2b23eb 100644 --- a/resources/machines/RigidBotBig.json +++ b/resources/machines/RigidBotBig.json @@ -5,7 +5,7 @@ "manufacturer": "Other", "author": "RBC", "platform": "rigidbotbig_platform.stl", - + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -30,9 +30,6 @@ }, "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}" - }, - "machine_file_formats": { - "default": "text/x-gcode", } }, diff --git a/resources/machines/bq_hephestos.json b/resources/machines/bq_hephestos.json index 71e9760d65..46e90b539e 100644 --- a/resources/machines/bq_hephestos.json +++ b/resources/machines/bq_hephestos.json @@ -5,6 +5,7 @@ "manufacturer": "Other", "author": "BQ", "platform": "bq_hephestos_platform.stl", + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -34,9 +35,6 @@ }, "machine_platform_offset": { "default": [0, -82, 0] - }, - "machine_file_formats": { - "default": "text/x-gcode" } }, "overrides": { diff --git a/resources/machines/bq_hephestos_2.json b/resources/machines/bq_hephestos_2.json index a2f4b16006..e602c8d34a 100644 --- a/resources/machines/bq_hephestos_2.json +++ b/resources/machines/bq_hephestos_2.json @@ -5,6 +5,7 @@ "manufacturer": "Other", "author": "BQ", "platform": "bq_hephestos_2_platform.stl", + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -34,9 +35,6 @@ }, "machine_platform_offset": { "default": [6, 1320, 0] - }, - "machine_file_formats": { - "default": "text/x-gcode", } }, "overrides": { diff --git a/resources/machines/bq_hephestos_xl.json b/resources/machines/bq_hephestos_xl.json index 693e789185..2027be980e 100644 --- a/resources/machines/bq_hephestos_xl.json +++ b/resources/machines/bq_hephestos_xl.json @@ -5,6 +5,7 @@ "manufacturer": "Other", "author": "BQ", "platform": "bq_hephestos_platform.stl", + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -34,9 +35,6 @@ }, "machine_platform_offset": { "default": [0, -82, 0] - }, - "machine_file_formats": { - "default": "text/x-gcode", } }, "overrides": { diff --git a/resources/machines/bq_witbox.json b/resources/machines/bq_witbox.json index fbb96dd7b0..d7b1789976 100644 --- a/resources/machines/bq_witbox.json +++ b/resources/machines/bq_witbox.json @@ -5,6 +5,7 @@ "manufacturer": "Other", "author": "BQ", "platform": "bq_witbox_platform.stl", + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -34,9 +35,6 @@ }, "machine_platform_offset": { "default": [0, -145, -38] - }, - "machine_file_formats": { - "default": "text/x-gcode", } }, "overrides": { diff --git a/resources/machines/bq_witbox_2.json b/resources/machines/bq_witbox_2.json index c392a5b2ca..77b0a55738 100644 --- a/resources/machines/bq_witbox_2.json +++ b/resources/machines/bq_witbox_2.json @@ -5,6 +5,7 @@ "manufacturer": "Other", "author": "BQ", "platform": "bq_witbox_platform.stl", + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -34,9 +35,6 @@ }, "machine_platform_offset": { "default": [0, -145, -38] - }, - "machine_file_formats": { - "default": "text/x-gcode", } }, "overrides": { diff --git a/resources/machines/dual_extrusion_printer.json b/resources/machines/dual_extrusion_printer.json index a47909d699..3d386622be 100644 --- a/resources/machines/dual_extrusion_printer.json +++ b/resources/machines/dual_extrusion_printer.json @@ -2,7 +2,7 @@ "version": 1, "id": "dual_extrusion", "name": "Dual Extrusion Base File", - + "file_formats": "text/x-gcode;application/sla;prs.wavefront-obj;application/octet-stream", "inherits": "fdmprinter.json", "visible": false, diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index e41df24f50..c6e2a073d6 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -5,6 +5,7 @@ "name": "FDM Printer Base Description", "author": "Ultimaker B.V.", "manufacturer": "Ultimaker", + "file_formats": "text/x-gcode;application/sla;prs.wavefront-obj;application/octet-stream", "add_pages": [], @@ -175,12 +176,6 @@ "description": "The height difference between the tip of the nozzle and the gantry system (X and Y axes).", "default": 99999999999, "global_only": true - }, - "machine_file_formats": { - "description": "The file formats that this printer is able to read.", - "type": "string", - "default": "text/x-gcode;application/sla;prs.wavefront-obj;application/octet-stream", - "global_only": true } }, "categories": { diff --git a/resources/machines/grr_neo.json b/resources/machines/grr_neo.json index 7f1959b4a1..f945d6ba59 100644 --- a/resources/machines/grr_neo.json +++ b/resources/machines/grr_neo.json @@ -6,7 +6,7 @@ "author": "Other", "icon": "icon_ultimaker.png", "platform": "grr_neo_platform.stl", - + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "visible": "true", @@ -30,9 +30,6 @@ }, "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" - }, - "machine_file_formats": { - "default": "text/x-gcode", } }, diff --git a/resources/machines/m180.json b/resources/machines/m180.json index 49e0df51ec..d7bde9f15f 100644 --- a/resources/machines/m180.json +++ b/resources/machines/m180.json @@ -5,6 +5,7 @@ "manufacturer": "Other", "icon": "icon_ultimaker.png", "platform": "", + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -24,10 +25,7 @@ "gantry_height": { "default": 55 }, "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { "default": "M136\nM73 P0\nM103\nG21\nG90\nM320\n;(**** begin homing ****)\nG162 X Y F4000\nG161 Z F3500\nG92 Z-5\nG1 Z0.0\nG161 Z F100\nM132 X Y Z A B\n;(**** end homing ****)\nG92 X147 Y66 Z5\nG1 X105 Y-60 Z10 F4000.0\nG130 X127 Y127 A127 B127\nG0 X105 Y-60\nG1 Z0.3 F300\nG92 E0\nG1 X100 E10 F300\nG92 E0\nG1 Z0.0 F300\nM320" }, - "machine_end_gcode": { "default": "G92 Z0\nG1 Z10 F400\nM18\nM109 S0 T0\nM104 S0 T0\nM73 P100 (end build progress)\nG162 X Y F3000\nM18" }, - "machine_file_formats": { - "default": "application/octet-stream", - } + "machine_end_gcode": { "default": "G92 Z0\nG1 Z10 F400\nM18\nM109 S0 T0\nM104 S0 T0\nM73 P100 (end build progress)\nG162 X Y F3000\nM18" } }, "overrides": { diff --git a/resources/machines/maker_starter.json b/resources/machines/maker_starter.json index 66d6afa2a5..5045008a23 100644 --- a/resources/machines/maker_starter.json +++ b/resources/machines/maker_starter.json @@ -6,7 +6,7 @@ "author": "Other", "icon": "icon_ultimaker2.png", "platform": "makerstarter_platform.stl", - + "file_formats": "text/x-gcode;application/sla;prs.wavefront-obj", "inherits": "fdmprinter.json", "machine_settings": { @@ -30,10 +30,7 @@ "machine_nozzle_tip_outer_diameter": { "default": 1.0 }, "machine_nozzle_head_distance": { "default": 3.0 }, - "machine_nozzle_expansion_angle": { "default": 45 }, - "machine_file_formats": { - "default": "text/x-gcode;application/sla;prs.wavefront-obj", - } + "machine_nozzle_expansion_angle": { "default": 45 } }, "overrides": { diff --git a/resources/machines/prusa_i3.json b/resources/machines/prusa_i3.json index b052272b90..e9ed5de18a 100644 --- a/resources/machines/prusa_i3.json +++ b/resources/machines/prusa_i3.json @@ -6,7 +6,7 @@ "author": "Other", "icon": "icon_ultimaker2.png", "platform": "prusai3_platform.stl", - + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "machine_settings": { @@ -30,9 +30,6 @@ }, "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" - }, - "machine_file_formats": { - "default": "text/x-gcode", } } } diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index b81de4943a..d90ebe31b7 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -7,6 +7,7 @@ "icon": "icon_ultimaker2.png", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", @@ -79,10 +80,7 @@ "machine_nozzle_tip_outer_diameter": { "default": 1.0 }, "machine_nozzle_head_distance": { "default": 3.0 }, - "machine_nozzle_expansion_angle": { "default": 45 }, - "machine_file_formats": { - "default": "text/x-gcode", - } + "machine_nozzle_expansion_angle": { "default": 45 } }, "overrides": { diff --git a/resources/machines/ultimaker2_extended.json b/resources/machines/ultimaker2_extended.json index 6a04241d59..8c9ee4c812 100644 --- a/resources/machines/ultimaker2_extended.json +++ b/resources/machines/ultimaker2_extended.json @@ -7,7 +7,7 @@ "icon": "icon_ultimaker2.png", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2Extendedbackplate.png", - + "file_formats": "text/x-gcode", "inherits": "ultimaker2.json", "machine_settings": { diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json index 139fa62a22..5f74df23c7 100644 --- a/resources/machines/ultimaker2_extended_plus.json +++ b/resources/machines/ultimaker2_extended_plus.json @@ -7,6 +7,7 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", "visible": false, + "file_formats": "text/x-gcode", "inherits": "ultimaker2plus.json", "machine_settings": { diff --git a/resources/machines/ultimaker2_extended_plus_025.json b/resources/machines/ultimaker2_extended_plus_025.json index dd1d54ba6c..b73d923bb3 100644 --- a/resources/machines/ultimaker2_extended_plus_025.json +++ b/resources/machines/ultimaker2_extended_plus_025.json @@ -6,6 +6,7 @@ "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_plus.json", "variant": "0.25 mm", "profiles_machine": "ultimaker2plus", diff --git a/resources/machines/ultimaker2_extended_plus_040.json b/resources/machines/ultimaker2_extended_plus_040.json index f2a7da17b6..e0b652b702 100644 --- a/resources/machines/ultimaker2_extended_plus_040.json +++ b/resources/machines/ultimaker2_extended_plus_040.json @@ -6,6 +6,7 @@ "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_plus.json", "variant": "0.4 mm", "profiles_machine": "ultimaker2plus", diff --git a/resources/machines/ultimaker2_extended_plus_060.json b/resources/machines/ultimaker2_extended_plus_060.json index 59053ca53d..93d1409701 100644 --- a/resources/machines/ultimaker2_extended_plus_060.json +++ b/resources/machines/ultimaker2_extended_plus_060.json @@ -6,6 +6,7 @@ "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_plus.json", "variant": "0.6 mm", "profiles_machine": "ultimaker2plus", diff --git a/resources/machines/ultimaker2_extended_plus_080.json b/resources/machines/ultimaker2_extended_plus_080.json index b7313f6238..0e4d815d98 100644 --- a/resources/machines/ultimaker2_extended_plus_080.json +++ b/resources/machines/ultimaker2_extended_plus_080.json @@ -6,6 +6,7 @@ "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_plus.json", "variant": "0.8 mm", "profiles_machine": "ultimaker2plus", diff --git a/resources/machines/ultimaker2_go.json b/resources/machines/ultimaker2_go.json index 243b612198..5c70be6fd7 100644 --- a/resources/machines/ultimaker2_go.json +++ b/resources/machines/ultimaker2_go.json @@ -7,7 +7,7 @@ "icon": "icon_ultimaker2.png", "platform": "ultimaker2go_platform.obj", "platform_texture": "Ultimaker2Gobackplate.png", - + "file_formats": "text/x-gcode", "inherits": "ultimaker2.json", "machine_settings": { diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index 2526261a3c..b75e66122d 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -7,7 +7,7 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", "visible": false, - + "file_formats": "text/x-gcode", "inherits": "ultimaker2.json", "overrides": { diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json index 3e35b7b5c2..b51af3cafc 100644 --- a/resources/machines/ultimaker2plus_025.json +++ b/resources/machines/ultimaker2plus_025.json @@ -6,7 +6,7 @@ "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", - + "file_formats": "text/x-gcode", "inherits": "ultimaker2plus.json", "variant": "0.25 mm", diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json index 30b4b8ad58..1cb7383b18 100644 --- a/resources/machines/ultimaker2plus_040.json +++ b/resources/machines/ultimaker2plus_040.json @@ -6,7 +6,7 @@ "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", - + "file_formats": "text/x-gcode", "inherits": "ultimaker2plus.json", "variant": "0.4 mm", diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json index fe3c4ee513..132fcfff45 100644 --- a/resources/machines/ultimaker2plus_060.json +++ b/resources/machines/ultimaker2plus_060.json @@ -6,7 +6,7 @@ "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", - + "file_formats": "text/x-gcode", "inherits": "ultimaker2plus.json", "variant": "0.6 mm", diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json index 5df120b7f0..02d5607552 100644 --- a/resources/machines/ultimaker2plus_080.json +++ b/resources/machines/ultimaker2plus_080.json @@ -6,7 +6,7 @@ "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", - + "file_formats": "text/x-gcode", "inherits": "ultimaker2plus.json", "variant": "0.8 mm", diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json index cde89bc363..066f6ca9b7 100644 --- a/resources/machines/ultimaker_original.json +++ b/resources/machines/ultimaker_original.json @@ -6,7 +6,7 @@ "author": "Ultimaker", "icon": "icon_ultimaker.png", "platform": "ultimaker_platform.stl", - + "file_formats": "text/x-gcode", "inherits": "fdmprinter.json", "pages": [ @@ -78,9 +78,6 @@ "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" }, - "machine_extruder_drive_upgrade": { "default": false }, - "machine_file_formats": { - "default": "text/x-gcode", - } + "machine_extruder_drive_upgrade": { "default": false } } } diff --git a/resources/machines/ultimaker_original_plus.json b/resources/machines/ultimaker_original_plus.json index 4bb4b94a45..3ffd369681 100644 --- a/resources/machines/ultimaker_original_plus.json +++ b/resources/machines/ultimaker_original_plus.json @@ -7,7 +7,7 @@ "icon": "icon_ultimaker.png", "platform": "ultimaker2_platform.obj", "platform_texture": "UltimakerPlusbackplate.png", - + "file_formats": "text/x-gcode", "inherits": "ultimaker_original.json", "pages": [