Revert "WIP: Update and fix definition files"

This reverts commit 27a346a58beaea9de249ebf229f0979d51ad21ff.
2025-08-08 22:35:03 -06:00 · 2018-02-14 20:46:29 +01:00 · 2018-02-14 20:46:29 +01:00 · 73968e5c48
commit 73968e5c48
parent c79dd313ac
33 changed files with 18 additions and 49 deletions
--- 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
    },

--- 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"
    },

--- 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"
    },

--- 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",
--- 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",
--- 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",
--- 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":
        {
--- 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" },
--- 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": {
--- 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 },
--- 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)"
    },

--- 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",
--- 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}
    }
-}
+}
--- 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,
--- 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": {
--- 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": {
--- 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,
--- 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" },
--- 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",
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- a/resources/extruders/punchtec_connect_xl_extruder_left.def.json
+++ b/resources/extruders/punchtec_connect_xl_extruder_left.def.json
--- a/resources/extruders/punchtec_connect_xl_extruder_right.def.json
+++ b/resources/extruders/punchtec_connect_xl_extruder_right.def.json