Browse Source

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

Tim Kuipers 8 years ago
parent
commit
9cd6a8c1ae

+ 1 - 0
resources/definitions/bq_hephestos.def.json

@@ -14,6 +14,7 @@
     },
     },
 
 
     "overrides": {
     "overrides": {
+        "machine_name": { "default_value": "BQ Prusa i3 Hephestos" },
         "machine_start_gcode": {
         "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 --"
             "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 --"
         },
         },

+ 1 - 0
resources/definitions/bq_hephestos_2.def.json

@@ -14,6 +14,7 @@
     },
     },
 
 
     "overrides": {
     "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_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_end_gcode": { "default_value": "; -- END GCODE --\nM801        ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" },
         "machine_width": { "default_value": 210 },
         "machine_width": { "default_value": 210 },

+ 1 - 0
resources/definitions/bq_hephestos_xl.def.json

@@ -14,6 +14,7 @@
     },
     },
 
 
     "overrides": {
     "overrides": {
+        "machine_name": { "default_value": "BQ Prusa i3 Hephestos XL" },
         "machine_start_gcode": {
         "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 --"
             "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 --"
         },
         },

+ 1 - 0
resources/definitions/bq_witbox.def.json

@@ -14,6 +14,7 @@
     },
     },
 
 
     "overrides": {
     "overrides": {
+        "machine_name": { "default_value": "BQ Witbox" },
         "machine_start_gcode": {
         "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 --"
             "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 --"
         },
         },

+ 1 - 0
resources/definitions/bq_witbox_2.def.json

@@ -14,6 +14,7 @@
     },
     },
 
 
     "overrides": {
     "overrides": {
+        "machine_name": { "default_value": "BQ Witbox 2" },
         "machine_start_gcode": {
         "machine_start_gcode": {
             "default_value": "; -- START GCODE --\nM800        ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --"
             "default_value": "; -- START GCODE --\nM800        ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --"
         },
         },

+ 10 - 0
resources/definitions/fdmprinter.def.json

@@ -29,6 +29,16 @@
             "icon": "category_machine",
             "icon": "category_machine",
             "children":
             "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":
                 "machine_show_variants":
                 {
                 {
                     "label": "Show machine variants",
                     "label": "Show machine variants",

+ 1 - 0
resources/definitions/grr_neo.def.json

@@ -14,6 +14,7 @@
     },
     },
 
 
     "overrides": {
     "overrides": {
+        "machine_name": { "default_value": "German RepRap Neo" },
         "machine_width": {
         "machine_width": {
             "default_value": 150
             "default_value": 150
         },
         },

+ 1 - 0
resources/definitions/innovo_inventor.def.json

@@ -14,6 +14,7 @@
     },
     },
 
 
     "overrides": {
     "overrides": {
+        "machine_name": { "default_value": "Innovo INVENTOR" },
         "machine_width": {
         "machine_width": {
             "default_value": 340
             "default_value": 340
         },
         },

+ 1 - 0
resources/definitions/m180.def.json

@@ -12,6 +12,7 @@
     },
     },
 
 
     "overrides": {
     "overrides": {
+        "machine_name": { "default_value": "Malyan M180" },
         "machine_width": {
         "machine_width": {
             "default_value": 230
             "default_value": 230
         },
         },

+ 1 - 0
resources/definitions/maker_starter.def.json

@@ -13,6 +13,7 @@
     },
     },
 
 
     "overrides": {
     "overrides": {
+        "machine_name": { "default_value": "3DMaker Starter" },
         "machine_width": {
         "machine_width": {
             "default_value": 210
             "default_value": 210
         },
         },

Some files were not shown because too many files changed in this diff