Browse Source

Merge machine_head_polygon and machine_head_with_fans_polygon defs.

There is no usecase for having both. when a definition has both,
the head is removed. when it has only head, it is renamed to
_with_fans

CURA-6522
Nino van Hooff 5 years ago
parent
commit
249a66ebd9

+ 1 - 1
resources/definitions/builder_premium_large.def.json

@@ -88,7 +88,7 @@
         "adhesion_type": { "default_value": "skirt" },
         "machine_nozzle_heat_up_speed": { "default_value": 2 },
         "machine_nozzle_cool_down_speed": { "default_value": 2 },
-        "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
+        "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
         "gantry_height": { "value": "55" },
         "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },

+ 1 - 1
resources/definitions/builder_premium_medium.def.json

@@ -88,7 +88,7 @@
         "adhesion_type": { "default_value": "skirt" },
         "machine_nozzle_heat_up_speed": { "default_value": 2 },
         "machine_nozzle_cool_down_speed": { "default_value": 2 },
-        "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
+        "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
         "gantry_height": { "value": "55" },
         "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },

+ 1 - 1
resources/definitions/builder_premium_small.def.json

@@ -87,7 +87,7 @@
         "adhesion_type": { "default_value": "skirt" },
         "machine_nozzle_heat_up_speed": { "default_value": 2 },
         "machine_nozzle_cool_down_speed": { "default_value": 2 },
-        "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
+        "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
         "gantry_height": { "value": "55" },
         "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },

+ 0 - 7
resources/definitions/creality_cr10.def.json

@@ -7,13 +7,6 @@
         "machine_width": { "default_value": 300 },
         "machine_depth": { "default_value": 300 },
         "machine_height": { "default_value": 400 },
-        "machine_head_polygon": { "default_value": [
-                [-26, 34],
-                [-26, -32],
-                [22, -32],
-                [22, 34]
-            ]
-        },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-26, 34],
                 [-26, -32],

+ 0 - 7
resources/definitions/creality_cr10max.def.json

@@ -8,13 +8,6 @@
         "machine_width": { "default_value": 450 },
         "machine_depth": { "default_value": 450 },
         "machine_height": { "default_value": 470 },
-        "machine_head_polygon": { "default_value": [
-                [-44, 34],
-                [-44, -34],
-                [18, -34],
-                [18, 34]
-            ]
-        },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-44, 34],
                 [-44, -34],

+ 0 - 7
resources/definitions/creality_cr10mini.def.json

@@ -7,13 +7,6 @@
         "machine_width": { "default_value": 300 },
         "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 300 },
-        "machine_head_polygon": { "default_value": [
-                [-26, 34],
-                [-26, -32],
-                [22, -32],
-                [22, 34]
-            ]
-        },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-26, 34],
                 [-26, -32],

+ 0 - 7
resources/definitions/creality_cr10s4.def.json

@@ -7,13 +7,6 @@
         "machine_width": { "default_value": 400 },
         "machine_depth": { "default_value": 400 },
         "machine_height": { "default_value": 400 },
-        "machine_head_polygon": { "default_value": [
-                [-26, 34],
-                [-26, -32],
-                [22, -32],
-                [22, 34]
-            ]
-        },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-26, 34],
                 [-26, -32],

+ 0 - 7
resources/definitions/creality_cr10s5.def.json

@@ -7,13 +7,6 @@
         "machine_width": { "default_value": 500 },
         "machine_depth": { "default_value": 500 },
         "machine_height": { "default_value": 500 },
-        "machine_head_polygon": { "default_value": [
-                [-26, 34],
-                [-26, -32],
-                [22, -32],
-                [22, 34]
-            ]
-        },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-26, 34],
                 [-26, -32],

+ 0 - 7
resources/definitions/creality_cr10spro.def.json

@@ -5,13 +5,6 @@
     "overrides": {
         "machine_name": { "default_value": "Creality CR-10S Pro" },
         "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
-        "machine_head_polygon": { "default_value": [
-                [-44, 34],
-                [-44, -34],
-                [18, -34],
-                [18, 34]
-            ]
-        },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-44, 34],
                 [-44, -34],

+ 0 - 7
resources/definitions/creality_cr20.def.json

@@ -7,13 +7,6 @@
         "machine_width": { "default_value": 220 },
         "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 250 },
-        "machine_head_polygon": { "default_value": [
-                [-26, 34],
-                [-26, -32],
-                [22, -32],
-                [22, 34]
-            ]
-        },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-26, 34],
                 [-26, -32],

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