From c323bac306217be924548284106351160429bdb1 Mon Sep 17 00:00:00 2001 From: maukcc Date: Tue, 20 Feb 2018 17:15:21 +0100 Subject: [PATCH 1/2] extruder change update extruder change update: - wiping nozzles - temperature updates --- resources/definitions/cartesio.def.json | 11 ++++++----- .../extruders/cartesio_extruder_0.def.json | 13 +++---------- .../extruders/cartesio_extruder_1.def.json | 13 +++---------- .../extruders/cartesio_extruder_2.def.json | 17 +++++------------ .../extruders/cartesio_extruder_3.def.json | 15 ++++----------- .../abs/cartesio_0.25_abs_high.inst.cfg | 2 +- .../abs/cartesio_0.25_abs_normal.inst.cfg | 2 +- .../cartesio/abs/cartesio_0.4_abs_high.inst.cfg | 2 +- .../abs/cartesio_0.4_abs_normal.inst.cfg | 2 +- .../abs/cartesio_0.8_abs_coarse.inst.cfg | 2 +- .../abs/cartesio_0.8_abs_extra_coarse.inst.cfg | 2 +- .../cartesio/abs/cartesio_0.8_abs_high.inst.cfg | 2 +- .../abs/cartesio_0.8_abs_normal.inst.cfg | 2 +- .../cartesio_0.4_arnitel2045_high.inst.cfg | 2 +- .../cartesio_0.4_arnitel2045_normal.inst.cfg | 2 +- .../hips/cartesio_0.25_hips_high.inst.cfg | 2 +- .../hips/cartesio_0.25_hips_normal.inst.cfg | 2 +- .../hips/cartesio_0.4_hips_high.inst.cfg | 2 +- .../hips/cartesio_0.4_hips_normal.inst.cfg | 2 +- .../hips/cartesio_0.8_hips_coarse.inst.cfg | 2 +- .../cartesio_0.8_hips_extra_coarse.inst.cfg | 2 +- .../hips/cartesio_0.8_hips_high.inst.cfg | 2 +- .../hips/cartesio_0.8_hips_normal.inst.cfg | 2 +- .../nylon/cartesio_0.25_nylon_high.inst.cfg | 2 +- .../nylon/cartesio_0.25_nylon_normal.inst.cfg | 2 +- .../nylon/cartesio_0.4_nylon_high.inst.cfg | 2 +- .../nylon/cartesio_0.4_nylon_normal.inst.cfg | 2 +- .../nylon/cartesio_0.8_nylon_coarse.inst.cfg | 2 +- .../cartesio_0.8_nylon_extra_coarse.inst.cfg | 2 +- .../nylon/cartesio_0.8_nylon_high.inst.cfg | 2 +- .../nylon/cartesio_0.8_nylon_normal.inst.cfg | 2 +- .../cartesio/pc/cartesio_0.25_pc_high.inst.cfg | 2 +- .../pc/cartesio_0.25_pc_normal.inst.cfg | 2 +- .../cartesio/pc/cartesio_0.4_pc_high.inst.cfg | 2 +- .../cartesio/pc/cartesio_0.4_pc_normal.inst.cfg | 2 +- .../cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg | 2 +- .../pc/cartesio_0.8_pc_extra_coarse.inst.cfg | 2 +- .../cartesio/pc/cartesio_0.8_pc_high.inst.cfg | 2 +- .../cartesio/pc/cartesio_0.8_pc_normal.inst.cfg | 2 +- .../petg/cartesio_0.25_petg_high.inst.cfg | 2 +- .../petg/cartesio_0.25_petg_normal.inst.cfg | 2 +- .../petg/cartesio_0.4_petg_high.inst.cfg | 2 +- .../petg/cartesio_0.4_petg_normal.inst.cfg | 2 +- .../petg/cartesio_0.8_petg_coarse.inst.cfg | 2 +- .../cartesio_0.8_petg_extra_coarse.inst.cfg | 2 +- .../petg/cartesio_0.8_petg_high.inst.cfg | 2 +- .../petg/cartesio_0.8_petg_normal.inst.cfg | 2 +- .../pla/cartesio_0.25_pla_high.inst.cfg | 2 +- .../pla/cartesio_0.25_pla_normal.inst.cfg | 2 +- .../cartesio/pla/cartesio_0.4_pla_high.inst.cfg | 2 +- .../pla/cartesio_0.4_pla_normal.inst.cfg | 2 +- .../pla/cartesio_0.8_pla_coarse.inst.cfg | 2 +- .../pla/cartesio_0.8_pla_extra_coarse.inst.cfg | 2 +- .../cartesio/pla/cartesio_0.8_pla_high.inst.cfg | 2 +- .../pla/cartesio_0.8_pla_normal.inst.cfg | 2 +- .../pva/cartesio_0.25_pva_high.inst.cfg | 2 +- .../pva/cartesio_0.25_pva_normal.inst.cfg | 2 +- .../cartesio/pva/cartesio_0.4_pva_high.inst.cfg | 2 +- .../pva/cartesio_0.4_pva_normal.inst.cfg | 2 +- .../pva/cartesio_0.8_pva_coarse.inst.cfg | 2 +- .../pva/cartesio_0.8_pva_extra_coarse.inst.cfg | 2 +- .../cartesio/pva/cartesio_0.8_pva_high.inst.cfg | 2 +- .../pva/cartesio_0.8_pva_normal.inst.cfg | 2 +- 63 files changed, 79 insertions(+), 106 deletions(-) diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 44f3153015..a4bab6432d 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, "author": "Scheepers", - "manufacturer": "Cartesio bv", + "manufacturer": "MaukCC", "file_formats": "text/x-gcode", "has_machine_quality": true, @@ -14,7 +14,7 @@ "has_variant_materials": true, "has_variants": true, - "variants_name": "Nozzle size", + "variants_name": "Tool", "preferred_variant": "*0.8*", "preferred_material": "*pla*", "preferred_quality": "*normal*", @@ -44,7 +44,7 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, - "prime_tower_enable": { "default_value": true }, + "prime_tower_enable": { "default_value": false }, "prime_tower_wall_thickness": { "resolve": 0.7 }, "prime_tower_size": { "value": 24.0 }, "prime_tower_position_x": { "value": 125 }, @@ -55,15 +55,16 @@ [[215, 135], [-215, 135], [-215, 75], [215, 75]] ]}, "machine_start_gcode": { - "default_value": "\nM92 E159 ;2288 for V5 extruder\n\nM140 S{material_bed_temperature_layer_0}\nM104 S120 T1\nM104 S120 T2\nM104 S120 T3\n\nG21\nG90\nM42 S255 P13 ;chamber lights\nM42 S255 P12 ;fume extraction\nM204 S300 ;default acceleration\nM205 X10 ;default jerk\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 S1200 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\nG1 Z10 F900\n\nM104 S21 T1\nM104 S21 T2\nM104 S21 T3\n\nM117 Printing .....\n" + "default_value": "\nM92 E159 ;2288 for V5 extruder\n\nM140 S{material_bed_temperature_layer_0}\nM104 T1 S120\nM104 T2 S120\nM104 T3 S120\n\nG21\nG90\nM42 S255 P13 ;chamber lights\nM42 S255 P12 ;fume extraction\nM204 S300 ;default acceleration\nM205 X10 ;default jerk\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 S1200 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\nG1 Z10 F900\n\nM104 T1 S21\nM104 T2 S21\nM104 T3 S21\n\nM117 Printing .....\n" }, "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM117 cooling down....\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nM104 S5 T2\nM104 S5 T3\n\nG91\nG1 Z1 F900\nG90\n\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\nM117 Finished.\n; -- end of GCODE --" + "default_value": "; -- END GCODE --\nM117 cooling down....\nM106 S255\nM140 S5\nM104 T0 S5\nM104 T1 S5\nM104 T2 S5\nM104 T3 S5\n\nG91\nG1 Z1 F900\nG90\n\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\nM117 Finished.\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')))" }, "retraction_extra_prime_amount": { "minimum_value_warning": "-2.0" }, "optimize_wall_printing_order": { "default_value": true }, + "material_initial_print_temperature": {"maximum_value_warning": "material_print_temperature + 15" }, "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} diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index 5558d9325e..47b5b5abf5 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -16,17 +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\n\nM117 printing...\n" + "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T0 S120\n;end extruder_0\nM117 temp is {material_print_temp}\n" - }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 24 }, - "machine_extruder_start_pos_y": { "default_value": 16 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 48 }, - "machine_extruder_end_pos_y": { "default_value": 16 } + "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n" + } } } diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index f8350f8091..78bcccd12a 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -16,17 +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\n\nM117 printing...\n" + "default_value": "\n;start T1\n\nM104 T1 S{material_print_temperature_layer_0}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y15 F3000; wipe\nG1 X34 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T1 S120\n;end extruder_1\n" - }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 48 }, - "machine_extruder_start_pos_y": { "default_value": 16 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 24 }, - "machine_extruder_end_pos_y": { "default_value": 16 } + "default_value": "\nM104 T1 S{material_standby_temperature}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 R{material_standby_temperature}; wait for temp\nG1 X21 Y15 F3000; wipe\nG1 X31 F9000\nG1 Y35 F6000; wipe again\n\n;end T1\n\n" + } } } diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index bfc10e75c3..dbd6643bfe 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -13,20 +13,13 @@ "default_value": 2, "maximum_value": "3" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_offset_x": { "default_value": 24.0 }, + "machine_nozzle_offset_y": { "default_value": -100.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_2\n\nM117 printing...\n" + "default_value": "\n;start T2\n\nM104 T2 S{material_print_temperature_layer_0}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T2 S120\n;end extruder_2\n" - }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 24 }, - "machine_extruder_start_pos_y": { "default_value": 309 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 48 }, - "machine_extruder_end_pos_y": { "default_value": 309 } + "default_value": "\nM104 T2 S{material_standby_temperature}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 R{material_standby_temperature}; wait for temp\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\n;end T2\n\n" + } } } diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index f0be53e564..beed117abe 100644 --- a/resources/extruders/cartesio_extruder_3.def.json +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -14,19 +14,12 @@ "maximum_value": "3" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": -100.0 }, "machine_extruder_start_code": { - "default_value": "\n;start extruder_3\n\nM117 printing...\n" + "default_value": "\n;start T3\n\nM104 T3 S{material_print_temperature_layer_0}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n" }, "machine_extruder_end_code": { - "default_value": "\nM104 T3 S120\n;end extruder_3\n" - }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 48 }, - "machine_extruder_start_pos_y": { "default_value": 309 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 24 }, - "machine_extruder_end_pos_y": { "default_value": 309} + "default_value": "\nM104 T3 S{material_standby_temperature}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 R{material_standby_temperature}; wait for temp\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\n;end T3\n\n" + } } } diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg index 418855a9ba..f541fd9654 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg index e95ef08e22..a3c1d1ac14 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg index 524f5ba12a..e299ccd2b2 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg index 24ffb19d6f..ea92f0bd34 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg index 1281a3afdd..3887e9dfe2 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg index a8d19deef7..c9f430ac9a 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg index 87cc855f44..983d199533 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg index 4ca2598051..06570a7153 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg index 42eb705f11..8afe86164e 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 2 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg index 538fe91b76..27c659ea0a 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 2 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg index eae4e82cd3..670b9012c7 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg index 0c47b18196..c2a5bbff08 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg index 14f1ea4662..fd3efddd07 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg index bd13b358ff..1b0acd573e 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg index ca864692c3..ca9907923f 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg index 3cadef4fdd..8f79fa6d37 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg index 07839c8a9a..1b7dac5eaf 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg index acc9db0891..843f14ea43 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg index b1f2f17d41..f8a1d2df33 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg index bcfa1c2e30..6c6f608390 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg index 2cd50efeb2..53abdcad1f 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg index 7a7d767ea3..9ff9dbf5e9 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg index 5684c89e23..4add038914 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg index 8d97e9ac5f..0020950cd5 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg index 946f8de34d..b74faaec40 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg index 80f390c254..cb59f1803c 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg index ff6547dd91..a1bee46782 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg index f3faa9c129..dc5b88f84b 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg index 3aa808fab5..49ddf1bc98 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg index f9be12da3a..47fe5d9a40 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg index 597187437b..c4313f2718 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg index 6d1fa196ec..5e093a8f32 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg index c570b65350..fa1bebc645 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg index 0d73b24197..12cb3a5abd 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg index c5c4be6f4a..f926688cc7 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg index 6d12bdc402..fbea40e500 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg index 43dda5007c..30f0d2d926 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg index 094dc33263..688373bf94 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg index da9e4ad3dd..2516cd17e8 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg index 607ba778a1..5c1995f5bc 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg index 3010d95dab..eb0afde18f 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 50 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg index fbf8fac67f..27c7b894b5 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg index 9d8130602e..90572b988f 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg index 98401dbf42..51faec512e 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg index 2eda5103d7..54e59d2e44 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg index f3d3820ff7..a8526458b1 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg index d2cf708336..02e86f00f5 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg index 888d8f91a7..aff51dc552 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg index 558514db98..2e000b9ce4 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg index 9c508e4a1f..240b0d497f 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg index fcbf4913de..9330a977b7 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg index 3893421df0..204ca68174 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg index 5876db1e2e..7a484180d4 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg index c977e79a5c..6e12288510 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg index 8c36d8e7ed..eefb7fe8a3 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg index c2b19868f6..cd7fe200bf 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg index 5bd285285a..602575b93c 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg index a11bff95e1..4201c8e37d 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg @@ -23,7 +23,7 @@ infill_sparse_density = 40 infill_pattern = grid material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 material_final_print_temperature = =material_print_temperature retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 From c47045a42e39ef42828cb87383f9f052fe5d979a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Feb 2018 11:47:17 +0100 Subject: [PATCH 2/2] Revert "CuraApplication/UM.MeshBuilder: Removing _reloadMeshFinished" This reverts commit 269b52487ed28e42daf7e2716117c4d3d27bc2fa. It was crashing Cura when pressing F5. The completion of this job should not be moved to Uranium because the job exists only in Cura. Contributes to issue CURA-4912. --- cura/CuraApplication.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 720fcab86b..90c7dbb75e 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1307,7 +1307,7 @@ class CuraApplication(QtApplication): if file_name: job = ReadMeshJob(file_name) job._node = node - job.finished.connect(node._reloadJobFinished) + job.finished.connect(self._reloadMeshFinished) job.start() else: Logger.log("w", "Unable to reload data because we don't have a filename.") @@ -1436,6 +1436,14 @@ class CuraApplication(QtApplication): fileLoaded = pyqtSignal(str) fileCompleted = pyqtSignal(str) + def _reloadMeshFinished(self, job): + # TODO; This needs to be fixed properly. We now make the assumption that we only load a single mesh! + mesh_data = job.getResult()[0].getMeshData() + if mesh_data: + job._node.setMeshData(mesh_data) + else: + Logger.log("w", "Could not find a mesh in reloaded node.") + def _openFile(self, filename): self.readLocalFile(QUrl.fromLocalFile(filename))