From 9f34e06cb684b04381a81b214b37adcc8463320a Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 20 Aug 2016 14:31:18 +0200 Subject: [PATCH] Add prime tower and extruder switch position CURA-1774 --- .../definitions/ultimaker_original_dual.def.json | 14 ++++++++++++-- .../ultimaker_original_dual_left.def.json | 11 +++++++++-- .../ultimaker_original_dual_right.def.json | 11 +++++++++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 04c8aadcc9..f1c80680c3 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -70,7 +70,17 @@ "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, - "machine_extruder_count": { "default_value": 2 }, - "print_sequence": {"enabled": false} + "machine_extruder_count": { + "default_value": 2 + }, + "print_sequence": { + "enabled": false + }, + "prime_tower_position_x": { + "default_value": 185 + }, + "prime_tower_position_y": { + "default_value": 175 + } } } diff --git a/resources/extruders/ultimaker_original_dual_left.def.json b/resources/extruders/ultimaker_original_dual_left.def.json index 51268dd8b7..1bbb6f9035 100644 --- a/resources/extruders/ultimaker_original_dual_left.def.json +++ b/resources/extruders/ultimaker_original_dual_left.def.json @@ -1,6 +1,6 @@ { "id": "ultimaker_original_dual_left", - "version": 2, + "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", "metadata": { @@ -14,6 +14,13 @@ "maximum_value": "1" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 185 }, + "machine_extruder_start_pos_y": { "default_value": 155 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 185 }, + "machine_extruder_end_pos_y": { "default_value": 155 } } } diff --git a/resources/extruders/ultimaker_original_dual_right.def.json b/resources/extruders/ultimaker_original_dual_right.def.json index 9a0cd089fe..97d2217326 100644 --- a/resources/extruders/ultimaker_original_dual_right.def.json +++ b/resources/extruders/ultimaker_original_dual_right.def.json @@ -1,6 +1,6 @@ { "id": "ultimaker_original_dual_right", - "version": 2, + "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", "metadata": { @@ -14,6 +14,13 @@ "maximum_value": "1" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 21.6 } + "machine_nozzle_offset_y": { "default_value": 21.6 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 213 }, + "machine_extruder_start_pos_y": { "default_value": 189 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 213 }, + "machine_extruder_end_pos_y": { "default_value": 189 } } }