From 942539981b8d9b9464916d1546b2bebc45cbc2c6 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 15 Jul 2016 13:27:50 +0200 Subject: [PATCH 1/2] JSON fix: moved prime location to category platform_adhesion (CURA-1816) --- resources/definitions/fdmextruder.def.json | 34 +++++++++------ resources/definitions/fdmprinter.def.json | 48 +++++++++++----------- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 4e3ee0a84f..f602441ff3 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -145,6 +145,28 @@ "settable_per_meshgroup": false, "settable_globally": false }, + "extruder_prime_pos_z": + { + "label": "Extruder Prime Z Position", + "description": "The Z coordinate of the position where the nozzle primes at the start of printing.", + "type": "float", + "unit": "mm", + "default_value": 0, + "minimum_value_warning": "0", + "maximum_value_warning": "machine_height", + "settable_per_mesh": false, + "settable_per_extruder": true + } + } + }, + "platform_adhesion": + { + "label": "Platform Adhesion", + "type": "category", + "icon": "category_adhesion", + "description": "Adhesion", + "children": + { "extruder_prime_pos_x": { "label": "Extruder Prime X Position", @@ -168,18 +190,6 @@ "maximum_value_warning": "machine_depth", "settable_per_mesh": false, "settable_per_extruder": true - }, - "extruder_prime_pos_z": - { - "label": "Extruder Prime Z Position", - "description": "The Z coordinate of the position where the nozzle primes at the start of printing.", - "type": "float", - "unit": "mm", - "default_value": 0, - "minimum_value_warning": "0", - "maximum_value_warning": "machine_height", - "settable_per_mesh": false, - "settable_per_extruder": true } } } diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 059e2a25e2..7894507645 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -326,30 +326,6 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, - "extruder_prime_pos_x": - { - "label": "Extruder Prime X Position", - "description": "The X coordinate of the position where the nozzle primes at the start of printing.", - "type": "float", - "unit": "mm", - "default_value": 0, - "minimum_value_warning": "0", - "maximum_value_warning": "machine_width", - "settable_per_mesh": false, - "settable_per_extruder": true - }, - "extruder_prime_pos_y": - { - "label": "Extruder Prime Y Position", - "description": "The Y coordinate of the position where the nozzle primes at the start of printing.", - "type": "float", - "unit": "mm", - "default_value": 0, - "minimum_value_warning": "0", - "maximum_value_warning": "machine_depth", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "extruder_prime_pos_z": { "label": "Extruder Prime Z Position", @@ -2448,6 +2424,30 @@ "description": "Adhesion", "children": { + "extruder_prime_pos_x": + { + "label": "Extruder Prime X Position", + "description": "The X coordinate of the position where the nozzle primes at the start of printing.", + "type": "float", + "unit": "mm", + "default_value": 0, + "minimum_value_warning": "0", + "maximum_value_warning": "machine_width", + "settable_per_mesh": false, + "settable_per_extruder": true + }, + "extruder_prime_pos_y": + { + "label": "Extruder Prime Y Position", + "description": "The Y coordinate of the position where the nozzle primes at the start of printing.", + "type": "float", + "unit": "mm", + "default_value": 0, + "minimum_value_warning": "0", + "maximum_value_warning": "machine_depth", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "adhesion_type": { "label": "Platform Adhesion Type", From a52095df0e5840c3fc5073b6eb95c1a0d791e490 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 15 Jul 2016 13:32:43 +0200 Subject: [PATCH 2/2] JSON fix: disabled prime location by default (CURA-1816) --- resources/definitions/fdmextruder.def.json | 6 ++++-- resources/definitions/fdmprinter.def.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index f602441ff3..7ce44b77b0 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -177,7 +177,8 @@ "minimum_value_warning": "machine_nozzle_offset_x", "maximum_value_warning": "machine_width", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "enabled": false }, "extruder_prime_pos_y": { @@ -189,7 +190,8 @@ "minimum_value_warning": "machine_nozzle_offset_y", "maximum_value_warning": "machine_depth", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "enabled": false } } } diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7894507645..8833c175f3 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2434,7 +2434,8 @@ "minimum_value_warning": "0", "maximum_value_warning": "machine_width", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "enabled": false }, "extruder_prime_pos_y": { @@ -2446,7 +2447,8 @@ "minimum_value_warning": "0", "maximum_value_warning": "machine_depth", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "enabled": false }, "adhesion_type": {