From dbb472436d3c348967d750119c85764dde520bb6 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 30 Sep 2016 18:03:52 +0200 Subject: [PATCH] JSON: refine raft settings warning formulas (CURA-905) --- resources/definitions/fdmprinter.def.json | 35 ++++++++++++++--------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d1171970c5..875cee01d8 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2858,7 +2858,7 @@ "unit": "mm", "type": "float", "default_value": 15, - "minimum_value_warning": "0", + "minimum_value_warning": "raft_interface_line_width", "maximum_value_warning": "10", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "limit_to_extruder": "adhesion_extruder_nr", @@ -2873,7 +2873,7 @@ "type": "float", "default_value": 0.3, "minimum_value": "0", - "maximum_value_warning": "1.0", + "maximum_value_warning": "min(extruderValues('machine_nozzle_size'))", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": true, @@ -2914,8 +2914,9 @@ "type": "float", "default_value": 0.1, "value": "layer_height", - "minimum_value": "0", - "maximum_value_warning": "2.0", + "minimum_value": "0.001", + "minimum_value_warning": "0.04", + "maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'machine_nozzle_size')", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": true, @@ -2930,7 +2931,8 @@ "default_value": 0.4, "value": "line_width", "minimum_value": "0.0001", - "maximum_value_warning": "machine_nozzle_size * 2", + "maximum_value_warning": "extruderValue(adhesion_extruder_nr, 'machine_nozzle_size') * 0.1", + "maximum_value_warning": "extruderValue(adhesion_extruder_nr, 'machine_nozzle_size') * 2", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": true, @@ -2944,7 +2946,8 @@ "type": "float", "default_value": 0.4, "minimum_value": "0.0001", - "maximum_value_warning": "5.0", + "minimum_value_warning": "extruderValue(adhesion_extruder_nr, 'raft_surface_line_width')", + "maximum_value_warning": "extruderValue(adhesion_extruder_nr, 'raft_surface_line_width') * 3", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "value": "raft_surface_line_width", "settable_per_mesh": false, @@ -2959,8 +2962,9 @@ "type": "float", "default_value": 0.15, "value": "layer_height * 1.5", - "minimum_value": "0", - "maximum_value_warning": "5.0", + "minimum_value": "0.001", + "minimum_value_warning": "0.04", + "maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'machine_nozzle_size')", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": true, @@ -2975,7 +2979,8 @@ "default_value": 0.7, "value": "line_width * 2", "minimum_value": "0.0001", - "maximum_value_warning": "machine_nozzle_size * 2", + "minimum_value_warning": "extruderValue(adhesion_extruder_nr, 'machine_nozzle_size') * 0.5", + "maximum_value_warning": "extruderValue(adhesion_extruder_nr, 'machine_nozzle_size') * 3", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": true, @@ -2990,6 +2995,7 @@ "default_value": 0.9, "value": "raft_interface_line_width + 0.2", "minimum_value": "0", + "minimum_value_warning": "extruderValue(adhesion_extruder_nr, 'raft_interface_line_width')", "maximum_value_warning": "15.0", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, @@ -3004,8 +3010,9 @@ "type": "float", "default_value": 0.3, "value": "layer_height_0 * 1.2", - "minimum_value": "0", - "maximum_value_warning": "5.0", + "minimum_value": "0.001", + "minimum_value_warning": "0.04", + "maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'machine_nozzle_size')", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": true, @@ -3019,8 +3026,9 @@ "type": "float", "default_value": 0.8, "minimum_value": "0.0001", - "value": "machine_nozzle_size * 2", - "maximum_value_warning": "machine_nozzle_size * 3", + "value": "extruderValue(adhesion_extruder_nr, 'machine_nozzle_size') * 2", + "minimum_value_warning": "extruderValue(adhesion_extruder_nr, 'machine_nozzle_size') * 0.5", + "maximum_value_warning": "extruderValue(adhesion_extruder_nr, 'machine_nozzle_size') * 3", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false, "settable_per_extruder": true, @@ -3035,6 +3043,7 @@ "default_value": 1.6, "value": "raft_base_line_width * 2", "minimum_value": "0.0001", + "minimum_value_warning": "extruderValue(adhesion_extruder_nr, 'raft_base_line_width')", "maximum_value_warning": "100", "enabled": "resolveOrValue('adhesion_type') == 'raft'", "settable_per_mesh": false,