From 268a9c9bac001de91016a1ec30e4dd537733300d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 21 Apr 2017 12:38:44 +0200 Subject: [PATCH 1/4] Add priming_enabled option into fdm_printer CURA-3634 --- resources/definitions/fdmprinter.def.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ca05191185..5e9e692851 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3290,6 +3290,16 @@ "description": "Adhesion", "children": { + "prime_enable": + { + "label": "Enable Prime", + "description": "Whether to prime the filament before printing.", + "type": "bool", + "resolve": "any(extruderValues('prime_enable'))", + "default_value": true, + "settable_per_mesh": false, + "settable_per_extruder": true + }, "extruder_prime_pos_x": { "label": "Extruder Prime X Position", From 319f5f73fe5b72ba4c55452415280dd5926ed26f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 8 May 2017 08:12:46 +0200 Subject: [PATCH 2/4] Rename "prime_enable" to "prime_poop_enable" CURA-3634 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5e9e692851..b800d4811b 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3290,12 +3290,12 @@ "description": "Adhesion", "children": { - "prime_enable": + "prime_poop_enable": { "label": "Enable Prime", "description": "Whether to prime the filament before printing.", "type": "bool", - "resolve": "any(extruderValues('prime_enable'))", + "resolve": "any(extruderValues('prime_poop_enable'))", "default_value": true, "settable_per_mesh": false, "settable_per_extruder": true From 887a9d377a477db0cf11e37e3bbcfc17eaedf7ef Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 8 May 2017 10:13:55 +0200 Subject: [PATCH 3/4] Use setting name "Prime Blob" CURA-3634 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index b800d4811b..96d4619a3b 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3292,8 +3292,8 @@ { "prime_poop_enable": { - "label": "Enable Prime", - "description": "Whether to prime the filament before printing.", + "label": "Enable Prime Blob", + "description": "Whether to prime the filament with a blob before printing.", "type": "bool", "resolve": "any(extruderValues('prime_poop_enable'))", "default_value": true, From 48862ed2b2dbe64f839d68f6f61f147c9d065939 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 8 May 2017 13:13:31 +0200 Subject: [PATCH 4/4] Change to "prime_blob_enable" and update description CURA-3634 --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 96d4619a3b..b8968e57f6 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3290,12 +3290,12 @@ "description": "Adhesion", "children": { - "prime_poop_enable": + "prime_blob_enable": { "label": "Enable Prime Blob", - "description": "Whether to prime the filament with a blob before printing.", + "description": "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in those cases, you can also turn this setting off to let Brim/Skirt do the priming to save some time.", "type": "bool", - "resolve": "any(extruderValues('prime_poop_enable'))", + "resolve": "any(extruderValues('prime_blob_enable'))", "default_value": true, "settable_per_mesh": false, "settable_per_extruder": true