From 4469e5ce661823e8496d192254fb28cd5d4df8a6 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 8 Feb 2017 13:14:53 +0100 Subject: [PATCH 01/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 ba32a2bf9c..ca1f64a0f5 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -36,7 +36,7 @@ "machine_width": { "default_value": 430 }, "machine_name": { "default_value": "Cartesio" }, "machine_start_gcode": { - "default_value": "M92 E162\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": "M92 E165\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 --" From 7a25930166447c4262395c010e5219443d2ccbe9 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 8 Feb 2017 14:52:04 +0100 Subject: [PATCH 02/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 ca1f64a0f5..c86a8a90f1 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -36,7 +36,7 @@ "machine_width": { "default_value": 430 }, "machine_name": { "default_value": "Cartesio" }, "machine_start_gcode": { - "default_value": "M92 E165\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": "M92 E167\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 --" From 17abe51d0a870cff3ffa39ac65c9d7c89c0a2ca0 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:40:55 +0100 Subject: [PATCH 03/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 c86a8a90f1..5f75ef70e1 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -36,7 +36,7 @@ "machine_width": { "default_value": 430 }, "machine_name": { "default_value": "Cartesio" }, "machine_start_gcode": { - "default_value": "M92 E167\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": "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 --" From bebc5be17d7f4ad3bea5af1a51421223023238bd Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:44:23 +0100 Subject: [PATCH 04/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 455fd7ee56..dd698452d8 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -15,7 +15,7 @@ wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 25 +infill_sparse_density = 20 infill_overlap = -50 skin_overlap = -40 From ad0d95c8638af22510918760b215129e58c70010 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:44:39 +0100 Subject: [PATCH 05/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 44a09c706f..900a34718c 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -16,7 +16,7 @@ wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 25 +infill_sparse_density = 20 infill_overlap = -50 skin_overlap = -40 From 031714d4f0375c52d0bcf2acb1f25435019783d2 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:44:55 +0100 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 772ede33fb..a3af9b3020 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -15,7 +15,7 @@ wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 25 +infill_sparse_density = 20 infill_overlap = -50 skin_overlap = -40 From cf6c99c5b1990a5638db6bd92407f8e4e58cf38d Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:55:35 +0100 Subject: [PATCH 07/43] Update cartesio.def.json --- resources/definitions/cartesio.def.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 5f75ef70e1..9e0ad6e228 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -9,7 +9,6 @@ "manufacturer": "Cartesio bv", "category": "Other", "file_formats": "text/x-gcode", - "has_materials": true, "has_machine_materials": true, "has_variants": true, "variants_name": "Nozzle size", @@ -31,10 +30,9 @@ "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "machine_height": { "default_value": 400 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 270 }, "machine_width": { "default_value": 430 }, - "machine_name": { "default_value": "Cartesio" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "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 7d41ca7b336082c978809e11c703a4d67947a50b Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:56:57 +0100 Subject: [PATCH 08/43] Update cartesio_extruder_1.def.json --- resources/extruders/cartesio_extruder_1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index ee09b6d363..5be8abca06 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -16,7 +16,7 @@ "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 ;wait for nozzle to heat up\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\nM117 Heating nozzles....\nM104 S190 T1\nG1 X70 Y20 F9000\nM109 S190 T1 ;wait for nozzle to heat up\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" }, "machine_extruder_end_code": { "default_value": "\nM104 T0 S120\n;end extruder_1\n" From 7b68b27b4aadc9944120384708a954f4a011e7ff Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:57:26 +0100 Subject: [PATCH 09/43] Update cartesio_extruder_1.def.json --- resources/extruders/cartesio_extruder_1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index 5be8abca06..fe27d4626b 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -19,7 +19,7 @@ "default_value": "\n;start extruder_1\nM117 Heating nozzles....\nM104 S190 T1\nG1 X70 Y20 F9000\nM109 S190 T1 ;wait for nozzle to heat up\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" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S120\n;end extruder_1\n" + "default_value": "\nM104 T1 S120\n;end extruder_1\n" } } } From 8022613a7be4bbee901da7b8c269553ca92fb37a Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:58:12 +0100 Subject: [PATCH 10/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 8f71c68c43..7598fc1b30 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { - "default_value": "M117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S270 T0 ;wait for nozzle to heat up\nT0\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\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S270 T0 ;wait for nozzle to heat up\nT0\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" }, "machine_extruder_end_code": { "default_value": "\nM104 S160 T0\n;end extruder_0\nM117 temp is {material_print_temp}" From 97ba04acc005b4f34bd22ac6f91fabb3aed3d856 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:58:31 +0100 Subject: [PATCH 11/43] Update cartesio_extruder_1.def.json --- resources/extruders/cartesio_extruder_1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index fe27d4626b..f6a878513b 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -16,7 +16,7 @@ "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 ;wait for nozzle to heat up\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\nM117 Heating nozzles....\nM104 S190 T1\nG1 X70 Y20 F9000\nM109 S190 T1 ;wait for nozzle to heat up\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" }, "machine_extruder_end_code": { "default_value": "\nM104 T1 S120\n;end extruder_1\n" From b3acfb31f9e4de8931367494b3652db56d7affea Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:58:48 +0100 Subject: [PATCH 12/43] Update cartesio_extruder_1.def.json --- resources/extruders/cartesio_extruder_1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index f6a878513b..fe27d4626b 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -16,7 +16,7 @@ "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 ;wait for nozzle to heat up\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\nM117 Heating nozzles....\nM104 S190 T1\nG1 X70 Y20 F9000\nM109 S190 T1 ;wait for nozzle to heat up\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" }, "machine_extruder_end_code": { "default_value": "\nM104 T1 S120\n;end extruder_1\n" From 67d3e59ea4ef29b25192e4a27c6cb7faecf8c851 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:58:58 +0100 Subject: [PATCH 13/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 7598fc1b30..b11982e84f 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,7 +16,7 @@ "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 S270 T0 ;wait for nozzle to heat up\nT0\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\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S270 T0 ;wait for nozzle to heat up\nT0\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" }, "machine_extruder_end_code": { "default_value": "\nM104 S160 T0\n;end extruder_0\nM117 temp is {material_print_temp}" From a11ef02468226660ba71002d9197d690fdffd5ca Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:59:32 +0100 Subject: [PATCH 14/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 b11982e84f..43b6a08aa7 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\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S270 T0 ;wait for nozzle to heat up\nT0\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" }, "machine_extruder_end_code": { - "default_value": "\nM104 S160 T0\n;end extruder_0\nM117 temp is {material_print_temp}" + "default_value": "\nM104 S155 T0\n;end extruder_0\nM117 temp is {material_print_temp}" } } } From 0c0f5c7e57b8e49485618b0f1247b815739e7cab Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:59:45 +0100 Subject: [PATCH 15/43] Update cartesio_extruder_1.def.json --- resources/extruders/cartesio_extruder_1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index fe27d4626b..84f4ee5a7c 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -19,7 +19,7 @@ "default_value": "\n;start extruder_1\nM117 Heating nozzles....\nM104 S190 T1\nG1 X70 Y20 F9000\nM109 S190 T1 ;wait for nozzle to heat up\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" }, "machine_extruder_end_code": { - "default_value": "\nM104 T1 S120\n;end extruder_1\n" + "default_value": "\nM104 T1 S155\n;end extruder_1\n" } } } From c7b7ec97233ec707129ef54e5b835c31ace233c2 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 09:59:55 +0100 Subject: [PATCH 16/43] Update cartesio_extruder_2.def.json --- resources/extruders/cartesio_extruder_2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index 9d4bfd8c42..b7c382538a 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\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" }, "machine_extruder_end_code": { - "default_value": "\nM104 T2 S120\n;end extruder_2\n" + "default_value": "\nM104 T2 S155\n;end extruder_2\n" } } } From e5442bbe9e394921345d5ba4afb1690bc3056740 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 10:00:04 +0100 Subject: [PATCH 17/43] Update cartesio_extruder_3.def.json --- resources/extruders/cartesio_extruder_3.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index cdcb392876..ec400103aa 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\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" }, "machine_extruder_end_code": { - "default_value": "\nM104 T3 S120\n;end extruder_3\n" + "default_value": "\nM104 T3 S155\n;end extruder_3\n" } } } From 39f631439533012c1930be4753ee97d9eb8e05b3 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 10:00:44 +0100 Subject: [PATCH 18/43] Update cartesio_extruder_1.def.json --- resources/extruders/cartesio_extruder_1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index 84f4ee5a7c..b2bae26983 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -16,7 +16,7 @@ "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 ;wait for nozzle to heat up\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\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" }, "machine_extruder_end_code": { "default_value": "\nM104 T1 S155\n;end extruder_1\n" From 596fcc09b45cc3167dfbef7df321760dc4523000 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 10:01:09 +0100 Subject: [PATCH 19/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 43b6a08aa7..f0a24bd938 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,7 +16,7 @@ "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 S270 T0 ;wait for nozzle to heat up\nT0\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\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S270 T0\nT0\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" }, "machine_extruder_end_code": { "default_value": "\nM104 S155 T0\n;end extruder_0\nM117 temp is {material_print_temp}" From 58c50a702211308b2603f4ee273e08a244ccdd47 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 10:01:37 +0100 Subject: [PATCH 20/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 f0a24bd938..ed23b438ab 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,7 +16,7 @@ "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 S270 T0\nT0\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\nM117 Heating nozzles....\nM104 S190 T0\nG1 X70 Y20 F9000\nM109 S190 T0\nT0\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" }, "machine_extruder_end_code": { "default_value": "\nM104 S155 T0\n;end extruder_0\nM117 temp is {material_print_temp}" From 2f9cbd38e914d4510ae4daf9d00eba09835c20f8 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 10:02:22 +0100 Subject: [PATCH 21/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 ed23b438ab..f01562ed08 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,7 +16,7 @@ "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\nT0\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\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" }, "machine_extruder_end_code": { "default_value": "\nM104 S155 T0\n;end extruder_0\nM117 temp is {material_print_temp}" From cadbecd1d104cb96d10d786bf90a0eec5c5df1c1 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 10:05:15 +0100 Subject: [PATCH 22/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 900a34718c..4788e7c9fc 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -20,7 +20,6 @@ infill_sparse_density = 20 infill_overlap = -50 skin_overlap = -40 - material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 From f123aec8bda8b8acbe235e662b0bf1a5a4b9d244 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 12:59:00 +0100 Subject: [PATCH 23/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index dd698452d8..f76f429827 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -11,6 +11,7 @@ type = variant machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 1.05 +wall_thickness = =(wall_line_width_0 + ((wall_line_count - 1) * wall_line_width_x)) wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = From 047a078fb1daafe14a4d2c5fd99f81a720c4b61a Mon Sep 17 00:00:00 2001 From: MaukCC Date: Wed, 15 Feb 2017 14:02:39 +0100 Subject: [PATCH 24/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 f76f429827..dd698452d8 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -11,7 +11,6 @@ type = variant machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 1.05 -wall_thickness = =(wall_line_width_0 + ((wall_line_count - 1) * wall_line_width_x)) wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = From c96e23e51cdde75855d51a01c4ce921b3e3399fc Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 09:43:42 +0100 Subject: [PATCH 25/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 4788e7c9fc..679cd2db36 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -12,6 +12,7 @@ type = variant machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 0.8 +wall_thickness = 1.2 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = From d4f4ada2f0aea7dc53b973465b0e8f27dc426f04 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 09:44:06 +0100 Subject: [PATCH 26/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 679cd2db36..f1030ab309 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -17,7 +17,7 @@ wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 20 +infill_sparse_density = 25 infill_overlap = -50 skin_overlap = -40 From 264b488b31057f7a45b2933b1a7cbf1e39fa25a3 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 09:44:24 +0100 Subject: [PATCH 27/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 dd698452d8..305d33e0f2 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -11,11 +11,12 @@ type = variant machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 1.05 +wall_thickness = 1 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 20 +infill_sparse_density = 25 infill_overlap = -50 skin_overlap = -40 From 2ba70c845355b675ae774bb6f574bd8e09e201e1 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 09:44:49 +0100 Subject: [PATCH 28/43] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index a3af9b3020..d19adcf4de 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -11,11 +11,12 @@ type = variant machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.05 +wall_thickness = 2.4 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = -infill_sparse_density = 20 +infill_sparse_density = 15 infill_overlap = -50 skin_overlap = -40 From a4c65fda674fdfbb24ee8439f8470079d3224b22 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 10:06:59 +0100 Subject: [PATCH 29/43] Update cartesio_0.8.inst.cfg --- resources/variants/cartesio_0.8.inst.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index d19adcf4de..4e4d5082e0 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -11,6 +11,8 @@ type = variant machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.05 +infill_line_width = 0.9 + wall_thickness = 2.4 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere From 40f48f78253d9eaf05f89cdbaad0ed9bc8d6d878 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 10:07:38 +0100 Subject: [PATCH 30/43] Update cartesio_0.4.inst.cfg --- resources/variants/cartesio_0.4.inst.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index f1030ab309..72ba689d91 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -12,6 +12,8 @@ type = variant machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 0.8 +infill_line_width = 0.5 + wall_thickness = 1.2 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere From cb9e8b57de03a5a186b57685f4057dec00e0df6d Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 10:08:13 +0100 Subject: [PATCH 31/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 305d33e0f2..80423b2502 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 +infill_line_width = 0.3 + wall_thickness = 1 wall_0_inset = -0.05 fill_perimeter_gaps = nowhere From 94ab027499e4139c6d6013aae36ad323e3675a91 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 10:24:59 +0100 Subject: [PATCH 32/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 4e4d5082e0..c8155f73fd 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -14,6 +14,7 @@ machine_nozzle_tip_outer_diameter = 1.05 infill_line_width = 0.9 wall_thickness = 2.4 +top_bottom_thickness = =0.8 if layer_height < 0.3 else (layer_height * 3) wall_0_inset = -0.05 fill_perimeter_gaps = nowhere travel_compensate_overlapping_walls_enabled = From b9b7df1593f72d6c077f89c3f468282abbe19f66 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 10:28:43 +0100 Subject: [PATCH 33/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 c8155f73fd..fcb040a28d 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -47,6 +47,7 @@ speed_support_interface = =round(speed_topbottom) retraction_combing = off retraction_hop_enabled = true +retraction_hop = 1 support_z_distance = 0 support_xy_distance = 0.5 From 5a06dc5e2f9e361c755ba51b3db3093151e01257 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 10:28:58 +0100 Subject: [PATCH 34/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 72ba689d91..c3ba238726 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -46,6 +46,7 @@ speed_support_interface = =round(speed_topbottom) retraction_combing = off retraction_hop_enabled = true +retraction_hop = 1 support_z_distance = 0 support_xy_distance = 0.5 From d0124dafd8987f3d28a821825b91bd238d631a24 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 10:29:17 +0100 Subject: [PATCH 35/43] Update cartesio_0.25.inst.cfg --- resources/variants/cartesio_0.25.inst.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 80423b2502..1e46c1eb0e 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -46,6 +46,7 @@ speed_support_interface = =round(speed_topbottom) retraction_combing = off retraction_hop_enabled = true +retraction_hop = 1 support_z_distance = 0 support_xy_distance = 0.5 From 93e800bae74982fa82ecc87a6b6d1a79acad1b53 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 10:33:20 +0100 Subject: [PATCH 36/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 f01562ed08..cda2f48bc0 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\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" }, "machine_extruder_end_code": { - "default_value": "\nM104 S155 T0\n;end extruder_0\nM117 temp is {material_print_temp}" + "default_value": "\nM104 T0 S155\n;end extruder_0\nM117 temp is {material_print_temp}" } } } From e80ac1361581c6fe2dd665b4d422d456aea24001 Mon Sep 17 00:00:00 2001 From: MaukCC Date: Fri, 24 Feb 2017 11:10:26 +0100 Subject: [PATCH 37/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 fcb040a28d..851a36256b 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -26,7 +26,7 @@ skin_overlap = -40 material_print_temperature_layer_0 = =round(material_print_temperature) material_initial_print_temperature = =round(material_print_temperature) material_diameter = 1.75 -retraction_amount = 2 +retraction_amount = 1.5 retraction_speed = 40 retraction_prime_speed = =round(retraction_speed / 4) retraction_min_travel = =round(line_width * 10) From 537de489bf0864a259dfc0aeaabf92b2a234a702 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 24 Feb 2017 14:12:32 +0100 Subject: [PATCH 38/43] Fix optimising CPE+, PC and TPU profiles These materials are hard-coded in the optimisation script, so the optimisation script didn't know that those materials were materials and this caused a chain reaction where in the end the profile could only override XML-settings. --- .../um3_aa0.4_CPEP_Draft_Print.inst.cfg | 15 ++++++++++- .../um3_aa0.4_CPEP_Fast_Print.inst.cfg | 14 ++++++++++ .../um3_aa0.4_CPEP_High_Quality.inst.cfg | 20 +++++++++++++- .../um3_aa0.4_CPEP_Normal_Quality.inst.cfg | 19 ++++++++++++-- .../um3_aa0.4_PC_Draft_Print.inst.cfg | 17 ++++++++++++ .../um3_aa0.4_PC_Fast_Print.inst.cfg | 17 ++++++++++++ .../um3_aa0.4_PC_High_Quality.inst.cfg | 18 +++++++++++++ .../um3_aa0.4_PC_Normal_Quality.inst.cfg | 19 +++++++++++++- .../um3_aa0.4_TPU_Draft_Print.inst.cfg | 26 +++++++++++++++++++ .../um3_aa0.4_TPU_Fast_Print.inst.cfg | 26 +++++++++++++++++++ .../um3_aa0.4_TPU_Normal_Quality.inst.cfg | 25 ++++++++++++++++++ 11 files changed, 211 insertions(+), 5 deletions(-) diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index 8d749e29ce..f99c3997f7 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -10,12 +10,25 @@ material = generic_cpe_plus_ultimaker3_AA_0.4 weight = -2 [values] +brim_width = 7 cool_fan_speed_max = 80 +cool_min_speed = 5 +infill_wipe_dist = 0 layer_height = 0.2 machine_nozzle_cool_down_speed = 0.9 -speed_print = 50 +machine_nozzle_heat_up_speed = 1.4 +prime_tower_size = 17 +retraction_combing = off +retraction_hop = 0.2 +retraction_hop_enabled = False +retraction_min_travel = =5 +retraction_prime_speed = =15 speed_topbottom = =math.ceil(speed_print * 65 / 50) speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) +support_z_distance = =layer_height +switch_extruder_prime_speed = =15 +switch_extruder_retraction_amount = =8 +switch_extruder_retraction_speeds = 20 wall_thickness = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index 2536420c1d..c03e072c8e 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -10,12 +10,26 @@ material = generic_cpe_plus_ultimaker3_AA_0.4 weight = -1 [values] +brim_width = 7 cool_fan_speed_max = 80 cool_min_speed = 6 +infill_wipe_dist = 0 layer_height = 0.15 machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +prime_tower_size = 17 +retraction_combing = off +retraction_hop = 0.2 +retraction_hop_enabled = False +retraction_min_travel = =5 +retraction_prime_speed = =15 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 55 / 45) speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_z_distance = =layer_height +switch_extruder_prime_speed = =15 +switch_extruder_retraction_amount = =8 +switch_extruder_retraction_speeds = 20 +wall_thickness = 1.3 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index 90c23b7d8f..c88fe1a56a 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg @@ -10,6 +10,24 @@ material = generic_cpe_plus_ultimaker3_AA_0.4 weight = 1 [values] -machine_nozzle_heat_up_speed = 1.5 +brim_width = 7 +cool_min_speed = 5 +infill_wipe_dist = 0 +layer_height = 0.06 material_print_temperature = =default_material_print_temperature + 2 +prime_tower_size = 17 +retraction_combing = off +retraction_hop = 0.2 +retraction_hop_enabled = False +retraction_min_travel = =5 +retraction_prime_speed = =15 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 35) +speed_wall = =math.ceil(speed_print * 35 / 40) +speed_wall_0 = =math.ceil(speed_wall * 30 / 35) +support_z_distance = =layer_height +switch_extruder_prime_speed = =15 +switch_extruder_retraction_amount = =8 +switch_extruder_retraction_speeds = 20 +wall_thickness = 1.3 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index f12d1ca613..9aaceb3a7a 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -10,8 +10,23 @@ material = generic_cpe_plus_ultimaker3_AA_0.4 weight = 0 [values] +brim_width = 7 cool_min_speed = 7 -layer_height = 0.1 -machine_nozzle_heat_up_speed = 1.5 +infill_wipe_dist = 0 material_print_temperature = =default_material_print_temperature + 5 +prime_tower_size = 17 +retraction_combing = off +retraction_hop = 0.2 +retraction_hop_enabled = False +retraction_min_travel = =5 +retraction_prime_speed = =15 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 35) +speed_wall = =math.ceil(speed_print * 35 / 40) +speed_wall_0 = =math.ceil(speed_wall * 30 / 35) +support_z_distance = =layer_height +switch_extruder_prime_speed = =15 +switch_extruder_retraction_amount = =8 +switch_extruder_retraction_speeds = 20 +wall_thickness = 1.3 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg index 876941d82b..0cc074b7a0 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg @@ -10,7 +10,24 @@ material = generic_pc_ultimaker3_AA_0.4 weight = -2 [values] +adhesion_type = raft +cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 90 +cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 6 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +infill_overlap_mm = 0.05 layer_height = 0.2 +material_print_temperature_layer_0 = =material_print_temperature + 5 +ooze_shield_angle = 40 +raft_airgap = 0.25 +raft_margin = 15 +retraction_count_max = 80 +skin_overlap = 30 +speed_layer_0 = 25 +support_interface_line_distance = 0.4 +support_interface_pattern = lines +support_pattern = zigzag +wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) +xy_offset = -0.15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg index 93babeba51..c887fb283d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg @@ -10,8 +10,25 @@ material = generic_pc_ultimaker3_AA_0.4 weight = -1 [values] +adhesion_type = raft +cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 85 +cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 7 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) infill_overlap = =0 +infill_overlap_mm = 0.05 layer_height = 0.15 +material_print_temperature_layer_0 = =material_print_temperature + 5 +ooze_shield_angle = 40 +raft_airgap = 0.25 +raft_margin = 15 +retraction_count_max = 80 +skin_overlap = 30 +speed_layer_0 = 25 +support_interface_line_distance = 0.4 +support_interface_pattern = lines +support_pattern = zigzag +wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) +xy_offset = -0.15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg index 03f7b2ffd9..6555c13f74 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg @@ -10,6 +10,24 @@ material = generic_pc_ultimaker3_AA_0.4 weight = 1 [values] +adhesion_type = raft +cool_fan_full_at_height = =layer_height_0 + layer_height +cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 8 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +infill_overlap_mm = 0.05 +layer_height = 0.06 material_print_temperature = =default_material_print_temperature - 10 +material_print_temperature_layer_0 = =material_print_temperature + 5 +ooze_shield_angle = 40 +raft_airgap = 0.25 +raft_margin = 15 +retraction_count_max = 80 +skin_overlap = 30 +speed_layer_0 = 25 +support_interface_line_distance = 0.4 +support_interface_pattern = lines +support_pattern = zigzag +wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) +xy_offset = -0.15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg index 7fb9c74ca0..eeea96cd18 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg @@ -10,6 +10,23 @@ material = generic_pc_ultimaker3_AA_0.4 weight = 0 [values] -layer_height = 0.1 +adhesion_type = raft +cool_fan_full_at_height = =layer_height_0 + layer_height +cool_min_layer_time_fan_speed_max = 5 +cool_min_speed = 5 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +infill_overlap_mm = 0.05 material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature + 5 +ooze_shield_angle = 40 +raft_airgap = 0.25 +raft_margin = 15 +retraction_count_max = 80 +skin_overlap = 30 +speed_layer_0 = 25 +support_interface_line_distance = 0.4 +support_interface_pattern = lines +support_pattern = zigzag +wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) +xy_offset = -0.15 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg index 72bb42c7bd..bcdd8044b8 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg @@ -10,5 +10,31 @@ material = generic_tpu_ultimaker3_AA_0.4 weight = -2 [values] +brim_width = 8.75 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 6 +gradual_infill_step_height = =5 * layer_height +gradual_infill_steps = 4 +infill_line_width = =round(line_width * 0.38 / 0.38, 2) +infill_pattern = tetrahedral +infill_sparse_density = 96 layer_height = 0.2 +line_width = =machine_nozzle_size * 0.95 +material_flow = 106 +material_print_temperature_layer_0 = =default_material_print_temperature + 2 +retraction_count_max = 12 +retraction_extra_prime_amount = 0.8 +skin_overlap = 15 +speed_equalize_flow_enabled = True +speed_layer_0 = 18 +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 25 / 25) +speed_travel = 300 +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance / 2 +top_bottom_thickness = 0.7 +wall_line_width_x = =line_width +wall_thickness = 0.76 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg index 6e0bbc362d..567d9273b5 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg @@ -10,6 +10,32 @@ material = generic_tpu_ultimaker3_AA_0.4 weight = -1 [values] +brim_width = 8.75 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 6 +gradual_infill_step_height = =5 * layer_height +gradual_infill_steps = 4 +infill_line_width = =round(line_width * 0.38 / 0.38, 2) +infill_pattern = tetrahedral +infill_sparse_density = 96 layer_height = 0.15 +line_width = =machine_nozzle_size * 0.95 +material_flow = 106 +material_print_temperature_layer_0 = =default_material_print_temperature + 2 retraction_amount = 7 +retraction_count_max = 12 +retraction_extra_prime_amount = 0.8 +skin_overlap = 15 +speed_equalize_flow_enabled = True +speed_layer_0 = 18 +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 25 / 25) +speed_travel = 300 +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance / 2 +top_bottom_thickness = 0.7 +wall_line_width_x = =line_width +wall_thickness = 0.76 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg index 66f6e91ec9..75d76a32f2 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -10,7 +10,32 @@ material = generic_tpu_ultimaker3_AA_0.4 weight = 0 [values] +brim_width = 8.75 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 6 +gradual_infill_step_height = =5 * layer_height +gradual_infill_steps = 4 +infill_line_width = =round(line_width * 0.38 / 0.38, 2) +infill_pattern = tetrahedral +infill_sparse_density = 96 +line_width = =machine_nozzle_size * 0.95 +material_flow = 106 material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature +retraction_count_max = 12 +retraction_extra_prime_amount = 0.8 +skin_overlap = 15 +speed_equalize_flow_enabled = True +speed_layer_0 = 18 +speed_print = 25 +speed_topbottom = =math.ceil(speed_print * 25 / 25) +speed_travel = 300 +speed_wall = =math.ceil(speed_print * 25 / 25) +speed_wall_0 = =math.ceil(speed_wall * 25 / 25) +support_angle = 50 +support_bottom_distance = =support_z_distance / 2 +top_bottom_thickness = 0.7 +wall_line_width_x = =line_width +wall_thickness = 0.76 From d60014fa30e3ba5a86a517d20da2f0c9ed96ea3b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 24 Feb 2017 14:53:00 +0100 Subject: [PATCH 39/43] Sync remaining pre-heat time with printer If multiple instances of Cura are running or Cura is restarted, it now properly syncs the remaining pre-heat time with the printer, so that all instances display the proper time. There's still a bug in here that pressing cancel has no effect the first time since the remaining pre-heat time is updated immediately from the printer before the command to cancel got through remotely. I'll see what I can do to amend that. Also, cancelling is not yet synced. Contributes to issue CURA-3360. --- .../UM3NetworkPrinting/NetworkPrinterOutputDevice.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py index a95a63995d..bdcd24105a 100644 --- a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py @@ -532,6 +532,18 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._updateHeadPosition(head_x, head_y, head_z) self._updatePrinterState(self._json_printer_state["status"]) + try: + remaining_preheat_time = self._json_printer_state["bed"]["pre_heat"]["remaining"] + except KeyError: #Old firmware doesn't support that. + pass #Don't update the time. + else: + #Only update if time estimate is significantly off (>5000ms). + #Otherwise we get issues with latency causing the timer to count inconsistently. + if abs(self._preheat_bed_timer.remainingTime() - remaining_preheat_time * 1000) > 5000: + self._preheat_bed_timer.setInterval(remaining_preheat_time * 1000) + self._preheat_bed_timer.start() + self.preheatBedRemainingTimeChanged.emit() + def close(self): Logger.log("d", "Closing connection of printer %s with ip %s", self._key, self._address) From 39920c95f3acb3c29c3b4076228936ab674483d6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 24 Feb 2017 17:14:54 +0100 Subject: [PATCH 40/43] Interpret cancelling pre-heat properly If someone on a different computer cancels the pre-heat, this is now correctly updated locally. Contributes to issue CURA-3360. --- .../NetworkPrinterOutputDevice.py | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py index bdcd24105a..456783c91b 100644 --- a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py @@ -533,16 +533,27 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._updatePrinterState(self._json_printer_state["status"]) try: - remaining_preheat_time = self._json_printer_state["bed"]["pre_heat"]["remaining"] + is_preheating = self._json_printer_state["bed"]["pre_heat"]["active"] except KeyError: #Old firmware doesn't support that. - pass #Don't update the time. + pass #Don't update the pre-heat remaining time. else: - #Only update if time estimate is significantly off (>5000ms). - #Otherwise we get issues with latency causing the timer to count inconsistently. - if abs(self._preheat_bed_timer.remainingTime() - remaining_preheat_time * 1000) > 5000: - self._preheat_bed_timer.setInterval(remaining_preheat_time * 1000) - self._preheat_bed_timer.start() - self.preheatBedRemainingTimeChanged.emit() + if is_preheating: + try: + remaining_preheat_time = self._json_printer_state["bed"]["pre_heat"]["remaining"] + except KeyError: #Error in firmware. If "active" is supported, "remaining" should also be supported. + pass #Anyway, don't update. + else: + #Only update if time estimate is significantly off (>5000ms). + #Otherwise we get issues with latency causing the timer to count inconsistently. + if abs(self._preheat_bed_timer.remainingTime() - remaining_preheat_time * 1000) > 5000: + self._preheat_bed_timer.setInterval(remaining_preheat_time * 1000) + self._preheat_bed_timer.start() + self.preheatBedRemainingTimeChanged.emit() + else: #Not pre-heating. Must've cancelled. + if self._preheat_bed_timer.isActive(): + self._preheat_bed_timer.setInterval(0) + self._preheat_bed_timer.stop() + self.preheatBedRemainingTimeChanged.emit() def close(self): From 7bb486a34bb2f36b21692f40cfdf970c048ff27a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 24 Feb 2017 17:44:37 +0100 Subject: [PATCH 41/43] Don't process status updates of pre-heating while request is going on There was the problem that you'd click on pre-heat, so locally it would display the time-out. Then a package came in with the out-dated print status saying that the printer is not pre-heating, so the pre-heat was cancelled on Cura's side. Then the next status update came in saying that the pre-heat is now busy, so the pre-heat is resumed on Cura's side. So the button was flicking back and forth once after pressing. This commit makes Cura ignore any status updates that come while the put-request is still going on, because they may be outdated. It'll appear nicer to the user, mostly. Contributes to issue CURA-3360. --- .../NetworkPrinterOutputDevice.py | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py index 456783c91b..a7223128b4 100644 --- a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py @@ -99,6 +99,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._material_ids = [""] * self._num_extruders self._hotend_ids = [""] * self._num_extruders self._target_bed_temperature = 0 + self._processing_preheat_requests = True self.setPriority(2) # Make sure the output device gets selected above local file output self.setName(key) @@ -262,6 +263,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): Logger.log("i", "Pre-heating bed to %i degrees.", temperature) put_request = QNetworkRequest(url) put_request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json") + self._processing_preheat_requests = False self._manager.put(put_request, data.encode()) self._preheat_bed_timer.start(self._preheat_bed_timeout * 1000) #Times 1000 because it needs to be provided as milliseconds. self.preheatBedRemainingTimeChanged.emit() @@ -532,28 +534,29 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._updateHeadPosition(head_x, head_y, head_z) self._updatePrinterState(self._json_printer_state["status"]) - try: - is_preheating = self._json_printer_state["bed"]["pre_heat"]["active"] - except KeyError: #Old firmware doesn't support that. - pass #Don't update the pre-heat remaining time. - else: - if is_preheating: - try: - remaining_preheat_time = self._json_printer_state["bed"]["pre_heat"]["remaining"] - except KeyError: #Error in firmware. If "active" is supported, "remaining" should also be supported. - pass #Anyway, don't update. - else: - #Only update if time estimate is significantly off (>5000ms). - #Otherwise we get issues with latency causing the timer to count inconsistently. - if abs(self._preheat_bed_timer.remainingTime() - remaining_preheat_time * 1000) > 5000: - self._preheat_bed_timer.setInterval(remaining_preheat_time * 1000) - self._preheat_bed_timer.start() + if self._processing_preheat_requests: + try: + is_preheating = self._json_printer_state["bed"]["pre_heat"]["active"] + except KeyError: #Old firmware doesn't support that. + pass #Don't update the pre-heat remaining time. + else: + if is_preheating: + try: + remaining_preheat_time = self._json_printer_state["bed"]["pre_heat"]["remaining"] + except KeyError: #Error in firmware. If "active" is supported, "remaining" should also be supported. + pass #Anyway, don't update. + else: + #Only update if time estimate is significantly off (>5000ms). + #Otherwise we get issues with latency causing the timer to count inconsistently. + if abs(self._preheat_bed_timer.remainingTime() - remaining_preheat_time * 1000) > 5000: + self._preheat_bed_timer.setInterval(remaining_preheat_time * 1000) + self._preheat_bed_timer.start() + self.preheatBedRemainingTimeChanged.emit() + else: #Not pre-heating. Must've cancelled. + if self._preheat_bed_timer.isActive(): + self._preheat_bed_timer.setInterval(0) + self._preheat_bed_timer.stop() self.preheatBedRemainingTimeChanged.emit() - else: #Not pre-heating. Must've cancelled. - if self._preheat_bed_timer.isActive(): - self._preheat_bed_timer.setInterval(0) - self._preheat_bed_timer.stop() - self.preheatBedRemainingTimeChanged.emit() def close(self): @@ -1056,6 +1059,8 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._progress_message.hide() elif reply.operation() == QNetworkAccessManager.PutOperation: + if "printer/bed/pre_heat" in reply_url: #Pre-heat command has completed. Re-enable syncing pre-heating. + self._processing_preheat_requests = True if status_code in [200, 201, 202, 204]: pass # Request was successful! else: From 4ab6b74930f5a15a0c13d91236f09cdeee736e8d Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sun, 26 Feb 2017 20:40:32 +0100 Subject: [PATCH 42/43] Fixed a bunch of error which were reported by PyCharm's code analysis. --- cura/CuraApplication.py | 10 ++++++---- cura/Settings/MachineNameValidator.py | 6 +++--- cura/Settings/SettingOverrideDecorator.py | 4 ++-- plugins/CuraProfileReader/CuraProfileReader.py | 2 +- plugins/RemovableDriveOutputDevice/__init__.py | 2 +- .../VersionUpgrade21to22/MachineInstance.py | 4 ++-- plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py | 2 ++ 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index add7b4a143..62bf6f0e4d 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -20,6 +20,8 @@ from UM.JobQueue import JobQueue from UM.SaveFile import SaveFile from UM.Scene.Selection import Selection from UM.Scene.GroupDecorator import GroupDecorator +from UM.Settings.ContainerStack import ContainerStack +from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.Validator import Validator from UM.Message import Message from UM.i18n import i18nCatalog @@ -148,11 +150,11 @@ class CuraApplication(QtApplication): UM.VersionUpgradeManager.VersionUpgradeManager.getInstance().setCurrentVersions( { - ("quality", UM.Settings.InstanceContainer.InstanceContainer.Version): (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"), - ("machine_stack", UM.Settings.ContainerStack.ContainerStack.Version): (self.ResourceTypes.MachineStack, "application/x-uranium-containerstack"), - ("extruder_train", UM.Settings.ContainerStack.ContainerStack.Version): (self.ResourceTypes.ExtruderStack, "application/x-uranium-extruderstack"), + ("quality", InstanceContainer.Version): (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"), + ("machine_stack", ContainerStack.Version): (self.ResourceTypes.MachineStack, "application/x-uranium-containerstack"), + ("extruder_train", ContainerStack.Version): (self.ResourceTypes.ExtruderStack, "application/x-uranium-extruderstack"), ("preferences", Preferences.Version): (Resources.Preferences, "application/x-uranium-preferences"), - ("user", UM.Settings.InstanceContainer.InstanceContainer.Version): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer") + ("user", InstanceContainer.Version): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer") } ) diff --git a/cura/Settings/MachineNameValidator.py b/cura/Settings/MachineNameValidator.py index 68782a2148..dcb83b7a4c 100644 --- a/cura/Settings/MachineNameValidator.py +++ b/cura/Settings/MachineNameValidator.py @@ -6,7 +6,7 @@ from PyQt5.QtGui import QValidator import os #For statvfs. import urllib #To escape machine names for how they're saved to file. -import UM.Resources +from UM.Resources import Resources from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.InstanceContainer import InstanceContainer @@ -19,7 +19,7 @@ class MachineNameValidator(QObject): #Compute the validation regex for printer names. This is limited by the maximum file name length. try: - filename_max_length = os.statvfs(UM.Resources.getDataStoragePath()).f_namemax + filename_max_length = os.statvfs(Resources.getDataStoragePath()).f_namemax except AttributeError: #Doesn't support statvfs. Probably because it's not a Unix system. filename_max_length = 255 #Assume it's Windows on NTFS. machine_name_max_length = filename_max_length - len("_current_settings.") - len(ContainerRegistry.getMimeTypeForContainer(InstanceContainer).preferredSuffix) @@ -41,7 +41,7 @@ class MachineNameValidator(QObject): def validate(self, name, position): #Check for file name length of the current settings container (which is the longest file we're saving with the name). try: - filename_max_length = os.statvfs(UM.Resources.getDataStoragePath()).f_namemax + filename_max_length = os.statvfs(Resources.getDataStoragePath()).f_namemax except AttributeError: #Doesn't support statvfs. Probably because it's not a Unix system. filename_max_length = 255 #Assume it's Windows on NTFS. escaped_name = urllib.parse.quote_plus(name) diff --git a/cura/Settings/SettingOverrideDecorator.py b/cura/Settings/SettingOverrideDecorator.py index 1b0294bd9f..76c155cb99 100644 --- a/cura/Settings/SettingOverrideDecorator.py +++ b/cura/Settings/SettingOverrideDecorator.py @@ -8,7 +8,7 @@ from UM.Signal import Signal, signalemitter from UM.Settings.ContainerStack import ContainerStack from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.ContainerRegistry import ContainerRegistry -import UM.Logger +from UM.Logger import Logger from UM.Application import Application @@ -99,7 +99,7 @@ class SettingOverrideDecorator(SceneNodeDecorator): Application.getInstance().getBackend().needsSlicing() Application.getInstance().getBackend().tickle() else: - UM.Logger.log("e", "Extruder stack %s below per-object settings does not exist.", self._extruder_stack) + Logger.log("e", "Extruder stack %s below per-object settings does not exist.", self._extruder_stack) else: self._stack.setNextStack(Application.getInstance().getGlobalContainerStack()) diff --git a/plugins/CuraProfileReader/CuraProfileReader.py b/plugins/CuraProfileReader/CuraProfileReader.py index 2198d73b22..f3ac6bab8a 100644 --- a/plugins/CuraProfileReader/CuraProfileReader.py +++ b/plugins/CuraProfileReader/CuraProfileReader.py @@ -2,7 +2,7 @@ # Cura is released under the terms of the AGPLv3 or higher. import configparser -from UM import PluginRegistry +from UM.PluginRegistry import PluginRegistry from UM.Logger import Logger from UM.Settings.InstanceContainer import InstanceContainer # The new profile to make. from cura.ProfileReader import ProfileReader diff --git a/plugins/RemovableDriveOutputDevice/__init__.py b/plugins/RemovableDriveOutputDevice/__init__.py index 616fe6ee8c..b00214d425 100644 --- a/plugins/RemovableDriveOutputDevice/__init__.py +++ b/plugins/RemovableDriveOutputDevice/__init__.py @@ -2,7 +2,7 @@ # Cura is released under the terms of the AGPLv3 or higher. from UM.Platform import Platform - +from UM.Logger import Logger from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py b/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py index 4491a00d3d..faf9105cff 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py @@ -3,7 +3,7 @@ import UM.VersionUpgrade #To indicate that a file is of incorrect format. import UM.VersionUpgradeManager #To schedule more files to be upgraded. -import UM.Resources #To get the config storage path. +from UM.Resources import Resources #To get the config storage path. import configparser #To read config files. import io #To write config files to strings as if they were files. @@ -107,7 +107,7 @@ class MachineInstance: user_profile["values"] = {} version_upgrade_manager = UM.VersionUpgradeManager.VersionUpgradeManager.getInstance() - user_storage = os.path.join(UM.Resources.getDataStoragePath(), next(iter(version_upgrade_manager.getStoragePaths("user")))) + user_storage = os.path.join(Resources.getDataStoragePath(), next(iter(version_upgrade_manager.getStoragePaths("user")))) user_profile_file = os.path.join(user_storage, urllib.parse.quote_plus(self._name) + "_current_settings.inst.cfg") if not os.path.exists(user_storage): os.makedirs(user_storage) diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py index 3bff7c1bf5..7cc404de6b 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py @@ -3,6 +3,8 @@ import configparser #To read config files. import io #To write config files to strings as if they were files. +from typing import Dict +from typing import List import UM.VersionUpgrade from UM.Logger import Logger From 18368f3ad46e0a13ec28a9c7e2559c9019ed0a59 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sun, 26 Feb 2017 21:04:05 +0100 Subject: [PATCH 43/43] Type hints and fixes for ContainerManager. --- cura/Settings/ContainerManager.py | 36 +++++++++++++++++-------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 9cd9ece79c..7bc2ff9efc 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -3,15 +3,15 @@ import os.path import urllib +from typing import Dict, Union -from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, QUrl, QVariant +from PyQt5.QtCore import QObject, QUrl, QVariant from UM.FlameProfiler import pyqtSlot from PyQt5.QtWidgets import QMessageBox from UM.PluginRegistry import PluginRegistry - -from UM.Platform import Platform from UM.SaveFile import SaveFile +from UM.Platform import Platform from UM.MimeTypeDatabase import MimeTypeDatabase from UM.Logger import Logger @@ -307,18 +307,20 @@ class ContainerManager(QObject): # # \param container_id The ID of the container to export # \param file_type The type of file to save as. Should be in the form of "description (*.extension, *.ext)" - # \param file_url The URL where to save the file. + # \param file_url_or_string The URL where to save the file. # # \return A dictionary containing a key "status" with a status code and a key "message" with a message # explaining the status. # The status code can be one of "error", "cancelled", "success" @pyqtSlot(str, str, QUrl, result = "QVariantMap") - def exportContainer(self, container_id, file_type, file_url): - if not container_id or not file_type or not file_url: + def exportContainer(self, container_id: str, file_type: str, file_url_or_string: Union[QUrl, str]) -> Dict[str, str]: + if not container_id or not file_type or not file_url_or_string: return { "status": "error", "message": "Invalid arguments"} - if isinstance(file_url, QUrl): - file_url = file_url.toLocalFile() + if isinstance(file_url_or_string, QUrl): + file_url = file_url_or_string.toLocalFile() + else: + file_url = file_url_or_string if not file_url: return { "status": "error", "message": "Invalid path"} @@ -373,12 +375,14 @@ class ContainerManager(QObject): # \return \type{Dict} dict with a 'status' key containing the string 'success' or 'error', and a 'message' key # containing a message for the user @pyqtSlot(QUrl, result = "QVariantMap") - def importContainer(self, file_url): - if not file_url: + def importContainer(self, file_url_or_string: Union[QUrl, str]) -> Dict[str, str]: + if not file_url_or_string: return { "status": "error", "message": "Invalid path"} - if isinstance(file_url, QUrl): - file_url = file_url.toLocalFile() + if isinstance(file_url_or_string, QUrl): + file_url = file_url_or_string.toLocalFile() + else: + file_url = file_url_or_string if not file_url or not os.path.exists(file_url): return { "status": "error", "message": "Invalid path" } @@ -438,7 +442,7 @@ class ContainerManager(QObject): ## Clear the top-most (user) containers of the active stacks. @pyqtSlot() - def clearUserContainers(self): + def clearUserContainers(self) -> None: self._machine_manager.blurSettings.emit() send_emits_containers = [] @@ -668,7 +672,7 @@ class ContainerManager(QObject): return new_change_instances @pyqtSlot(str, result = str) - def duplicateMaterial(self, material_id): + def duplicateMaterial(self, material_id: str) -> str: containers = self._container_registry.findInstanceContainers(id=material_id) if not containers: Logger.log("d", "Unable to duplicate the material with id %s, because it doesn't exist.", material_id) @@ -692,7 +696,7 @@ class ContainerManager(QObject): ## Get the singleton instance for this class. @classmethod - def getInstance(cls): + def getInstance(cls) -> "ContainerManager": # Note: Explicit use of class name to prevent issues with inheritance. if ContainerManager.__instance is None: ContainerManager.__instance = cls() @@ -717,7 +721,7 @@ class ContainerManager(QObject): if clear_settings: merge.clear() - def _updateContainerNameFilters(self): + def _updateContainerNameFilters(self) -> None: self._container_name_filters = {} for plugin_id, container_type in self._container_registry.getContainerTypes(): # Ignore default container types since those are not plugins