From 73968e5c4894c2b196c3f1825cfc931cd4ce765a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 14 Feb 2018 20:46:29 +0100 Subject: [PATCH] Revert "WIP: Update and fix definition files" This reverts commit 27a346a58beaea9de249ebf229f0979d51ad21ff. --- resources/definitions/101Hero.def.json | 1 - resources/definitions/3dator.def.json | 1 - resources/definitions/bq_hephestos_2.def.json | 1 - resources/definitions/builder_premium_large.def.json | 1 - resources/definitions/builder_premium_medium.def.json | 1 - resources/definitions/builder_premium_small.def.json | 1 - resources/definitions/cartesio.def.json | 1 - resources/definitions/delta_go.def.json | 3 +-- resources/definitions/deltacomb.def.json | 3 +-- resources/definitions/folgertech_FT-5.def.json | 3 +-- resources/definitions/gmax15plus.def.json | 1 - resources/definitions/gmax15plus_dual.def.json | 1 - resources/definitions/helloBEEprusa.def.json | 3 +-- resources/definitions/imade3d_jellybox.def.json | 1 - resources/definitions/julia.def.json | 3 +-- resources/definitions/makerbotreplicator.def.json | 3 +-- resources/definitions/malyan_m200.def.json | 1 - resources/definitions/mankati_fullscale_xt_plus.def.json | 3 +-- resources/definitions/ord.def.json | 1 - resources/definitions/printrbot_play.def.json | 3 +-- resources/definitions/printrbot_simple.def.json | 3 +-- resources/definitions/printrbot_simple_extended.def.json | 3 +-- resources/definitions/prusa_i3_mk2.def.json | 3 +-- resources/definitions/punchtec_connect_xl.def.json | 3 +-- resources/definitions/rigid3d.def.json | 3 +-- resources/definitions/rigid3d_3rdgen.def.json | 3 +-- resources/definitions/rigid3d_hobby.def.json | 3 +-- resources/definitions/rigid3d_zero.def.json | 3 +-- resources/definitions/robo_3d_r1.def.json | 3 +-- resources/definitions/tam.def.json | 1 - resources/definitions/zone3d_printer.def.json | 3 +-- ...r_0.def.json => punchtec_connect_xl_extruder_left.def.json} | 0 ..._1.def.json => punchtec_connect_xl_extruder_right.def.json} | 0 33 files changed, 18 insertions(+), 49 deletions(-) rename resources/extruders/{punchtec_connect_xl_extruder_0.def.json => punchtec_connect_xl_extruder_left.def.json} (100%) rename resources/extruders/{punchtec_connect_xl_extruder_1.def.json => punchtec_connect_xl_extruder_right.def.json} (100%) diff --git a/resources/definitions/101Hero.def.json b/resources/definitions/101Hero.def.json index ead1bd4cd2..620fcfb519 100644 --- a/resources/definitions/101Hero.def.json +++ b/resources/definitions/101Hero.def.json @@ -8,7 +8,6 @@ "manufacturer": "101Hero", "file_formats": "text/x-gcode", "platform": "101hero-platform.stl", - "preferred_material": "generic_pla_175", "supports_usb_connection": true }, diff --git a/resources/definitions/3dator.def.json b/resources/definitions/3dator.def.json index 3d9b2bd7e5..19307bfddd 100644 --- a/resources/definitions/3dator.def.json +++ b/resources/definitions/3dator.def.json @@ -9,7 +9,6 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "supports_usb_connection": true, - "preferred_material": "generic_pla_175", "platform": "3dator_platform.stl" }, diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index 4c36384d63..a3493334b6 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -8,7 +8,6 @@ "manufacturer": "BQ", "platform": "bq_hephestos_2_platform.stl", "platform_offset": [6, 1320, 0 ], - "preferred_material": "generic_pla_175", "file_formats": "text/x-gcode" }, diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index 15e85d7910..deb1539a9a 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -13,7 +13,6 @@ "platform_offset": [-126, -36, 117], "has_machine_quality": true, "preferred_quality_type": "normal", - "preferred_material": "generic_pla_175", "machine_extruder_trains": { "0": "builder_premium_large_rear", diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index 500bfca75f..c28c7c5de6 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -13,7 +13,6 @@ "platform_offset": [-126, -36, 117], "has_machine_quality": true, "preferred_quality_type": "normal", - "preferred_material": "generic_pla_175", "machine_extruder_trains": { "0": "builder_premium_medium_rear", diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index 1d6451430c..8e2fe44631 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -12,7 +12,6 @@ "platform_offset": [-126, -36, 117], "has_machine_quality": true, "preferred_quality_type": "normal", - "preferred_material": "generic_pla_175", "machine_extruder_trains": { "0": "builder_premium_small_rear", diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 49eecd2c24..9deb257ac3 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -17,7 +17,6 @@ "variants_name": "Nozzle size", "preferred_variant_name": "0.8 mm", "preferred_quality_type": "normal", - "preferred_material": "generic_pla_175", "machine_extruder_trains": { diff --git a/resources/definitions/delta_go.def.json b/resources/definitions/delta_go.def.json index 6e9fa4aa09..a6d75b2983 100644 --- a/resources/definitions/delta_go.def.json +++ b/resources/definitions/delta_go.def.json @@ -8,8 +8,7 @@ "manufacturer": "Deltaprintr", "file_formats": "text/x-gcode", "platform_offset": [0, 0, 0], - "platform": "", - "preferred_material": "generic_pla_175" + "platform": "" }, "overrides": { "machine_name": { "default_value": "Delta Go" }, diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index 26004e835e..7e6e956dbc 100644 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -10,8 +10,7 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "deltacomb.stl", - "has_machine_quality": true, - "preferred_material": "generic_pla_175" + "has_machine_quality": true }, "overrides": { diff --git a/resources/definitions/folgertech_FT-5.def.json b/resources/definitions/folgertech_FT-5.def.json index 7c3489951f..71c6987a1a 100644 --- a/resources/definitions/folgertech_FT-5.def.json +++ b/resources/definitions/folgertech_FT-5.def.json @@ -7,8 +7,7 @@ "author": "Jaime van Kessel & Paul Bussiere", "manufacturer": "Folger Tech", "file_formats": "text/x-gcode", - "platform": "FT-5_build_plate.stl", - "preferred_material": "generic_pla_175" + "platform": "FT-5_build_plate.stl" }, "overrides": { "machine_heated_bed": { "default_value": true }, diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index 8bd765d156..3a207cd054 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -12,7 +12,6 @@ "platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl", "has_variants": true, "variants_name": "Hotend", - "preferred_material": "generic_pla_175", "preferred_variant_name": "0.5mm E3D (Default)" }, diff --git a/resources/definitions/gmax15plus_dual.def.json b/resources/definitions/gmax15plus_dual.def.json index e93fc7c6a0..af26a2e30a 100644 --- a/resources/definitions/gmax15plus_dual.def.json +++ b/resources/definitions/gmax15plus_dual.def.json @@ -12,7 +12,6 @@ "platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl", "has_variants": true, "variants_name": "Hotend", - "preferred_material": "generic_pla_175", "preferred_variant_name": "0.5mm E3D (Default)", "machine_extruder_trains": { "0": "gmax15plus_dual_extruder_0", diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json index 26692f8486..2699a6c7d7 100644 --- a/resources/definitions/helloBEEprusa.def.json +++ b/resources/definitions/helloBEEprusa.def.json @@ -9,7 +9,6 @@ "platform": "BEEVERYCREATIVE-helloBEEprusa.stl", "platform_offset": [-226, -75, -196], "file_formats": "text/x-gcode", - "preferred_material": "generic_pla_175", "machine_extruder_trains": { "0": "hBp_extruder_left", @@ -53,4 +52,4 @@ "retraction_speed": { "default_value": 15.0}, "retraction_amount": { "default_value": 1.5} } -} +} \ No newline at end of file diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index 42bf61f388..b234e4b2cd 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -9,7 +9,6 @@ "platform": "imade3d_jellybox_platform.stl", "platform_offset": [ 0, -0.3, 0], "file_formats": "text/x-gcode", - "preferred_material": "generic_pla_175", "preferred_variant_name": "0.4 mm", "preferred_quality_type": "fast", "has_materials": true, diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index 8a9402b332..7fdee30272 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -7,8 +7,7 @@ "author": "Ultimaker", "manufacturer": "Fracktal", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index 77aa5ab667..3d690990ce 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -7,8 +7,7 @@ "author": "Ultimaker", "manufacturer": "MakerBot", "file_formats": "application/x3g", - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index 855fe58cd2..a3f4f81ecf 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -11,7 +11,6 @@ "platform": "malyan_m200_platform.stl", "has_machine_quality": true, "has_materials": true, - "preferred_material": "generic_pla_175", "preferred_quality_type": "normal", "supports_usb_connection": true, "visible": true, diff --git a/resources/definitions/mankati_fullscale_xt_plus.def.json b/resources/definitions/mankati_fullscale_xt_plus.def.json index 39b3d018bf..15ba889efc 100644 --- a/resources/definitions/mankati_fullscale_xt_plus.def.json +++ b/resources/definitions/mankati_fullscale_xt_plus.def.json @@ -7,8 +7,7 @@ "author": "RBC", "manufacturer": "Mankati", "file_formats": "text/x-gcode", - "platform": "mankati_fullscale_xt_plus_platform.stl", - "preferred_material": "generic_pla_175" + "platform": "mankati_fullscale_xt_plus_platform.stl" }, "overrides": { "machine_name": { "default_value": "Mankati Fullscale XT Plus" }, diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index 471385cc7c..3238583ceb 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -7,7 +7,6 @@ "author": "Ultimaker", "manufacturer": "ORD Solutions", "file_formats": "text/x-gcode", - "preferred_material": "generic_pla_175", "machine_extruder_trains": { "0": "ord_extruder_0", diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index 3f98aff798..36ef93e60c 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -7,8 +7,7 @@ "author": "Chris Pearson", "manufacturer": "Printrbot", "file_formats": "text/x-gcode", - "platform": "printrbot_play.stl", - "preferred_material": "generic_pla_175" + "platform": "printrbot_play.stl" }, "overrides": { diff --git a/resources/definitions/printrbot_simple.def.json b/resources/definitions/printrbot_simple.def.json index 52472fd743..7c86617ce5 100644 --- a/resources/definitions/printrbot_simple.def.json +++ b/resources/definitions/printrbot_simple.def.json @@ -8,8 +8,7 @@ "manufacturer": "PrintrBot", "platform": "printrbot_simple_metal_platform.stl", "platform_offset": [0, -3.45, 0], - "file_formats": "text/x-gcode", - "preferred_material": "generic_pla_175" + "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/printrbot_simple_extended.def.json b/resources/definitions/printrbot_simple_extended.def.json index 9463af5554..95395efb23 100644 --- a/resources/definitions/printrbot_simple_extended.def.json +++ b/resources/definitions/printrbot_simple_extended.def.json @@ -8,8 +8,7 @@ "manufacturer": "PrintrBot", "platform": "printrbot_simple_metal_upgrade.stl", "platform_offset": [0, -0.3, 0], - "file_formats": "text/x-gcode", - "preferred_material": "generic_pla_175" + "file_formats": "text/x-gcode" }, "overrides": { diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json index b70e2ab1dc..e58eb4d903 100644 --- a/resources/definitions/prusa_i3_mk2.def.json +++ b/resources/definitions/prusa_i3_mk2.def.json @@ -9,8 +9,7 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "prusai3_platform.stl", - "has_materials": true, - "preferred_material": "generic_pla_175" + "has_materials": true }, "overrides": { diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index c1f5780270..02d3562b41 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -12,8 +12,7 @@ "0": "punchtec_connect_xl_extruder_0", "1": "punchtec_connect_xl_extruder_1" }, - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index 21673e0010..97b0ebd276 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -7,8 +7,7 @@ "author": "Ultimaker", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index b5c2ae87ce..46c22bfa57 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -7,8 +7,7 @@ "author": "Ultimaker", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index 4b18521319..872cc3e6f4 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -7,8 +7,7 @@ "author": "Ultimaker", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index 44e5e7e96a..56fb8284c0 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -7,8 +7,7 @@ "author": "Ultimaker", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index 1c87e4575f..b179779c59 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -7,8 +7,7 @@ "author": "Ultimaker", "manufacturer": "Robo 3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 11833b7841..20bc96358d 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -10,7 +10,6 @@ "platform": "tam_series1.stl", "platform_offset": [-580.0, -6.23, 253.5], "has_materials": false, - "preferred_material": "generic_pla_175", "supported_actions":["UpgradeFirmware"] }, "overrides": { diff --git a/resources/definitions/zone3d_printer.def.json b/resources/definitions/zone3d_printer.def.json index b7f852054a..bac8968951 100644 --- a/resources/definitions/zone3d_printer.def.json +++ b/resources/definitions/zone3d_printer.def.json @@ -7,8 +7,7 @@ "author": "Ultimaker", "manufacturer": "Unknown", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "platform_offset": [ 0, 0, 0] }, "overrides": { diff --git a/resources/extruders/punchtec_connect_xl_extruder_0.def.json b/resources/extruders/punchtec_connect_xl_extruder_left.def.json similarity index 100% rename from resources/extruders/punchtec_connect_xl_extruder_0.def.json rename to resources/extruders/punchtec_connect_xl_extruder_left.def.json diff --git a/resources/extruders/punchtec_connect_xl_extruder_1.def.json b/resources/extruders/punchtec_connect_xl_extruder_right.def.json similarity index 100% rename from resources/extruders/punchtec_connect_xl_extruder_1.def.json rename to resources/extruders/punchtec_connect_xl_extruder_right.def.json