Browse Source

Merge branch 'master' of https://github.com/Ultimaker/Cura

fieldOfView 8 years ago
parent
commit
3bdffd83cd
1 changed files with 23 additions and 16 deletions
  1. 23 16
      resources/definitions/fdmprinter.def.json

+ 23 - 16
resources/definitions/fdmprinter.def.json

@@ -774,7 +774,7 @@
                             "type": "float",
                             "default_value": 2,
                             "minimum_value": "0",
-                            "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == \"grid\" else (3 if infill_pattern == \"triangles\" else 1))",
+                            "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == \"grid\" else (3 if infill_pattern == \"triangles\" else (3 if infill_pattern == \"cubic\" else 1)))",
                             "settable_per_mesh": true
                         }
                     }
@@ -782,12 +782,13 @@
                 "infill_pattern":
                 {
                     "label": "Infill Pattern",
-                    "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle and concentric patterns are fully printed every layer.",
+                    "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, cubic, triangle and concentric patterns are fully printed every layer.",
                     "type": "enum",
                     "options":
                     {
                         "grid": "Grid",
                         "lines": "Lines",
+                        "cubic": "Cubic",
                         "triangles": "Triangles",
                         "concentric": "Concentric",
                         "zigzag": "Zig Zag"
@@ -1912,7 +1913,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0.5,
-                    "value": "layer_height_0",
+                    "value": "0 if adhesion_type == \"raft\" else layer_height_0",
                     "minimum_value": "0",
                     "maximum_value_warning": "10.0",
                     "settable_per_mesh": false,
@@ -2405,7 +2406,7 @@
                     "description": "If the raft is enabled, this is the extra raft area around the object which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 5,
+                    "default_value": 15,
                     "minimum_value_warning": "0",
                     "maximum_value_warning": "10",
                     "enabled": "adhesion_type == \"raft\""
@@ -2455,6 +2456,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0.1,
+                    "value": "layer_height",
                     "minimum_value": "0",
                     "maximum_value_warning": "2.0",
                     "enabled": "adhesion_type == \"raft\"",
@@ -2467,7 +2469,8 @@
                     "description": "Width of the lines in the top surface of the raft. These can be thin lines so that the top of the raft becomes smooth.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 0.3,
+                    "default_value": 0.4,
+                    "value": "line_width",
                     "minimum_value": "0.0001",
                     "maximum_value_warning": "machine_nozzle_size * 2",
                     "enabled": "adhesion_type == \"raft\"",
@@ -2480,7 +2483,7 @@
                     "description": "The distance between the raft lines for the top raft layers. The spacing should be equal to the line width, so that the surface is solid.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 0.3,
+                    "default_value": 0.4,
                     "minimum_value": "0.0001",
                     "maximum_value_warning": "5.0",
                     "enabled": "adhesion_type == \"raft\"",
@@ -2494,7 +2497,8 @@
                     "description": "Layer thickness of the middle raft layer.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 0.27,
+                    "default_value": 0.15,
+                    "value": "layer_height * 1.5",
                     "minimum_value": "0",
                     "maximum_value_warning": "5.0",
                     "enabled": "adhesion_type == \"raft\"",
@@ -2507,7 +2511,7 @@
                     "description": "Width of the lines in the middle raft layer. Making the second layer extrude more causes the lines to stick to the bed.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 1,
+                    "default_value": 0.7,
                     "value": "line_width * 2",
                     "minimum_value": "0.0001",
                     "maximum_value_warning": "machine_nozzle_size * 2",
@@ -2521,7 +2525,8 @@
                     "description": "The distance between the raft lines for the middle raft layer. The spacing of the middle should be quite wide, while being dense enough to support the top raft layers.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 1.0,
+                    "default_value": 0.9,
+                    "value": "raft_interface_line_width + 0.2",
                     "minimum_value": "0",
                     "maximum_value_warning": "15.0",
                     "enabled": "adhesion_type == \"raft\"",
@@ -2535,6 +2540,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0.3,
+                    "value": "layer_height_0 * 1.2",
                     "minimum_value": "0",
                     "maximum_value_warning": "5.0",
                     "enabled": "adhesion_type == \"raft\"",
@@ -2547,10 +2553,10 @@
                     "description": "Width of the lines in the base raft layer. These should be thick lines to assist in bed adhesion.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 1,
+                    "default_value": 0.8,
                     "minimum_value": "0.0001",
-                    "value": "line_width * 2",
-                    "maximum_value_warning": "machine_nozzle_size * 2",
+                    "value": "machine_nozzle_size * 2",
+                    "maximum_value_warning": "machine_nozzle_size * 3",
                     "enabled": "adhesion_type == \"raft\"",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -2561,7 +2567,8 @@
                     "description": "The distance between the raft lines for the base raft layer. Wide spacing makes for easy removal of the raft from the build plate.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 3.0,
+                    "default_value": 1.6,
+                    "value": "raft_base_line_width * 2",
                     "minimum_value": "0.0001",
                     "maximum_value_warning": "100",
                     "enabled": "adhesion_type == \"raft\"",
@@ -2605,12 +2612,12 @@
                             "description": "The speed at which the middle raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high.",
                             "unit": "mm/s",
                             "type": "float",
-                            "default_value": 20,
+                            "default_value": 15,
+                            "value": "raft_speed * 0.75",
                             "minimum_value": "0.1",
                             "maximum_value": "299792458000",
                             "maximum_value_warning": "150",
                             "enabled": "adhesion_type == \"raft\"",
-                            "value": "raft_speed",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         },
@@ -2862,7 +2869,7 @@
                             "type": "extruder",
                             "default_value": "0",
                             "value": "support_extruder_nr",
-                            "enabled": "support_enable",
+                            "enabled": "support_enable and support_roof_enable",
                             "settable_per_mesh": false,
                             "settable_per_extruder": false
                         }