JSON fix: made retraction_hop_only_when_collides and retraction_hop not children of retraction_hop_enabled

retraction_hop_enabled was used by the engine, so it should never become disabled
This commit is contained in:
Tim Kuipers 2016-07-28 19:52:43 +02:00
parent 34ac8cf66f
commit 27f160c220

View File

@ -1236,30 +1236,28 @@
"default_value": false, "default_value": false,
"enabled": "retraction_enable", "enabled": "retraction_enable",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true, "settable_per_extruder": true
"children": { },
"retraction_hop_only_when_collides": { "retraction_hop_only_when_collides": {
"label": "Z Hop Only Over Printed Parts", "label": "Z Hop Only Over Printed Parts",
"description": "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling.", "description": "Only perform a Z Hop when moving over printed parts which cannot be avoided by horizontal motion by Avoid Printed Parts when Traveling.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"enabled": "retraction_enable and retraction_hop_enabled and travel_avoid_other_parts", "enabled": "retraction_enable and retraction_hop_enabled and travel_avoid_other_parts",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}, },
"retraction_hop": { "retraction_hop": {
"label": "Z Hop Height", "label": "Z Hop Height",
"description": "The height difference when performing a Z Hop.", "description": "The height difference when performing a Z Hop.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 1, "default_value": 1,
"minimum_value_warning": "-0.0001", "minimum_value_warning": "-0.0001",
"maximum_value_warning": "10", "maximum_value_warning": "10",
"enabled": "retraction_enable and retraction_hop_enabled", "enabled": "retraction_enable and retraction_hop_enabled",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
}
}
}, },
"material_standby_temperature": "material_standby_temperature":
{ {