JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360)

2025-08-06 13:34:01 -06:00 · 2016-09-13 16:44:55 +02:00 · 2016-09-13 16:44:55 +02:00 · 9cd6a8c1ae
commit 9cd6a8c1ae
parent bab9e8a28a
27 changed files with 36 additions and 0 deletions
--- a/resources/definitions/bq_hephestos.def.json
+++ b/resources/definitions/bq_hephestos.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "BQ Prusa i3 Hephestos" },
        "machine_start_gcode": {
            "default_value": "; -- 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/s\n; -- end of START GCODE --"
        },
--- a/resources/definitions/bq_hephestos_2.def.json
+++ b/resources/definitions/bq_hephestos_2.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "BQ Hephestos 2" },
        "machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature} ; Heat up extruder while leveling\nM800 ; Custom GCODE to fire start print procedure\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" },
        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801        ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" },
        "machine_width": { "default_value": 210 },
--- a/resources/definitions/bq_hephestos_xl.def.json
+++ b/resources/definitions/bq_hephestos_xl.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "BQ Prusa i3 Hephestos XL" },
        "machine_start_gcode": {
            "default_value": "; -- 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/s\n; -- end of START GCODE --"
        },
--- a/resources/definitions/bq_witbox.def.json
+++ b/resources/definitions/bq_witbox.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "BQ Witbox" },
        "machine_start_gcode": {
            "default_value": "; -- 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/s\n; -- end of START GCODE --"
        },
--- a/resources/definitions/bq_witbox_2.def.json
+++ b/resources/definitions/bq_witbox_2.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "BQ Witbox 2" },
        "machine_start_gcode": {
            "default_value": "; -- START GCODE --\nM800        ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --"
        },
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@ -29,6 +29,16 @@
            "icon": "category_machine",
            "children":
            {
+                "machine_name":
+                {
+                    "label": "Machine Type",
+                    "description": "The name of your 3D printer model.",
+                    "default_value": "Unknown",
+                    "type": "str",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": false
+                },
                "machine_show_variants":
                {
                    "label": "Show machine variants",
--- a/resources/definitions/grr_neo.def.json
+++ b/resources/definitions/grr_neo.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "German RepRap Neo" },
        "machine_width": {
            "default_value": 150
        },
--- a/resources/definitions/innovo_inventor.def.json
+++ b/resources/definitions/innovo_inventor.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Innovo INVENTOR" },
        "machine_width": {
            "default_value": 340
        },
--- a/resources/definitions/m180.def.json
+++ b/resources/definitions/m180.def.json
@ -12,6 +12,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Malyan M180" },
        "machine_width": {
            "default_value": 230
        },
--- a/resources/definitions/maker_starter.def.json
+++ b/resources/definitions/maker_starter.def.json
@ -13,6 +13,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "3DMaker Starter" },
        "machine_width": {
            "default_value": 210
        },
--- a/resources/definitions/mankati_fullscale_xt_plus.def.json
+++ b/resources/definitions/mankati_fullscale_xt_plus.def.json
@ -12,6 +12,7 @@
        "platform": "mankati_fullscale_xt_plus_platform.stl"
    },
    "overrides": {
+        "machine_name": { "default_value": "Mankati Fullscale XT Plus" },
        "machine_width": { "default_value": 260 },
        "machine_depth": { "default_value": 260 },
        "machine_height": { "default_value": 300 },
--- a/resources/definitions/mendel90.def.json
+++ b/resources/definitions/mendel90.def.json
@ -19,6 +19,7 @@
    ],

    "overrides": {
+        "machine_name": { "default_value": "Mendel90" },
        "machine_start_gcode": {
            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\nM107 ;start with the fan off\nG1 X90 Y200 F6000 ;go to the middle of the front\nG1 Z0.05 ;close to the bed\nG1 Z0.3 ;lift Z\n"
        },
--- a/resources/definitions/printrbot_simple.def.json
+++ b/resources/definitions/printrbot_simple.def.json
@ -13,6 +13,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Printrbot Simple" },
        "machine_heated_bed": { "default_value": false },
        "machine_width": { "default_value": 150 },
        "machine_height": { "default_value": 150 },
--- a/resources/definitions/prusa_i3.def.json
+++ b/resources/definitions/prusa_i3.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Prusa i3" },
        "machine_heated_bed": {
            "default_value": true
        },
--- a/resources/definitions/prusa_i3_mk2.def.json
+++ b/resources/definitions/prusa_i3_mk2.def.json
@ -15,6 +15,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Prusa i3 Mk2" },
        "machine_heated_bed": { "default_value": true },
        "machine_width": { "default_value": 250 },
        "machine_height": { "default_value": 200 },
--- a/resources/definitions/prusa_i3_xl.def.json
+++ b/resources/definitions/prusa_i3_xl.def.json
@ -14,6 +14,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Prusa i3 xl" },
        "machine_heated_bed": {
            "default_value": true
        },
--- a/resources/definitions/rigidbot.def.json
+++ b/resources/definitions/rigidbot.def.json
@ -13,6 +13,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "RigidBot" },
        "machine_width": {
            "default_value": 254
        },
--- a/resources/definitions/rigidbot_big.def.json
+++ b/resources/definitions/rigidbot_big.def.json
@ -13,6 +13,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "RigidBotBig" },
        "machine_width": {
            "default_value": 400
        },
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@ -18,6 +18,7 @@
        "supported_actions":["UpgradeFirmware"]
    },
    "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2" },
        "machine_start_gcode" : {
            "default_value": "",
            "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG1 X10 Y0 F4000;move X/Y to min endstops\\nG28 Z0 ;move Z to bottom endstops\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\""
--- a/resources/definitions/ultimaker2_extended.def.json
+++ b/resources/definitions/ultimaker2_extended.def.json
@ -16,6 +16,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2 Extended" },
        "machine_height": {
            "default_value": 305
        }
--- a/resources/definitions/ultimaker2_extended_plus.def.json
+++ b/resources/definitions/ultimaker2_extended_plus.def.json
@ -16,6 +16,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2 Extended+" },
        "machine_height": {
            "default_value": 305
        }
--- a/resources/definitions/ultimaker2_go.def.json
+++ b/resources/definitions/ultimaker2_go.def.json
@ -17,6 +17,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2 Go" },
        "machine_width": {
            "default_value": 120
        },
--- a/resources/definitions/ultimaker2_plus.def.json
+++ b/resources/definitions/ultimaker2_plus.def.json
@ -20,6 +20,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2+" },
        "speed_infill": {
            "value": "speed_print"
        },
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@ -18,6 +18,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Ultimaker Original" },
        "machine_width": {
            "default_value": 205
        },
--- a/resources/definitions/ultimaker_original_dual.def.json
+++ b/resources/definitions/ultimaker_original_dual.def.json
@ -23,6 +23,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Ultimaker Original" },
        "machine_width": {
            "default_value": 205
        },
--- a/resources/definitions/ultimaker_original_plus.def.json
+++ b/resources/definitions/ultimaker_original_plus.def.json
@ -17,6 +17,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Ultimaker Original+" },
        "machine_heated_bed": {
            "default_value": true
        },
--- a/resources/definitions/uniqbot_one.def.json
+++ b/resources/definitions/uniqbot_one.def.json
@ -12,6 +12,7 @@
    },

    "overrides": {
+        "machine_name": { "default_value": "Uniqbot" },
        "machine_heated_bed": {
            "default_value": false
        },