From 50d3ba9fbe26e7869ae4f161c7eae9c7cd005440 Mon Sep 17 00:00:00 2001 From: maukcc Date: Wed, 12 Jul 2017 13:43:54 +0200 Subject: [PATCH 1/2] Cartesio extruders start positions Cartesio extruders start and end positions added --- resources/definitions/cartesio.def.json | 1 + resources/extruders/cartesio_extruder_0.def.json | 13 ++++++++++--- resources/extruders/cartesio_extruder_1.def.json | 13 ++++++++++--- resources/extruders/cartesio_extruder_2.def.json | 13 ++++++++++--- resources/extruders/cartesio_extruder_3.def.json | 13 ++++++++++--- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index d065d6a7c6..bbc62bdf75 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -50,6 +50,7 @@ "prime_tower_wall_thickness": { "resolve": 0.7 }, "prime_tower_position_x": { "default_value": 50 }, "prime_tower_position_y": { "default_value": 150 }, + "prime_blob_enable": { "default_value": false }, "machine_max_feedrate_z": { "default_value": 20 }, "machine_disallowed_areas": { "default_value": [ [[215, 135], [-215, 135], [-215, 75], [215, 75]] diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index 9b25b366f7..4b4c3f2689 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,10 +16,17 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_0\n\nM117 printing\n" + "default_value": "\n;start extruder_0\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S160\nG91\nG1 Z5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_0\nM117 temp is {material_print_temp}" - } + "default_value": "\nM104 T0 S160\n;end extruder_0\nM117 temp is {material_print_temp}\n" + }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 48 }, + "machine_extruder_start_pos_y": { "default_value": 16 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 24 }, + "machine_extruder_end_pos_y": { "default_value": 16 } } } diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index 939b1fd7c8..2fd518266d 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -16,10 +16,17 @@ "machine_nozzle_offset_x": { "default_value": 24.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_1\n\nM117 printing\n" + "default_value": "\n;start extruder_1\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T1 S160\nG91\nG1 Z5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_1\n" - } + "default_value": "\nM104 T1 S160\n;end extruder_1\n" + }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 24 }, + "machine_extruder_start_pos_y": { "default_value": 16 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 48 }, + "machine_extruder_end_pos_y": { "default_value": 16 } } } diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index c4ad94f635..6245de6103 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -16,10 +16,17 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_2\n\nM117 printing\n" + "default_value": "\n;start extruder_2\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T2 S160\nG91\nG1 Z5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_2\n" - } + "default_value": "\nM104 T2 S160\n;end extruder_2\n" + }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 24 }, + "machine_extruder_start_pos_y": { "default_value": 309 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 48 }, + "machine_extruder_end_pos_y": { "default_value": 309 } } } diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index 589942fc6d..f5e6527907 100644 --- a/resources/extruders/cartesio_extruder_3.def.json +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -16,10 +16,17 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_3\n\nM117 printing\n" + "default_value": "\n;start extruder_3\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T3 S160\nG91\nG1 Z5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_3\n" - } + "default_value": "\nM104 T3 S160\n;end extruder_3\n" + }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 48 }, + "machine_extruder_start_pos_y": { "default_value": 309 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 24 }, + "machine_extruder_end_pos_y": { "default_value": 309} } } From 2928b1d5e07c17a66e8e3013a7b532b4d63bd8f3 Mon Sep 17 00:00:00 2001 From: maukcc Date: Wed, 12 Jul 2017 15:30:12 +0200 Subject: [PATCH 2/2] Cartesio additional extruder position updates --- resources/extruders/cartesio_extruder_0.def.json | 6 +++--- resources/extruders/cartesio_extruder_1.def.json | 6 +++--- resources/extruders/cartesio_extruder_2.def.json | 2 +- resources/extruders/cartesio_extruder_3.def.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index 4b4c3f2689..f1423f3530 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -19,14 +19,14 @@ "default_value": "\n;start extruder_0\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S160\n;end extruder_0\nM117 temp is {material_print_temp}\n" + "default_value": "\nM104 T0 S120\n;end extruder_0\nM117 temp is {material_print_temp}\n" }, "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 48 }, + "machine_extruder_start_pos_x": { "default_value": 24 }, "machine_extruder_start_pos_y": { "default_value": 16 }, "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 24 }, + "machine_extruder_end_pos_x": { "default_value": 48 }, "machine_extruder_end_pos_y": { "default_value": 16 } } } diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index 2fd518266d..402553ff96 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -19,14 +19,14 @@ "default_value": "\n;start extruder_1\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T1 S160\n;end extruder_1\n" + "default_value": "\nM104 T1 S120\n;end extruder_1\n" }, "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 24 }, + "machine_extruder_start_pos_x": { "default_value": 48 }, "machine_extruder_start_pos_y": { "default_value": 16 }, "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 48 }, + "machine_extruder_end_pos_x": { "default_value": 24 }, "machine_extruder_end_pos_y": { "default_value": 16 } } } diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index 6245de6103..e8f47772cb 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -19,7 +19,7 @@ "default_value": "\n;start extruder_2\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T2 S160\n;end extruder_2\n" + "default_value": "\nM104 T2 S120\n;end extruder_2\n" }, "machine_extruder_start_pos_abs": { "default_value": true }, diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index f5e6527907..a3e435470a 100644 --- a/resources/extruders/cartesio_extruder_3.def.json +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -19,7 +19,7 @@ "default_value": "\n;start extruder_3\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T3 S160\n;end extruder_3\n" + "default_value": "\nM104 T3 S120\n;end extruder_3\n" }, "machine_extruder_start_pos_abs": { "default_value": true },