From 92af9caadd2f83bf9f96e1885710f99fb37de741 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 29 Mar 2017 15:24:40 +0200 Subject: [PATCH 01/43] Update XmlMaterialProfile.py added retraction_prime_speed as a material specific value. This way, if a material needs a specific setting, the value set in the material xml file will be used. Probably a good idea to have this value added in the front end as well, but for now this will do. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 7dc565ce26..0ab72e9712 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -564,7 +564,8 @@ class XmlMaterialProfile(InstanceContainer): "processing temperature graph": "material_flow_temp_graph", "print cooling": "cool_fan_speed", "retraction amount": "retraction_amount", - "retraction speed": "retraction_speed" + "retraction speed": "retraction_speed", + "retraction prime speed": "retraction_prime_speed" } __unmapped_settings = [ "hardware compatible" From 454ce539575417ff5f327e27d8b161b4829fc673 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 29 Mar 2017 16:19:54 +0200 Subject: [PATCH 02/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 3a818469b9..36c2810520 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -19,9 +19,7 @@ wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 25 -infill_overlap = -50 -skin_overlap = -40 +infill_sparse_density = 40 material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) @@ -31,8 +29,8 @@ retraction_speed = 40 retraction_prime_speed = =round(retraction_speed /4) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = 40 -switch_extruder_prime_speed = =round(switch_extruder_retraction_speeds /4) +switch_extruder_retraction_speeds = =round(retraction_speed) +switch_extruder_prime_speed = =round(retraction_prime_speed) speed_print = 50 speed_layer_0 = =round(speed_print / 5 * 4) @@ -45,19 +43,22 @@ speed_travel_layer_0 = =round(speed_travel) speed_support_interface = =round(speed_topbottom) retraction_combing = off -retraction_hop_enabled = True +retraction_hop_enabled = true retraction_hop = 1 +cool_min_layer_time_fan_speed_max = =round(cool_min_layer_time) +cool_min_layer_time = 20 + support_z_distance = 0 support_xy_distance = 0.5 support_join_distance = 10 -support_interface_enable = True +support_interface_enable = true adhesion_type = skirt skirt_gap = 0.5 skirt_brim_minimal_length = 50 -coasting_enable = True +coasting_enable = true coasting_volume = 0.1 coasting_min_volume = 0.17 coasting_speed = 90 From 242fa536681629a076e0c4f5c9eab40f6f5c25c2 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 29 Mar 2017 16:21:14 +0200 Subject: [PATCH 03/43] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 3f6502667c..616e79b5ef 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -19,9 +19,7 @@ wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 15 -infill_overlap = -50 -skin_overlap = -40 +infill_sparse_density = 24 material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) @@ -31,8 +29,8 @@ retraction_speed = 40 retraction_prime_speed = =round(retraction_speed / 4) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = 40 -switch_extruder_prime_speed = =round(switch_extruder_retraction_speeds / 4) +switch_extruder_retraction_speeds = =round(retraction_speed) +switch_extruder_prime_speed = =round(retraction_prime_speed) speed_print = =50 if layer_height < 0.4 else 30 speed_infill = =round(speed_print) @@ -46,19 +44,22 @@ speed_travel_layer_0 = =round(speed_travel) speed_support_interface = =round(speed_topbottom) retraction_combing = off -retraction_hop_enabled = True +retraction_hop_enabled = true retraction_hop = 1 +cool_min_layer_time_fan_speed_max = =round(cool_min_layer_time) +cool_min_layer_time = 20 + support_z_distance = 0 support_xy_distance = 0.5 support_join_distance = 10 -support_interface_enable = True +support_interface_enable = true adhesion_type = skirt skirt_gap = 0.5 skirt_brim_minimal_length = 50 -coasting_enable = True +coasting_enable = true coasting_volume = 0.1 coasting_min_volume = 0.17 coasting_speed = 90 From 21c607c88b9184243734e67d9c665f236b64cd6f Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 29 Mar 2017 16:22:07 +0200 Subject: [PATCH 04/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 39f8e4e09d..e4b84c5b1a 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -24,7 +24,6 @@ material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1 -retraction_speed = 40 retraction_prime_speed = =round(retraction_speed / 4) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 From d8ba5d71eef0d4dd579f765be78f021d7b60e650 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 29 Mar 2017 16:22:25 +0200 Subject: [PATCH 05/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 36c2810520..f32620a7c8 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -25,7 +25,6 @@ material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1 -retraction_speed = 40 retraction_prime_speed = =round(retraction_speed /4) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 From 7bc83a55cd0c3b66854528b00c808753d4fabbe8 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 29 Mar 2017 16:23:03 +0200 Subject: [PATCH 06/43] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 616e79b5ef..89eb8304b8 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -25,7 +25,7 @@ material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1.5 -retraction_speed = 40 + retraction_prime_speed = =round(retraction_speed / 4) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 From 731da2478863d6ed718f34aedfac01f67f75cd4d Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 29 Mar 2017 16:35:47 +0200 Subject: [PATCH 07/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index f32620a7c8..bdf46e6cc0 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -42,7 +42,7 @@ speed_travel_layer_0 = =round(speed_travel) speed_support_interface = =round(speed_topbottom) retraction_combing = off -retraction_hop_enabled = true +retraction_hop_enabled = True retraction_hop = 1 cool_min_layer_time_fan_speed_max = =round(cool_min_layer_time) @@ -51,13 +51,13 @@ cool_min_layer_time = 20 support_z_distance = 0 support_xy_distance = 0.5 support_join_distance = 10 -support_interface_enable = true +support_interface_enable = True adhesion_type = skirt skirt_gap = 0.5 skirt_brim_minimal_length = 50 -coasting_enable = true +coasting_enable = True coasting_volume = 0.1 coasting_min_volume = 0.17 coasting_speed = 90 From 4f1641f7b777198142a885b86d23425c266288b5 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 29 Mar 2017 16:36:24 +0200 Subject: [PATCH 08/43] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 89eb8304b8..d4ce3209c2 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -44,7 +44,7 @@ speed_travel_layer_0 = =round(speed_travel) speed_support_interface = =round(speed_topbottom) retraction_combing = off -retraction_hop_enabled = true +retraction_hop_enabled = True retraction_hop = 1 cool_min_layer_time_fan_speed_max = =round(cool_min_layer_time) @@ -53,13 +53,13 @@ cool_min_layer_time = 20 support_z_distance = 0 support_xy_distance = 0.5 support_join_distance = 10 -support_interface_enable = true +support_interface_enable = True adhesion_type = skirt skirt_gap = 0.5 skirt_brim_minimal_length = 50 -coasting_enable = true +coasting_enable = True coasting_volume = 0.1 coasting_min_volume = 0.17 coasting_speed = 90 From ad00e0185594ef38e4f65cfe34c23126e85c06fe Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:19:26 +0200 Subject: [PATCH 09/43] Update XmlMaterialProfile.py --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 0ab72e9712..7dc565ce26 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -564,8 +564,7 @@ class XmlMaterialProfile(InstanceContainer): "processing temperature graph": "material_flow_temp_graph", "print cooling": "cool_fan_speed", "retraction amount": "retraction_amount", - "retraction speed": "retraction_speed", - "retraction prime speed": "retraction_prime_speed" + "retraction speed": "retraction_speed" } __unmapped_settings = [ "hardware compatible" From 2c58fd9ac6a73ce351b8e29ed474d4717ff1adbd Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:22:54 +0200 Subject: [PATCH 10/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index e4b84c5b1a..67deabc967 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -24,11 +24,11 @@ material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1 -retraction_prime_speed = =round(retraction_speed / 4) +retraction_prime_speed = =round(retraction_speed / 5) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = 40 -switch_extruder_prime_speed = =round(switch_extruder_retraction_speeds / 4) +switch_extruder_retraction_speeds = =round(retraction_speed) +switch_extruder_prime_speed = =round(retraction_prime_speed) speed_print = =50 if layer_height < 0.4 else 30 speed_infill = =round(speed_print) From b154a40e544637860fafa3b63ef4b6344c94b962 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:23:24 +0200 Subject: [PATCH 11/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index bdf46e6cc0..105792b291 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -25,7 +25,7 @@ material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1 -retraction_prime_speed = =round(retraction_speed /4) +retraction_prime_speed = =round(retraction_speed /5) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 switch_extruder_retraction_speeds = =round(retraction_speed) From 9abb72198177409a557e2b776ece03ba32f8610e Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:23:51 +0200 Subject: [PATCH 12/43] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index d4ce3209c2..1408263c07 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -26,7 +26,7 @@ material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1.5 -retraction_prime_speed = =round(retraction_speed / 4) +retraction_prime_speed = =round(retraction_speed / 5) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 switch_extruder_retraction_speeds = =round(retraction_speed) From a3be68eb3cb3f59bd6d2876f3f100a57148b0921 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:24:33 +0200 Subject: [PATCH 13/43] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 1408263c07..7450094015 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -25,7 +25,6 @@ material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1.5 - retraction_prime_speed = =round(retraction_speed / 5) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 From 13d11b6cbc38d4cbba5574068f6973bc81b578d4 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:25:34 +0200 Subject: [PATCH 14/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 105792b291..a1909a51be 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -32,6 +32,7 @@ switch_extruder_retraction_speeds = =round(retraction_speed) switch_extruder_prime_speed = =round(retraction_prime_speed) speed_print = 50 +speed_infill = =round(speed_print) speed_layer_0 = =round(speed_print / 5 * 4) speed_wall = =round(speed_print / 2, 1) speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) From 05cbd4ad7b26a8e070222e47c56c5dd5a22c73ea Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:26:13 +0200 Subject: [PATCH 15/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index a1909a51be..af605c1037 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -1,4 +1,3 @@ - [general] name = 0.4 mm version = 2 From c09c0442109e053437d39043be50f1596d31adef Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:27:46 +0200 Subject: [PATCH 16/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index af605c1037..4bb23bbbe0 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -14,6 +14,7 @@ machine_nozzle_tip_outer_diameter = 0.8 infill_line_width = 0.5 wall_thickness = 1.2 +top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = From 4fb3513a7efe0944726ad7ba990c5b2ab317eb1f Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 30 Mar 2017 10:29:08 +0200 Subject: [PATCH 17/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 67deabc967..3c3df636ef 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -14,6 +14,7 @@ machine_nozzle_tip_outer_diameter = 1.05 infill_line_width = 0.3 wall_thickness = 1 +top_bottom_thickness = 0.6 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = @@ -45,6 +46,9 @@ retraction_combing = off retraction_hop_enabled = True retraction_hop = 1 +cool_min_layer_time_fan_speed_max = =round(cool_min_layer_time) +cool_min_layer_time = 20 + support_z_distance = 0 support_xy_distance = 0.5 support_join_distance = 10 From c9397fd98603f216ca317006c9f676b1bfd44bcb Mon Sep 17 00:00:00 2001 From: MaukCC Date: Tue, 4 Apr 2017 18:01:52 +0200 Subject: [PATCH 18/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 2415a6372a..414c056f66 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -37,6 +37,8 @@ "machine_depth": { "default_value": 270 }, "machine_width": { "default_value": 430 }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "material_print_temp_wait": { "default_value": false }, + "material_bed_temp_wait": { "default_value": false }, "machine_start_gcode": { "default_value": "M92 E159\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" }, From bb200fa9e8b42139fa8cd394d66c470c60036ba0 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Tue, 4 Apr 2017 18:04:25 +0200 Subject: [PATCH 19/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 414c056f66..1f6342e5f1 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -43,7 +43,7 @@ "default_value": "M92 E159\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" }, "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --" + "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\n; -- end of END GCODE --" }, "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, From 21c14f58aaaa31ce000d705b07d6c2a9876eb51e Mon Sep 17 00:00:00 2001 From: MaukCC Date: Tue, 4 Apr 2017 18:05:27 +0200 Subject: [PATCH 20/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 1f6342e5f1..db16caa156 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -40,7 +40,7 @@ "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, "machine_start_gcode": { - "default_value": "M92 E159\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" + "default_value": "\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\n; -- end of END GCODE --" From edbfd4343a241b317857acb462b165485e5c9ef1 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Tue, 4 Apr 2017 20:46:37 +0200 Subject: [PATCH 21/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index db16caa156..9335001e41 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -40,7 +40,7 @@ "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, "machine_start_gcode": { - "default_value": "\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\nM140 S{material_bed_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature}\nM104 S120 T1\nM109 S{material_print_temperature} T0\nM104 S21 T1\n\nM117 purging nozzle....\n\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-{retraction_amount} F600\nG92 E0\n\nM117 wiping nozzle....\n\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM117 Printing .....\n\nG1 E1 F100\nG92 E-1\n" + "default_value": "\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 90 sec.\nG4 S20\nM117 Heating for 70 sec.\nG4 S20\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S300 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\n; -- end of END GCODE --" From e6bdf8c8f6cf519826d50a243a04fd2aef1d6820 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 09:04:16 +0200 Subject: [PATCH 22/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 9335001e41..d001e296f9 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -40,7 +40,7 @@ "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, "machine_start_gcode": { - "default_value": "\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 90 sec.\nG4 S20\nM117 Heating for 70 sec.\nG4 S20\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S300 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" + "default_value": "\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S600 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" }, "machine_end_gcode": { "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\n; -- end of END GCODE --" From 8ff057d48387af064865863d4126cd13eefc5492 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 09:05:29 +0200 Subject: [PATCH 23/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index d001e296f9..9616b2efb3 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -43,7 +43,7 @@ "default_value": "\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S600 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" }, "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\n; -- end of END GCODE --" + "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nM104 S5 T2\nM104 S5 T3\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\n; -- end of END GCODE --" }, "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, From 513ede0fda159c9e54acf5fcf8085ea99e4f5aef Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 09:07:14 +0200 Subject: [PATCH 24/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 9616b2efb3..2db064fcab 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -43,7 +43,7 @@ "default_value": "\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S600 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" }, "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nM104 S5 T2\nM104 S5 T3\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\n; -- end of END GCODE --" + "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nM104 S5 T2\nM104 S5 T3\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\n; -- end of GCODE --" }, "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, From cb943cba982913168fcdb547700f3e6eb8431cee Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 16:07:13 +0200 Subject: [PATCH 25/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 4bb23bbbe0..d292282c07 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 2 definition = cartesio [metadata] -author = Scheepers +author = Cartesio type = variant [values] From eee382b1d8142cd4bf633e043c5f4c37cd3a333e Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 16:09:28 +0200 Subject: [PATCH 26/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 3c3df636ef..45fa984293 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -11,6 +11,8 @@ type = variant machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 1.05 +layer_height_0 = 0.2 + infill_line_width = 0.3 wall_thickness = 1 From 0f5bcb57e0161ac5122fc42cde5fc1117d40f968 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 16:12:29 +0200 Subject: [PATCH 27/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 45fa984293..3c3df636ef 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -11,8 +11,6 @@ type = variant machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 1.05 -layer_height_0 = 0.2 - infill_line_width = 0.3 wall_thickness = 1 From 6bc76f7b8cecf8cab2a198424b99ce9817764a3f Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 16:16:03 +0200 Subject: [PATCH 28/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index d292282c07..3a9beb5f54 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -25,7 +25,7 @@ material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 retraction_amount = 1 -retraction_prime_speed = =round(retraction_speed /5) +retraction_prime_speed = =round(retraction_speed / 5) retraction_min_travel = =round(line_width * 10) switch_extruder_retraction_amount = 2 switch_extruder_retraction_speeds = =round(retraction_speed) From 2c12e5e4d932de60e53e43024a22fb88791cebff Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 16:17:42 +0200 Subject: [PATCH 29/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 3c3df636ef..bcdb28a489 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -14,7 +14,7 @@ machine_nozzle_tip_outer_diameter = 1.05 infill_line_width = 0.3 wall_thickness = 1 -top_bottom_thickness = 0.6 +top_bottom_thickness = 0.8 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = From 575256227c88f273a34e9f3e51be46fbfa707941 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 16:19:06 +0200 Subject: [PATCH 30/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 3a9beb5f54..9bf1d923d5 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -34,11 +34,11 @@ switch_extruder_prime_speed = =round(retraction_prime_speed) speed_print = 50 speed_infill = =round(speed_print) speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2, 1) +speed_wall = =round(speed_print / 2) speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) speed_topbottom = =round(speed_print / 5 * 4) speed_slowdown_layers = 1 -speed_travel = =round(speed_print if magic_spiralize else 150) +speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =round(speed_travel) speed_support_interface = =round(speed_topbottom) From 8d49bbd2f5e59da132933d917a1e4f02e2dc90b7 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 5 Apr 2017 16:40:02 +0200 Subject: [PATCH 31/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 2db064fcab..f579ddf6f4 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -47,6 +47,7 @@ }, "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, + "layer_height_0": { "resolve": "0.2 if min(extruderValues('machine_nozzle_size')) < 0.3 else 0.3 "}, "machine_nozzle_heat_up_speed": {"default_value": 20}, "machine_nozzle_cool_down_speed": {"default_value": 20}, "machine_min_cool_heat_time_window": {"default_value": 5} From 288e51927879fa38c667ebcf1bd2e41a354c4c85 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 12:13:39 +0200 Subject: [PATCH 32/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index f579ddf6f4..c85d17b59c 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -39,6 +39,7 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, + "infill_pattern": { "default_value": "grid"}, "machine_start_gcode": { "default_value": "\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S600 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" }, From f54e671ede0181b8da53a0d29a8b1added2e4720 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:04:07 +0200 Subject: [PATCH 33/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 9bf1d923d5..3462133717 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -20,6 +20,7 @@ fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 +infill_pattern = grid material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) From 66b5a1d0bcc15e3523ffe1b6f66f71f02b1a8e05 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:04:39 +0200 Subject: [PATCH 34/43] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 7450094015..bdaae61af5 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -20,6 +20,7 @@ fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = infill_sparse_density = 24 +infill_pattern = grid material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) From e5d6fbcf1ece22598df5221b8240de0fa7602706 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:04:58 +0200 Subject: [PATCH 35/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index bcdb28a489..b64f5121a8 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -19,7 +19,8 @@ wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 30 +infill_sparse_density = 40 +infill_pattern = grid material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) From d7caa860a764b7da9840457b131dcf63814fc5aa Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:13:05 +0200 Subject: [PATCH 36/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index c85d17b59c..d4cb24ad0e 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -40,6 +40,7 @@ "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, "infill_pattern": { "default_value": "grid"}, + "prime_tower_wall_thickness": { "resolve": 0.7 }, "machine_start_gcode": { "default_value": "\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S600 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" }, From 5754df5061a591efdd1b4f852bffc7753b3162e0 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:25:47 +0200 Subject: [PATCH 37/43] Update cartesio_extruder_0.def.json --- resources/extruders/cartesio_extruder_0.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index cda2f48bc0..d638b3aa76 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,10 +16,10 @@ "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\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S190 T0\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" + "default_value": "\n;start extruder_0\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S155\n;end extruder_0\nM117 temp is {material_print_temp}" + "default_value": "\nM104 T0 S155\n\nG91\nG1 Z0.5 F900\nG90\nG1 X100 Y260 F9000\n;end extruder_0\nM117 temp is {material_print_temp}" } } } From 8f170a49f35d990dedce8e4a4c369f2b7deb48d8 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:26:56 +0200 Subject: [PATCH 38/43] Update cartesio_extruder_1.def.json --- resources/extruders/cartesio_extruder_1.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index b2bae26983..d8c2e00aed 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -16,10 +16,10 @@ "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\nM117 Heating nozzles....\nM104 S190 T1\nG1 X70 Y20 F9000\nM109 S190 T1\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" + "default_value": "\n;start extruder_1\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T1 S155\n;end extruder_1\n" + "default_value": "\nM104 T1 S155\nG91\nG1 Z0.5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_1\n" } } } From 54959371982e877bf71a9a89be149fe6df321d6e Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:27:42 +0200 Subject: [PATCH 39/43] Update cartesio_extruder_0.def.json --- resources/extruders/cartesio_extruder_0.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index d638b3aa76..b80c3e66dd 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -19,7 +19,7 @@ "default_value": "\n;start extruder_0\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S155\n\nG91\nG1 Z0.5 F900\nG90\nG1 X100 Y260 F9000\n;end extruder_0\nM117 temp is {material_print_temp}" + "default_value": "\nM104 T0 S155\n\nG91\nG1 Z0.5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_0\nM117 temp is {material_print_temp}" } } } From 438ae5c29b6fee04b2c66d84da673832bf60bc57 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:28:22 +0200 Subject: [PATCH 40/43] Update cartesio_extruder_2.def.json --- resources/extruders/cartesio_extruder_2.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index b7c382538a..062b80581c 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -16,10 +16,10 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 60.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_2\nM117 Heating nozzles....\nM104 S190 T2\nG1 X70 Y20 F9000\nM109 S190 T2\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" + "default_value": "\n;start extruder_2\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T2 S155\n;end extruder_2\n" + "default_value": "\nM104 T2 S155\nG91\nG1 Z0.5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_2\n" } } } From 7936696239e16d8de5ac6758780e54e56af3b15a Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:28:51 +0200 Subject: [PATCH 41/43] Update cartesio_extruder_3.def.json --- resources/extruders/cartesio_extruder_3.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index ec400103aa..5582f0f436 100644 --- a/resources/extruders/cartesio_extruder_3.def.json +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -16,10 +16,10 @@ "machine_nozzle_offset_x": { "default_value": 24.0 }, "machine_nozzle_offset_y": { "default_value": 60.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_3\nM117 Heating nozzles....\nM104 S190 T3\nG1 X70 Y20 F9000\nM109 S190 T3\n\nM117 purging nozzle\nG92 E0\nG1 E6 F90\nG92 E0\nG1 E-2 F300\nG92 E0\n\nM117 wiping nozzle\nG1 X1 Y28 F3000\nG1 X70 F6000\n\nM117 printing\n" + "default_value": "\n;start extruder_3\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T3 S155\n;end extruder_3\n" + "default_value": "\nM104 T3 S155\nG91\nG1 Z0.5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_3\n" } } } From cb86482d44c88a561969d2cec33e0a52014723f9 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 14:29:36 +0200 Subject: [PATCH 42/43] Update cartesio_extruder_0.def.json --- resources/extruders/cartesio_extruder_0.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index b80c3e66dd..7dc3aaa8af 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -19,7 +19,7 @@ "default_value": "\n;start extruder_0\n\nM117 printing\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S155\n\nG91\nG1 Z0.5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_0\nM117 temp is {material_print_temp}" + "default_value": "\nM104 T0 S155\nG91\nG1 Z0.5 F900\nG90\nG1 X1 Y260 F9000\n;end extruder_0\nM117 temp is {material_print_temp}" } } } From 2ea6487368f2964890641cff3517760a8c9aaf87 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 6 Apr 2017 15:27:59 +0200 Subject: [PATCH 43/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index d4cb24ad0e..d0904b9716 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -40,7 +40,10 @@ "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, "infill_pattern": { "default_value": "grid"}, + "prime_tower_enable": { "default_value": true }, "prime_tower_wall_thickness": { "resolve": 0.7 }, + "prime_tower_position_x": { "default_value": 30 }, + "prime_tower_position_y": { "default_value": 71 }, "machine_start_gcode": { "default_value": "\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nM92 E159\n\nG21\nG90\nM42 S255 P13;chamber lights\nM42 S255 P12;fume extraction\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S600 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" },