From 94dcacb27e743fd94f2c657489f0fc96d6eef138 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 17 Jun 2016 16:51:37 +0200 Subject: [PATCH 1/5] JSON feat: Z Hop only over printed parts and Z Hop Enable (CURA-1506) --- resources/definitions/fdmprinter.def.json | 24 ++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 433517504d..99b376611a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1012,16 +1012,34 @@ "enabled": "retraction_enable", "settable_per_mesh": true }, - "retraction_hop": { - "label": "Z Hop when Retracting", + "retraction_hop_enabled": { + "label": "Z Hop when Retracted", "description": "Whenever a retraction is done, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle from hitting the print during travel moves, reducing the chance to knock the print from the build plate.", + "type": "bool", + "default_value": false, + "enabled": "retraction_enable", + "settable_per_mesh": true, + "children": { + "retraction_hop_only_when_collides": { + "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.", + "type": "bool", + "default_value": true, + "enabled": "retraction_hop_enabled and travel_avoid_other_parts", + "settable_per_mesh": true + }, + "retraction_hop": { + "label": "Z Hop Height", + "description": "The height difference when performing a Z Hop.", "unit": "mm", "type": "float", "default_value": 0, "minimum_value_warning": "-0.0001", "maximum_value_warning": "10", - "enabled": "retraction_enable", + "enabled": "retraction_hop_enabled", "settable_per_mesh": true + } + } }, "material_standby_temperature": { From 611c88c63016395f871bd46e5547df4be97d47e1 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 17 Jun 2016 16:52:04 +0200 Subject: [PATCH 2/5] JSON fix: lil indent (CURA-1506) --- resources/definitions/fdmprinter.def.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 99b376611a..55aaad1bfa 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1028,17 +1028,17 @@ "enabled": "retraction_hop_enabled and travel_avoid_other_parts", "settable_per_mesh": true }, - "retraction_hop": { - "label": "Z Hop Height", - "description": "The height difference when performing a Z Hop.", - "unit": "mm", - "type": "float", - "default_value": 0, - "minimum_value_warning": "-0.0001", - "maximum_value_warning": "10", - "enabled": "retraction_hop_enabled", - "settable_per_mesh": true - } + "retraction_hop": { + "label": "Z Hop Height", + "description": "The height difference when performing a Z Hop.", + "unit": "mm", + "type": "float", + "default_value": 0, + "minimum_value_warning": "-0.0001", + "maximum_value_warning": "10", + "enabled": "retraction_hop_enabled", + "settable_per_mesh": true + } } }, "material_standby_temperature": From 0f92f78916215f7dcf171ffb3b073e79956c435b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 17 Jun 2016 17:26:23 +0200 Subject: [PATCH 3/5] JSON fix: z hop inheritance functions and default value (CURA-1506) --- resources/definitions/fdmprinter.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 55aaad1bfa..911d81031f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1024,8 +1024,8 @@ "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.", "type": "bool", - "default_value": true, - "enabled": "retraction_hop_enabled and travel_avoid_other_parts", + "default_value": false, + "enabled": "retraction_enable and retraction_hop_enabled and travel_avoid_other_parts", "settable_per_mesh": true }, "retraction_hop": { @@ -1033,10 +1033,10 @@ "description": "The height difference when performing a Z Hop.", "unit": "mm", "type": "float", - "default_value": 0, + "default_value": 1, "minimum_value_warning": "-0.0001", "maximum_value_warning": "10", - "enabled": "retraction_hop_enabled", + "enabled": "retraction_enable and retraction_hop_enabled", "settable_per_mesh": true } } From ccd97f199487c80c8d48cd59e6d615df6b1a1c4b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 24 Jun 2016 13:29:40 +0200 Subject: [PATCH 4/5] JSON feat: (bool) retraction_hop_after_extruder_switch (CURA-1506 CURA-1061) --- resources/definitions/fdmprinter.def.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8cec9cfeb4..eb9157a92b 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1123,6 +1123,15 @@ "enabled": "retraction_enable", "settable_per_mesh": false, "settable_per_extruder": true + }, + "retraction_hop_after_extruder_switch": { + "label": "Z Hop After Extruder Switch", + "description": "After the machine switched from one extruder to the other, the build plate is lowered to create clearance between the nozzle and the print. This prevents the nozzle from leaving oozed material on the outside of a print.", + "type": "bool", + "default_value": true, + "enabled": "retraction_hop_enabled", + "settable_per_mesh": false, + "settable_per_extruder": true } } }, From 4eaf09e982e29f79d3476053d4ecd06ca678e404 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 24 Jun 2016 15:22:57 +0200 Subject: [PATCH 5/5] JSON fix: the height of the extruder switch z hop is now equal to the zhop height (CURA-1506 CURA-1061) making the height configurable is quite difficult with how retraction currently works and there is not a lot of added value --- resources/definitions/fdmprinter.def.json | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index eb9157a92b..8ca818d927 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1111,19 +1111,6 @@ } } }, - "switch_extruder_retraction_hop": - { - "label": "Nozzle Switch Z Hop", - "description": "Whenever the machine switches to another nozzle, the build plate is lowered to create clearance between the nozzle and the print. It prevents the nozzle which has been unused for a while from oozing material on the outside of the print.", - "type": "float", - "unit": "mm", - "default_value": 1, - "minimum_value_warning": "-0.0001", - "maximum_value_warning": "10", - "enabled": "retraction_enable", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "retraction_hop_after_extruder_switch": { "label": "Z Hop After Extruder Switch", "description": "After the machine switched from one extruder to the other, the build plate is lowered to create clearance between the nozzle and the print. This prevents the nozzle from leaving oozed material on the outside of a print.",