From d5be43d45ddf2f6a986e9399dd64bf522c8aabe4 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 20 Jul 2017 15:42:04 +0200 Subject: [PATCH] roofing: inherit from topbottom (CURA-3940) --- resources/definitions/fdmprinter.def.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 27fd838aa6..6f46d62c66 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -709,7 +709,7 @@ "maximum_value_warning": "2 * machine_nozzle_size", "default_value": 0.4, "type": "float", - "value": "line_width", + "value": "skin_line_width", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, "enabled": "roofing_layer_count > 0 and top_layers > 0" @@ -952,6 +952,7 @@ "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.", "type": "optional_extruder", "default_value": "-1", + "value": "top_bottom_extruder_nr", "settable_per_mesh": true, "settable_per_extruder": false, "settable_per_meshgroup": true, @@ -983,6 +984,7 @@ "zigzag": "Zig Zag" }, "default_value": "lines", + "value": "top_bottom_pattern", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, "enabled": "roofing_layer_count > 0 and top_layers > 0" @@ -993,6 +995,7 @@ "description": "A list of integer line directions to use when the roofing layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", "type": "[int]", "default_value": "[ ]", + "value": "skin_angles", "enabled": "roofing_pattern != 'concentric'", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true @@ -2083,7 +2086,7 @@ "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value_warning": "150", "default_value": 25, - "value": "speed_print / 60 * 25", + "value": "speed_topbottom", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, "enabled": "roofing_layer_count > 0 and top_layers > 0" @@ -2438,7 +2441,7 @@ "minimum_value_warning": "100", "maximum_value_warning": "10000", "default_value": 3000, - "value": "acceleration_print", + "value": "acceleration_topbottom", "enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true @@ -2741,7 +2744,7 @@ "minimum_value": "0.1", "maximum_value_warning": "50", "default_value": 20, - "value": "jerk_print", + "value": "jerk_topbottom", "enabled": "resolveOrValue('jerk_enabled') and roofing_layer_count > 0 and top_layers > 0", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true