From 066ccc4e51a4d6398350f158c155995e604ec85e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 11 Nov 2016 17:10:23 +0100 Subject: [PATCH] Remove superfluous disabling of prime location settings These are already disabled in the definitions of fdmprinter and fdmextruder. It doesn't need to be disabled again. Contributes to issue CURA-2625. --- resources/definitions/ultimaker3.def.json | 2 -- .../extruders/ultimaker3_extended_extruder_left.def.json | 6 +++--- .../extruders/ultimaker3_extended_extruder_right.def.json | 6 +++--- resources/extruders/ultimaker3_extruder_left.def.json | 6 +++--- resources/extruders/ultimaker3_extruder_right.def.json | 6 +++--- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 653185b9ca..342c5c4a8e 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -74,8 +74,6 @@ "prime_tower_position_x": { "default_value": 175 }, "prime_tower_position_y": { "default_value": 179 }, - "extruder_prime_pos_x": { "enabled": false }, - "extruder_prime_pos_y": { "enabled": false }, "print_sequence": {"enabled": false}, "acceleration_enabled": { "value": "True" }, diff --git a/resources/extruders/ultimaker3_extended_extruder_left.def.json b/resources/extruders/ultimaker3_extended_extruder_left.def.json index 918d544fd9..81b5e5c1a2 100644 --- a/resources/extruders/ultimaker3_extended_extruder_left.def.json +++ b/resources/extruders/ultimaker3_extended_extruder_left.def.json @@ -23,8 +23,8 @@ "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 207 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": 170, "enabled": false }, - "extruder_prime_pos_y": { "default_value": 6, "enabled": false }, - "extruder_prime_pos_z": { "default_value": 2, "enabled": false } + "extruder_prime_pos_x": { "default_value": 170 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 } } } diff --git a/resources/extruders/ultimaker3_extended_extruder_right.def.json b/resources/extruders/ultimaker3_extended_extruder_right.def.json index 130f31deaa..c98ad46c52 100644 --- a/resources/extruders/ultimaker3_extended_extruder_right.def.json +++ b/resources/extruders/ultimaker3_extended_extruder_right.def.json @@ -23,8 +23,8 @@ "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 189 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 182, "enabled": false }, - "extruder_prime_pos_y": { "default_value": 6, "enabled": false }, - "extruder_prime_pos_z": { "default_value": 2, "enabled": false } + "extruder_prime_pos_x": { "default_value": 182 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 } } } diff --git a/resources/extruders/ultimaker3_extruder_left.def.json b/resources/extruders/ultimaker3_extruder_left.def.json index 7e7b77fcb6..95407726cf 100644 --- a/resources/extruders/ultimaker3_extruder_left.def.json +++ b/resources/extruders/ultimaker3_extruder_left.def.json @@ -23,8 +23,8 @@ "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 207 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": 170, "enabled": false }, - "extruder_prime_pos_y": { "default_value": 6, "enabled": false }, - "extruder_prime_pos_z": { "default_value": 2, "enabled": false } + "extruder_prime_pos_x": { "default_value": 170 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 } } } diff --git a/resources/extruders/ultimaker3_extruder_right.def.json b/resources/extruders/ultimaker3_extruder_right.def.json index ff616572ee..564ffc599c 100644 --- a/resources/extruders/ultimaker3_extruder_right.def.json +++ b/resources/extruders/ultimaker3_extruder_right.def.json @@ -23,8 +23,8 @@ "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 189 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 182, "enabled": false }, - "extruder_prime_pos_y": { "default_value": 6, "enabled": false }, - "extruder_prime_pos_z": { "default_value": 2, "enabled": false } + "extruder_prime_pos_x": { "default_value": 182 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 } } }