diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py index e4dae9376b..30f37fe3fa 100644 --- a/plugins/MakerbotWriter/MakerbotWriter.py +++ b/plugins/MakerbotWriter/MakerbotWriter.py @@ -258,11 +258,87 @@ class MakerbotWriter(MeshWriter): meta["preferences"] = dict() bounds = application.getBuildVolume().getBoundingBox() + intent = CuraApplication.getInstance().getIntentManager().currentIntentCategory meta["preferences"]["instance0"] = { "machineBounds": [bounds.right, bounds.front, bounds.left, bounds.back] if bounds is not None else None, - "printMode": CuraApplication.getInstance().getIntentManager().currentIntentCategory, + "printMode": intent } + if file_format == "application/x-makerbot": + accel_overrides = meta["accel_overrides"] = {} + if intent in ['highspeed', 'highspeedsolid']: + accel_overrides['do_input_shaping'] = True + accel_overrides['do_corner_rounding'] = True + bead_mode_overrides = accel_overrides["bead_mode"] = {} + + accel_enabled = global_stack.getProperty('acceleration_enabled', 'value') + + if accel_enabled: + global_accel_setting = global_stack.getProperty('acceleration_print', 'value') + accel_overrides["rate_mm_per_s_sq"] = { + "x": global_accel_setting, + "y": global_accel_setting + } + + if global_stack.getProperty('acceleration_travel_enabled', 'value'): + travel_accel_setting = global_stack.getProperty('acceleration_travel', 'value') + bead_mode_overrides['Travel Move'] = { + "rate_mm_per_s_sq": { + "x": travel_accel_setting, + "y": travel_accel_setting + } + } + + jerk_enabled = global_stack.getProperty('jerk_enabled', 'value') + if jerk_enabled: + global_jerk_setting = global_stack.getProperty('jerk_print', 'value') + accel_overrides["max_speed_change_mm_per_s"] = { + "x": global_jerk_setting, + "y": global_jerk_setting + } + + if global_stack.getProperty('jerk_travel_enabled', 'value'): + travel_jerk_setting = global_stack.getProperty('jerk_travel', 'value') + if 'Travel Move' not in bead_mode_overrides: + bead_mode_overrides['Travel Move' ] = {} + bead_mode_overrides['Travel Move'].update({ + "max_speed_change_mm_per_s": { + "x": travel_jerk_setting, + "y": travel_jerk_setting + } + }) + + + # Get bead mode settings per extruder + available_bead_modes = { + "infill": "FILL", + "prime_tower": "PRIME_TOWER", + "roofing": "TOP_SURFACE", + "support_infill": "SUPPORT", + "support_interface": "SUPPORT_INTERFACE", + "wall_0": "WALL_OUTER", + "wall_x": "WALL_INNER", + "skirt_brim": "SKIRT" + } + for idx, extruder in enumerate(extruders): + for bead_mode_setting, bead_mode_tag in available_bead_modes.items(): + ext_specific_tag = "%s_%s" % (bead_mode_tag, idx) + if accel_enabled or jerk_enabled: + bead_mode_overrides[ext_specific_tag] = {} + + if accel_enabled: + accel_val = extruder.getProperty('acceleration_%s' % bead_mode_setting, 'value') + bead_mode_overrides[ext_specific_tag]["rate_mm_per_s_sq"] = { + "x": accel_val, + "y": accel_val + } + if jerk_enabled: + jerk_val = extruder.getProperty('jerk_%s' % bead_mode_setting, 'value') + bead_mode_overrides[ext_specific_tag][ "max_speed_change_mm_per_s"] = { + "x": jerk_val, + "y": jerk_val + } + meta["miracle_config"] = {"gaggles": {"instance0": {}}} version_info = dict() diff --git a/plugins/UM3NetworkPrinting/resources/png/MakerBot Method X.png b/plugins/UM3NetworkPrinting/resources/png/MakerBot Method X.png index fc289fe62c..fa8460860c 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/MakerBot Method X.png and b/plugins/UM3NetworkPrinting/resources/png/MakerBot Method X.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/MakerBot Method XL.png b/plugins/UM3NetworkPrinting/resources/png/MakerBot Method XL.png index c23767459c..bad4e0b8ac 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/MakerBot Method XL.png and b/plugins/UM3NetworkPrinting/resources/png/MakerBot Method XL.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/MakerBot Method.png b/plugins/UM3NetworkPrinting/resources/png/MakerBot Method.png index c48fe68492..446c0dd6e3 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/MakerBot Method.png and b/plugins/UM3NetworkPrinting/resources/png/MakerBot Method.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/MakerBot Sketch.png b/plugins/UM3NetworkPrinting/resources/png/MakerBot Sketch.png index 2cc52a13ba..dea80a1ff5 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/MakerBot Sketch.png and b/plugins/UM3NetworkPrinting/resources/png/MakerBot Sketch.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 2+ Connect.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 2+ Connect.png index 9821dc0908..9c37f046da 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 2+ Connect.png and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 2+ Connect.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png index c4beb8d709..f41dc11f0a 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3 Extended.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png index e499d767c1..12126160d0 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker 3.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker Factor 4.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker Factor 4.png index 2a9b3567c8..aa96550988 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/Ultimaker Factor 4.png and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker Factor 4.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png index d92e454d23..9eb9ae086b 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S3.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png index 56400f7027..a673a89598 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S5.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S6.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S6.png new file mode 100644 index 0000000000..393225ddfc Binary files /dev/null and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S6.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S7.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S7.png index 6f75d02005..3ef77eac7c 100644 Binary files a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S7.png and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S7.png differ diff --git a/plugins/UM3NetworkPrinting/resources/png/Ultimaker S8.png b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S8.png new file mode 100644 index 0000000000..1c901a748a Binary files /dev/null and b/plugins/UM3NetworkPrinting/resources/png/Ultimaker S8.png differ diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json index 47227e187d..2718882cc4 100644 --- a/resources/definitions/creality_ender3v3ke.def.json +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -48,7 +48,7 @@ "machine_width": { "default_value": 220 }, "material_print_temp_wait": { "default_value": false }, "retraction_amount": { "default_value": 0.8 }, - "retraction_combing": { "value": "no_outer_surfaces" }, + "retraction_combing": { "value": "'no_outer_surfaces'" }, "retraction_combing_max_distance": { "value": 5.0 }, "retraction_extrusion_window": { "value": "retraction_amount" }, "retraction_min_travel": { "value": 2.0 }, diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 2e9f4abda1..d8fdd7eede 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -48,23 +48,111 @@ "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, "infill_overlap": { "value": "0 if infill_sparse_density > 80 else 10" }, "inset_direction": { "value": "'outside_in'" }, - "jerk_infill": { "minimum_value_warning": 20 }, - "jerk_prime_tower": { "minimum_value_warning": 20 }, + "jerk_flooring": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_infill": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_layer_0": { "minimum_value": 1 }, + "jerk_prime_tower": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, "jerk_print": { + "minimum_value": 1, "minimum_value_warning": 20, "value": "20" }, - "jerk_print_layer_0": { "value": "max(20, jerk_wall_0)" }, - "jerk_roofing": { "minimum_value_warning": 20 }, - "jerk_support": { "minimum_value_warning": 20 }, - "jerk_support_infill": { "minimum_value_warning": 20 }, - "jerk_support_interface": { "minimum_value_warning": 20 }, - "jerk_topbottom": { "minimum_value_warning": 20 }, - "jerk_travel": { "value": "jerk_print" }, + "jerk_print_layer_0": + { + "minimum_value": 1, + "value": "max(20, jerk_wall_0)" + }, + "jerk_roofing": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_skirt_brim": { "minimum_value": 1 }, + "jerk_support": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_support_bottom": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_support_infill": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_support_interface": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_support_roof": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_topbottom": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_travel": + { + "minimum_value": 1, + "value": "jerk_print" + }, "jerk_travel_enabled": { "value": false }, - "jerk_wall": { "minimum_value_warning": 20 }, - "jerk_wall_0": { "minimum_value_warning": 20 }, + "jerk_travel_layer_0": { "minimum_value": 1 }, + "jerk_wall": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_0": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_0_flooring": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_0_roofing": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_x": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_x_flooring": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_x_roofing": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, "layer_height": { "value": 0.15 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, "line_width": { "value": "machine_nozzle_size" }, diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 14d3a08818..e421b20529 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -33,12 +33,15 @@ { "acceleration_enabled": { - "enabled": false, + "enabled": true, "value": true }, "acceleration_infill": { "enabled": false, + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, "value": "acceleration_print" }, "acceleration_layer_0": @@ -49,11 +52,17 @@ "acceleration_prime_tower": { "enabled": false, + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, "value": "acceleration_print" }, "acceleration_print": { "enabled": false, + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, "value": 800 }, "acceleration_print_layer_0": @@ -64,32 +73,52 @@ "acceleration_roofing": { "enabled": false, + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, "value": "acceleration_print" }, + "acceleration_skirt_brim": + { + "enabled": false, + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, + "value": 800 + }, "acceleration_support": { "enabled": false, + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, "value": "acceleration_print" }, "acceleration_support_bottom": { "enabled": false, - "value": "acceleration_print" + "value": "acceleration_support_interface" }, "acceleration_support_infill": { "enabled": false, - "value": "acceleration_print" + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, + "value": "acceleration_support" }, "acceleration_support_interface": { "enabled": false, - "value": "acceleration_print" + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, + "value": "acceleration_support" }, "acceleration_support_roof": { "enabled": false, - "value": "acceleration_print" + "value": "acceleration_support_interface" }, "acceleration_topbottom": { @@ -99,6 +128,9 @@ "acceleration_travel": { "enabled": false, + "maximum_value": 5000, + "minimum_value": 200, + "minimum_value_warning": 750, "value": 5000 }, "acceleration_travel_enabled": @@ -114,27 +146,36 @@ "acceleration_wall": { "enabled": false, + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, "value": "acceleration_print" }, "acceleration_wall_0": { "enabled": false, - "value": "acceleration_print" + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, + "value": "acceleration_wall" }, "acceleration_wall_0_roofing": { "enabled": false, - "value": "acceleration_print" + "value": "acceleration_wall" }, "acceleration_wall_x": { "enabled": false, - "value": "acceleration_print" + "maximum_value": 3500, + "minimum_value": 200, + "minimum_value_warning": 750, + "value": "acceleration_wall" }, "acceleration_wall_x_roofing": { "enabled": false, - "value": "acceleration_print" + "value": "acceleration_wall" }, "adhesion_extruder_nr": { @@ -203,12 +244,15 @@ "inset_direction": { "value": "'inside_out'" }, "jerk_enabled": { - "enabled": false, + "enabled": true, "value": true }, "jerk_infill": { - "enabled": false, + "enabled": "jerk_enabled", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, "value": "jerk_print" }, "jerk_layer_0": @@ -218,13 +262,19 @@ }, "jerk_prime_tower": { - "enabled": false, + "enabled": "jerk_enabled and prime_tower_enable and extruders_enabled_count > 1", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, "value": "jerk_print" }, "jerk_print": { - "enabled": false, - "value": 6.25 + "enabled": "jerk_enabled", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, + "value": 12.5 }, "jerk_print_layer_0": { @@ -233,33 +283,50 @@ }, "jerk_roofing": { - "enabled": false, + "enabled": "jerk_enabled", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, "value": "jerk_print" }, + "jerk_skirt_brim": + { + "enabled": "jerk_enabled and (adhesion_type == 'brim' or adhesion_type == 'skirt')", + "value": 12.5 + }, "jerk_support": { - "enabled": false, + "enabled": "jerk_enabled and support_enable", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, "value": "jerk_print" }, "jerk_support_bottom": { "enabled": false, - "value": "jerk_print" + "value": "jerk_support_interface" }, "jerk_support_infill": { - "enabled": false, - "value": "jerk_print" + "enabled": "jerk_enabled and support_enable", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, + "value": "jerk_support" }, "jerk_support_interface": { - "enabled": false, - "value": "jerk_print" + "enabled": "jerk_enabled and support_enable", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, + "value": "jerk_support" }, "jerk_support_roof": { "enabled": false, - "value": "jerk_print" + "value": "jerk_support_interface" }, "jerk_topbottom": { @@ -268,8 +335,11 @@ }, "jerk_travel": { - "enabled": false, - "value": "jerk_print" + "enabled": "jerk_enabled", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, + "value": 12.5 }, "jerk_travel_enabled": { @@ -283,12 +353,18 @@ }, "jerk_wall": { - "enabled": false, + "enabled": "jerk_enabled", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, "value": "jerk_print" }, "jerk_wall_0": { - "enabled": false, + "enabled": "jerk_enabled", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, "value": "jerk_print" }, "jerk_wall_0_roofing": @@ -298,7 +374,10 @@ }, "jerk_wall_x": { - "enabled": false, + "enabled": "jerk_enabled", + "maximum_value": 35, + "minimum_value": 5, + "minimum_value_warning": 12, "value": "jerk_print" }, "jerk_wall_x_roofing": @@ -517,16 +596,86 @@ "skirt_height": { "value": 3 }, "small_skin_width": { "value": 4 }, "speed_equalize_flow_width_factor": { "value": 0 }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": 50 }, - "speed_roofing": { "value": "speed_wall_0" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_wall" }, + "speed_infill": + { + "maximum_value": 350, + "maximum_value_warning": 325 + }, + "speed_prime_tower": + { + "maximum_value": 250, + "maximum_value_warning": 200, + "value": "speed_topbottom" + }, + "speed_print": + { + "maximum_value": 350, + "maximum_value_warning": 325, + "value": 50 + }, + "speed_roofing": + { + "maximum_value": 300, + "maximum_value_warning": 275, + "value": "speed_wall_0" + }, + "speed_support": + { + "maximum_value": 350, + "maximum_value_warning": 325, + "value": "speed_wall" + }, + "speed_support_infill": + { + "maximum_value": 350, + "maximum_value_warning": 325 + }, + "speed_support_interface": + { + "maximum_value": 260, + "maximum_value_warning": 255, + "value": "speed_topbottom" + }, + "speed_support_roof": + { + "maximum_value": 260, + "maximum_value_warning": 255 + }, + "speed_topbottom": + { + "maximum_value": 260, + "maximum_value_warning": 255, + "value": "speed_wall" + }, "speed_travel": { "value": 250 }, - "speed_wall": { "value": "speed_print * 40/50" }, - "speed_wall_0": { "value": "speed_wall * 30/40" }, - "speed_wall_x": { "value": "speed_wall" }, + "speed_wall": + { + "maximum_value": 260, + "maximum_value_warning": 255, + "value": "speed_print * 40/50" + }, + "speed_wall_0": + { + "maximum_value": 260, + "maximum_value_warning": 255, + "value": "speed_wall * 30/40" + }, + "speed_wall_0_roofing": + { + "maximum_value": 260, + "maximum_value_warning": 255 + }, + "speed_wall_x": + { + "maximum_value": 260, + "maximum_value_warning": 255, + "value": "speed_wall" + }, + "speed_wall_x_roofing": + { + "maximum_value": 260, + "maximum_value_warning": 255 + }, "support_angle": { "value": 40 }, "support_bottom_height": { "value": "2*support_infill_sparse_thickness" }, "support_bottom_line_width": diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 65fca17df7..d26d3a9555 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -1,7 +1,7 @@ { "version": 2, "name": "Ultimaker Original Dual Extrusion", - "inherits": "ultimaker", + "inherits": "ultimaker_original", "metadata": { "visible": true, @@ -49,10 +49,13 @@ }, "overrides": { + "cool_fan_speed_0": { "value": "cool_fan_speed_min" }, "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": "True" }, + "layer_height_0": { "value": "max(0.2, layer_height)" }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 195 }, - "machine_end_gcode": { "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_end_gcode": { "value": "'M104 T0 S0 ;1st extruder heater off\\nM104 T1 S0 ;2nd extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": @@ -65,9 +68,11 @@ ] }, "machine_height": { "default_value": 200 }, - "machine_name": { "default_value": "Ultimaker Original" }, + "machine_name": { "default_value": "Ultimaker Original Dual Extrusion" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - "machine_width": { "default_value": 205 } + "machine_width": { "default_value": 205 }, + "material_print_temp_wait": { "value": false }, + "speed_slowdown_layers": { "value": 1 } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_s6.def.json b/resources/definitions/ultimaker_s6.def.json index bc0e6a0f4e..90a90fee26 100644 --- a/resources/definitions/ultimaker_s6.def.json +++ b/resources/definitions/ultimaker_s6.def.json @@ -9,9 +9,7 @@ "manufacturer": "Ultimaker B.V.", "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s5_platform.obj", - "bom_numbers": [ - 10700 - ], + "bom_numbers": [10700, 10701], "firmware_update_info": { "check_urls": [ "https://software.ultimaker.com/releases/firmware/5078167/stable/um-update.swu.version" ], @@ -48,6 +46,6 @@ "overrides": { "adhesion_type": { "value": "'brim'" }, - "machine_name": { "default_value": "UltiMaker S6" } + "machine_name": { "default_value": "Ultimaker S6" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 41120c23df..14d9b21168 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -47,7 +47,7 @@ "overrides": { "default_material_print_temperature": { "maximum_value_warning": "320" }, - "machine_name": { "default_value": "UltiMaker S7" }, + "machine_name": { "default_value": "Ultimaker S7" }, "material_print_temperature_layer_0": { "maximum_value_warning": "320" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index 8fa2ab8459..fb8243cd60 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -12,6 +12,17 @@ "bom_numbers": [ 10600 ], + "exclude_materials": [ + "generic_hips", + "generic_flexible", + "generic_cffpps", + "generic_cffpa", + "generic_cffcpe", + "generic_gffpa", + "generic_gffcpe", + "structur3d_", + "ultimaker_ppscf" + ], "firmware_update_info": { "check_urls": [ "https://software.ultimaker.com/releases/firmware/10600/stable/um-update.swu.version" ], @@ -203,6 +214,14 @@ "unit": "mm/s", "value": 50 }, + "build_volume_temperature": + { + "force_depends_on_settings": [ + "support_extruder_nr", + "support_enable" + ] + }, + "cool_during_extruder_switch": { "value": "'all_fans'" }, "cool_min_layer_time": { "value": 5 }, "cool_min_layer_time_overhang": { "value": 9 }, "cool_min_layer_time_overhang_min_segment_length": { "value": 2 }, @@ -245,7 +264,7 @@ { "maximum_value_warning": "machine_max_jerk_xy / 2", "unit": "m/s\u00b3", - "value": "jerk_print" + "value": "jerk_wall" }, "jerk_print": { @@ -385,10 +404,17 @@ "unit": "m/s\u00b3", "value": "20000 if machine_gcode_flavor == 'Cheetah' else 100" }, - "machine_name": { "default_value": "UltiMaker S8" }, + "machine_name": { "default_value": "Ultimaker S8" }, "machine_nozzle_cool_down_speed": { "default_value": 1.3 }, "machine_nozzle_heat_up_speed": { "default_value": 0.6 }, "machine_start_gcode": { "default_value": "M213 U0.1 ;undercut 0.1mm" }, + "material_bed_temperature": + { + "force_depends_on_settings": [ + "support_extruder_nr", + "support_enable" + ] + }, "material_extrusion_cool_down_speed": { "value": 0 }, "material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, @@ -397,6 +423,7 @@ "enabled": true, "value": 0.5 }, + "material_print_temperature": { "maximum_value_warning": 320 }, "material_print_temperature_layer_0": { "maximum_value_warning": 320 }, "max_flow_acceleration": { "value": 8.0 }, "max_skin_angle_for_expansion": { "value": 45 }, @@ -445,12 +472,12 @@ "speed_layer_0": { "maximum_value_warning": 300, - "value": "speed_wall" + "value": "min(speed_wall, 50)" }, "speed_prime_tower": { "maximum_value_warning": 300, - "value": "speed_wall" + "value": "min(speed_wall, 50)" }, "speed_print": { @@ -500,13 +527,13 @@ "speed_travel": { "maximum_value": 500, - "maximum_value_warning": 300, - "value": 300 + "maximum_value_warning": 500, + "value": 500 }, "speed_travel_layer_0": { "maximum_value": 500, - "maximum_value_warning": 300, + "maximum_value_warning": 500, "value": 150 }, "speed_wall": @@ -556,7 +583,10 @@ "support_roof_height": { "minimum_value_warning": 0 }, "support_structure": { "value": "'normal'" }, "support_top_distance": { "maximum_value_warning": "3*layer_height" }, + "support_tree_angle": { "value": 50 }, + "support_tree_angle_slow": { "value": 35 }, "support_tree_bp_diameter": { "value": 15 }, + "support_tree_branch_diameter": { "value": 8 }, "support_tree_tip_diameter": { "value": 1.0 }, "support_tree_top_rate": { "value": 20 }, "support_xy_distance_overhang": { "value": "machine_nozzle_size" }, @@ -573,6 +603,7 @@ "wall_material_flow": { "value": 95 }, "wall_overhang_angle": { "value": 45 }, "wall_x_material_flow": { "value": 100 }, + "xy_offset": { "value": 0.05 }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, "z_seam_position": { "value": "'backright'" }, "z_seam_type": { "value": "'sharpest_corner'" } diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg new file mode 100644 index 0000000000..f5a00d9db1 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeed.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_methodx +name = High Speed +version = 4 + +[metadata] +intent_category = highspeed +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1C + +[values] +acceleration_print = 3500 +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_pattern = zigzag +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg new file mode 100644 index 0000000000..2e098b3a0b --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -0,0 +1,38 @@ +[general] +definition = ultimaker_methodx +name = High Speed Solid +version = 4 + +[metadata] +intent_category = highspeedsolid +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1C + +[values] +acceleration_print = 3500 +bottom_thickness = =top_bottom_thickness +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg new file mode 100644 index 0000000000..0db1a5b803 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeed.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_methodx +name = High Speed +version = 4 + +[metadata] +intent_category = highspeed +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1XA + +[values] +acceleration_print = 3500 +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_pattern = zigzag +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg new file mode 100644 index 0000000000..b6ff6e1ebd --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -0,0 +1,38 @@ +[general] +definition = ultimaker_methodx +name = High Speed Solid +version = 4 + +[metadata] +intent_category = highspeedsolid +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1XA + +[values] +acceleration_print = 3500 +bottom_thickness = =top_bottom_thickness +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg new file mode 100644 index 0000000000..4b42af13fa --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeed.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_methodx +name = High Speed +version = 4 + +[metadata] +intent_category = highspeed +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = LABS + +[values] +acceleration_print = 3500 +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_pattern = zigzag +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag + diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg new file mode 100644 index 0000000000..69a50a831b --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -0,0 +1,38 @@ +[general] +definition = ultimaker_methodx +name = High Speed Solid +version = 4 + +[metadata] +intent_category = highspeedsolid +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = LABS + +[values] +acceleration_print = 3500 +bottom_thickness = =top_bottom_thickness +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg new file mode 100644 index 0000000000..0328525090 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeed.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_methodxl +name = High Speed +version = 4 + +[metadata] +intent_category = highspeed +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1C + +[values] +acceleration_print = 3500 +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_pattern = zigzag +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg new file mode 100644 index 0000000000..0c2bb88cc7 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -0,0 +1,38 @@ +[general] +definition = ultimaker_methodxl +name = High Speed Solid +version = 4 + +[metadata] +intent_category = highspeedsolid +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1C + +[values] +acceleration_print = 3500 +bottom_thickness = =top_bottom_thickness +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg new file mode 100644 index 0000000000..a82ddaa428 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeed.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_methodxl +name = High Speed +version = 4 + +[metadata] +intent_category = highspeed +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1XA + +[values] +acceleration_print = 3500 +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_pattern = zigzag +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg new file mode 100644 index 0000000000..9aebcb531b --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -0,0 +1,38 @@ +[general] +definition = ultimaker_methodxl +name = High Speed Solid +version = 4 + +[metadata] +intent_category = highspeedsolid +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = 1XA + +[values] +acceleration_print = 3500 +bottom_thickness = =top_bottom_thickness +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg new file mode 100644 index 0000000000..11aa6d2878 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeed.inst.cfg @@ -0,0 +1,32 @@ +[general] +definition = ultimaker_methodxl +name = High Speed +version = 4 + +[metadata] +intent_category = highspeed +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = LABS + +[values] +acceleration_print = 3500 +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_pattern = zigzag +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg new file mode 100644 index 0000000000..ea8caef493 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_highspeedsolid.inst.cfg @@ -0,0 +1,38 @@ +[general] +definition = ultimaker_methodxl +name = High Speed Solid +version = 4 + +[metadata] +intent_category = highspeedsolid +is_experimental = True +material = ultimaker_absr_175 +quality_type = draft +setting_version = 25 +type = intent +variant = LABS + +[values] +acceleration_print = 3500 +bottom_thickness = =top_bottom_thickness +bridge_wall_speed = 300 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_min_layer_time = 3 +cool_min_temperature = 245.0 +infill_angles = [45,135] +infill_material_flow = 97 +infill_pattern = zigzag +infill_sparse_density = 99 +jerk_print = 35 +speed_layer_0 = 55 +speed_print = 300 +speed_support = 100 +speed_support_interface = 75 +speed_travel = 500 +speed_travel_layer_0 = 250 +speed_wall_0 = 40 +support_pattern = zigzag +top_bottom_thickness = =layer_height * 2 +top_thickness = =top_bottom_thickness + diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg index 1b4294437b..1d1cae70e6 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_abs_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg index 9ea8930e22..f52cdf8124 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg index 2d23805b47..4c4490876f 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..a70cdee3a2 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +material = generic_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA+ 0.4 + +[values] +material_print_temperature = =default_material_print_temperature - 5 +speed_print = 100 +speed_wall = 75 +top_bottom_thickness = =round(layer_height*6,3) + diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg index 8731876d14..484b9536a6 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..b5be7984d6 --- /dev/null +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm_visual.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Visual +version = 4 + +[metadata] +intent_category = visual +material = generic_tough_pla +quality_type = fast +setting_version = 25 +type = intent +variant = AA+ 0.4 + +[values] +material_print_temperature = =default_material_print_temperature - 5 +speed_print = 100 +speed_wall = 75 +top_bottom_thickness = =round(layer_height*6,3) + diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg index ec2a5bd18a..c5b81e4a4c 100644 --- a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = AA+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg index 9476671e29..a474c19cf7 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg index e9b9d3c76b..e5ccc32e49 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg index 97d2971430..cecb670819 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg index 7e5645a21b..0819ec9c81 100644 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg @@ -14,5 +14,5 @@ variant = CC+ 0.4 [values] infill_sparse_density = 20 top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 +wall_thickness = =line_width * 4 diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg deleted file mode 100644 index 88a2326843..0000000000 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Accurate -version = 4 - -[metadata] -intent_category = engineering -material = generic_nylon-cf-slide -quality_type = draft -setting_version = 25 -type = intent -variant = CC+ 0.6 - -[values] -infill_sparse_density = 20 -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 - diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg deleted file mode 100644 index dc9870b7ff..0000000000 --- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Accurate -version = 4 - -[metadata] -intent_category = engineering -material = generic_petcf -quality_type = draft -setting_version = 25 -type = intent -variant = CC+ 0.6 - -[values] -infill_sparse_density = 20 -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 3 - diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg index 85b6c9ae5b..11da78333d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg @@ -13,8 +13,8 @@ weight = -1 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg index 117b0d1f1b..b39528af32 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg @@ -13,8 +13,8 @@ weight = 0 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg index d35b6172dc..e011721e65 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg @@ -13,8 +13,8 @@ weight = -2 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg index bfbe98f353..d44ee92990 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg @@ -14,8 +14,8 @@ weight = -3 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg index 3cc9466375..d124892ddb 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg @@ -14,9 +14,9 @@ weight = 1 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg index 3a666c461b..d49d8125ff 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg @@ -14,9 +14,9 @@ weight = -1 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg index 1a97302784..3c23d4f483 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg @@ -14,9 +14,9 @@ weight = 0 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg index f9a8673b7a..e3a0407710 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg @@ -14,9 +14,9 @@ weight = -2 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg index 93eebdb9dd..a9511bc281 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg @@ -15,9 +15,9 @@ weight = -3 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg index 4583ac3fd9..da3be0a896 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg @@ -14,9 +14,9 @@ weight = -2 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg index a8b699ca25..8f9ac5af3d 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg @@ -14,9 +14,9 @@ weight = -3 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg index 64f2df26a4..a1f10336fb 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg @@ -14,9 +14,9 @@ weight = -4 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg index 7b9169a069..4e1c0edf3b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg @@ -13,8 +13,8 @@ weight = -1 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg index 99f2b9b9c4..3e5eb8c171 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg @@ -13,8 +13,8 @@ weight = 0 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg index 4fee168082..46023838e6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg @@ -13,8 +13,8 @@ weight = -2 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg index e84b6dff57..f5f6d83320 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg @@ -14,8 +14,8 @@ weight = -3 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg index 2b0dc55f2e..749db6fea5 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg @@ -14,9 +14,9 @@ weight = 1 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg index 2fd2e030ad..7117785247 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg @@ -14,9 +14,9 @@ weight = -1 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg index 65f9c324ee..f20a4fa7b8 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg @@ -14,9 +14,9 @@ weight = 0 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg index 0891447521..b511db924b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg @@ -14,9 +14,9 @@ weight = -2 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg index 6aeebd4b85..fec144b9ff 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg @@ -15,9 +15,9 @@ weight = -3 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg index 6e07da05f3..5cdd646ced 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg @@ -14,9 +14,9 @@ weight = -2 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 minimum_support_area = 4 retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg index a7209145e2..febd5b4990 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg @@ -14,9 +14,9 @@ weight = -3 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg index f43b504542..30f54e53e9 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg @@ -14,9 +14,9 @@ weight = -4 [values] acceleration_prime_tower = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg index bde7c78d56..baabd79e94 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg @@ -14,4 +14,5 @@ weight = -2 [values] cool_min_layer_time = 4 material_print_temperature = =default_material_print_temperature + 5 +retraction_prime_speed = 15 diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg new file mode 100644 index 0000000000..6c445180f8 --- /dev/null +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.15mm.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_s8 +name = Normal +version = 4 + +[metadata] +material = generic_pla +quality_type = fast +setting_version = 25 +type = quality +variant = AA+ 0.4 +weight = -1 + +[values] +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 15 +retraction_prime_speed = =retraction_speed +support_structure = tree + diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg index 32f9fd7e0c..d3d99eec9e 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.1mm.inst.cfg @@ -12,6 +12,9 @@ variant = AA+ 0.4 weight = 0 [values] +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 15 retraction_prime_speed = =retraction_speed support_structure = tree +top_bottom_thickness = =round(6*layer_height,3) diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg index 955308890c..2e015f8a88 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pla_0.2mm.inst.cfg @@ -12,6 +12,8 @@ variant = AA+ 0.4 weight = -2 [values] +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 15 retraction_prime_speed = =retraction_speed support_structure = tree diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg similarity index 56% rename from resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_tough-pla_0.2mm.inst.cfg rename to resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg index f934c2bfa0..e3477c1e7d 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.15mm.inst.cfg @@ -1,20 +1,18 @@ [general] definition = ultimaker_s8 -name = Fast +name = Normal version = 4 [metadata] material = generic_tough_pla -quality_type = draft +quality_type = fast setting_version = 25 type = quality -variant = AA+ 0.6 -weight = -2 +variant = AA+ 0.4 +weight = -1 [values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 retraction_prime_speed = =retraction_speed -support_interface_enable = False +retraction_speed = 25 support_structure = tree diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg index db50b82bd2..6ccc0da6dd 100644 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_tough-pla_0.1mm.inst.cfg @@ -14,4 +14,5 @@ weight = 0 [values] retraction_prime_speed = =retraction_speed support_structure = tree +top_bottom_thickness = =round(6*layer_height,3) diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_abs_0.2mm.inst.cfg deleted file mode 100644 index 928293a327..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_abs_0.2mm.inst.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Fast -version = 4 - -[metadata] -material = generic_abs -quality_type = draft -setting_version = 25 -type = quality -variant = AA+ 0.6 -weight = -2 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -cool_min_layer_time = 4 -cool_min_layer_time_fan_speed_max = 9 -cool_min_temperature = =material_print_temperature - 10 -retraction_prime_speed = 15 -support_interface_enable = False -support_structure = tree - diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_abs_0.3mm.inst.cfg deleted file mode 100644 index a5a83362cc..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_abs_0.3mm.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Extra Fast -version = 4 - -[metadata] -material = generic_abs -quality_type = verydraft -setting_version = 25 -type = quality -variant = AA+ 0.6 -weight = -3 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -cool_min_layer_time = 4 -cool_min_layer_time_fan_speed_max = 9 -cool_min_temperature = =material_print_temperature - 10 -material_print_temperature = =default_material_print_temperature + 10 -retraction_prime_speed = 15 -support_interface_enable = False -support_structure = tree -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) - diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_petg_0.2mm.inst.cfg deleted file mode 100644 index be16bb734f..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_petg_0.2mm.inst.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Fast -version = 4 - -[metadata] -material = generic_petg -quality_type = draft -setting_version = 25 -type = quality -variant = AA+ 0.6 -weight = -2 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -cool_min_layer_time = 4 -material_print_temperature = =default_material_print_temperature + 5 -support_interface_enable = False - diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_petg_0.3mm.inst.cfg deleted file mode 100644 index d058e1aef5..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_petg_0.3mm.inst.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Extra Fast -version = 4 - -[metadata] -material = generic_petg -quality_type = verydraft -setting_version = 25 -type = quality -variant = AA+ 0.6 -weight = -3 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -cool_min_layer_time = 4 -material_print_temperature = =default_material_print_temperature + 10 -support_interface_enable = False -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) - diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_pla_0.2mm.inst.cfg deleted file mode 100644 index a5f990f3d8..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_pla_0.2mm.inst.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Fast -version = 4 - -[metadata] -material = generic_pla -quality_type = draft -setting_version = 25 -type = quality -variant = AA+ 0.6 -weight = -2 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -retraction_prime_speed = =retraction_speed -support_interface_enable = False -support_structure = tree - diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_pla_0.3mm.inst.cfg deleted file mode 100644 index 295b7efbfc..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_pla_0.3mm.inst.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Extra Fast -version = 4 - -[metadata] -material = generic_pla -quality_type = verydraft -setting_version = 25 -type = quality -variant = AA+ 0.6 -weight = -3 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -material_print_temperature = =default_material_print_temperature + 20 -retraction_prime_speed = =retraction_speed -support_interface_enable = False -support_structure = tree -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) - diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_tough-pla_0.3mm.inst.cfg deleted file mode 100644 index aa81282888..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.6_tough-pla_0.3mm.inst.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Extra Fast -version = 4 - -[metadata] -material = generic_tough_pla -quality_type = verydraft -setting_version = 25 -type = quality -variant = AA+ 0.6 -weight = -3 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -material_print_temperature = =default_material_print_temperature + 20 -retraction_prime_speed = =retraction_speed -support_interface_enable = False -support_structure = tree -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) - diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.15mm.inst.cfg index 0eefd2a128..1a6ad7ff5b 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.15mm.inst.cfg @@ -13,8 +13,8 @@ weight = -1 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.1mm.inst.cfg index d8ac34bf66..ffea655096 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.1mm.inst.cfg @@ -13,8 +13,8 @@ weight = 0 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.2mm.inst.cfg index 2de507bb4d..e0b7b2649e 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.2mm.inst.cfg @@ -13,8 +13,8 @@ weight = -2 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.3mm.inst.cfg index 8cb1109c8f..e4d8c1af04 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_bam_0.3mm.inst.cfg @@ -13,8 +13,8 @@ weight = -3 [values] brim_replaces_support = False -build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +build_volume_temperature = =50 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg index b2e787724e..0c09aeb098 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.15mm.inst.cfg @@ -15,13 +15,16 @@ weight = -1 acceleration_prime_tower = 1500 acceleration_support = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 jerk_prime_tower = 4000 jerk_support = 4000 +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 minimum_support_area = 4 +prime_tower_min_volume = 20 retraction_amount = 6.5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg index a6d3010f60..598167bd87 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.1mm.inst.cfg @@ -15,14 +15,17 @@ weight = 0 acceleration_prime_tower = 1500 acceleration_support = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 jerk_prime_tower = 4000 jerk_support = 4000 +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 +prime_tower_min_volume = 20 retraction_amount = 6.5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg index 9994a7c503..033d3cc1df 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.2mm.inst.cfg @@ -15,14 +15,17 @@ weight = -2 acceleration_prime_tower = 1500 acceleration_support = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 jerk_prime_tower = 4000 jerk_support = 4000 +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature + 5 minimum_support_area = 4 +prime_tower_min_volume = 20 retraction_amount = 6.5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg index 4c9ca9c2cc..7fd3c80f6e 100644 --- a/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_bb0.4_pva_0.3mm.inst.cfg @@ -15,14 +15,17 @@ weight = -3 acceleration_prime_tower = 1500 acceleration_support = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =70 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 and (not support_enable or extruder_nr != support_extruder_nr) else 60 initial_layer_line_width_factor = 150 jerk_prime_tower = 4000 jerk_support = 4000 +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 5 minimum_support_area = 4 +prime_tower_min_volume = 20 retraction_amount = 6.5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm.inst.cfg index 2911c7192f..3475b01999 100644 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm.inst.cfg @@ -12,4 +12,8 @@ variant = CC+ 0.4 weight = -2 [values] +adhesion_type = brim +material_alternate_walls = True +material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 15 diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg index ae64e07f03..bb73d83750 100644 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg @@ -12,10 +12,14 @@ variant = CC+ 0.4 weight = -2 [values] +adhesion_type = brim cool_min_layer_time = 6 cool_min_layer_time_fan_speed_max = 12 inset_direction = inside_out +material_alternate_walls = True +material_final_print_temperature = =material_print_temperature - 15 material_flow = 95 +material_initial_print_temperature = =material_print_temperature - 15 retraction_prime_speed = 15 speed_wall_x = =speed_wall_0 diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg index 5432e98165..0038bb0a4d 100644 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg @@ -12,4 +12,5 @@ variant = CC+ 0.4 weight = -2 [values] +switch_extruder_retraction_amount = 16 diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm.inst.cfg deleted file mode 100644 index 195c11a4e0..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Fast -version = 4 - -[metadata] -material = generic_nylon-cf-slide -quality_type = draft -setting_version = 25 -type = quality -variant = CC+ 0.6 -weight = -2 - -[values] -cool_min_layer_time_fan_speed_max = 11 -retraction_prime_speed = 15 - diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.3mm.inst.cfg deleted file mode 100644 index 4f4f7f7eff..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.3mm.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Extra Fast -version = 4 - -[metadata] -material = generic_nylon-cf-slide -quality_type = verydraft -setting_version = 25 -type = quality -variant = CC+ 0.6 -weight = -3 - -[values] -cool_min_layer_time_fan_speed_max = 11 -retraction_prime_speed = 15 - diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg deleted file mode 100644 index 52dc6f1a5e..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Fast -version = 4 - -[metadata] -material = generic_petcf -quality_type = draft -setting_version = 25 -type = quality -variant = CC+ 0.6 -weight = -2 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -support_interface_enable = False - diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.3mm.inst.cfg deleted file mode 100644 index cd42a93fec..0000000000 --- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.3mm.inst.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[general] -definition = ultimaker_s8 -name = Extra Fast -version = 4 - -[metadata] -material = generic_petcf -quality_type = verydraft -setting_version = 25 -type = quality -variant = CC+ 0.6 -weight = -3 - -[values] -bridge_skin_material_flow = 200 -bridge_wall_material_flow = 200 -material_print_temperature = =default_material_print_temperature + 10 -support_interface_enable = False -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) - diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index cfe54e3200..c432a9e309 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,15 @@ +[5.10.1] + +* New features and improvements: +- Introduced the UltiMaker S6, the newest addition to the S series of UltiMaker printers that carry forward the award-winning legacy of the S5. +- Introduced Visual Intent profiles for PLA and Tough PLA for the UltiMaker S8 +- Introduced High-Speed Intents for ABSR for Method X and Method XL + +* Bug fixes: +- Updated UltiMaker S8 profiles to significantly improve the quality of PC, CPE, CPE+, PETG, support structures, and dual extrusion prints +- Support brims no longer listen to the Brim Distance setting, so the brims will always be attached to the support +- Fixed a bug affecting multi-extruder printers where the initial temperature was not set correctly at the start of a print if all features used an extruder other than T0 + [5.10] * New features and improvements: diff --git a/resources/variants/ultimaker_s6_aa_plus06.inst.cfg b/resources/variants/ultimaker_s6_aa_plus06.inst.cfg deleted file mode 100644 index 95401be2c3..0000000000 --- a/resources/variants/ultimaker_s6_aa_plus06.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -definition = ultimaker_s6 -name = AA+ 0.6 -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 25 -type = variant - -[values] -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = AA+ 0.6 -machine_nozzle_size = 0.6 -machine_nozzle_tip_outer_diameter = 1.2 -retraction_prime_speed = =retraction_speed - diff --git a/resources/variants/ultimaker_s6_cc_plus06.inst.cfg b/resources/variants/ultimaker_s6_cc_plus06.inst.cfg deleted file mode 100644 index 93564bada0..0000000000 --- a/resources/variants/ultimaker_s6_cc_plus06.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -definition = ultimaker_s6 -name = CC+ 0.6 -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 25 -type = variant - -[values] -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = CC+ 0.6 -machine_nozzle_size = 0.6 -machine_nozzle_tip_outer_diameter = 1.2 -retraction_prime_speed = =retraction_speed - diff --git a/resources/variants/ultimaker_s8_aa_plus06.inst.cfg b/resources/variants/ultimaker_s8_aa_plus06.inst.cfg deleted file mode 100644 index 1eabef191c..0000000000 --- a/resources/variants/ultimaker_s8_aa_plus06.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -definition = ultimaker_s8 -name = AA+ 0.6 -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 25 -type = variant - -[values] -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = AA+ 0.6 -machine_nozzle_size = 0.6 -machine_nozzle_tip_outer_diameter = 1.2 -retraction_prime_speed = =retraction_speed - diff --git a/resources/variants/ultimaker_s8_cc_plus06.inst.cfg b/resources/variants/ultimaker_s8_cc_plus06.inst.cfg deleted file mode 100644 index 2a1c43873f..0000000000 --- a/resources/variants/ultimaker_s8_cc_plus06.inst.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[general] -definition = ultimaker_s8 -name = CC+ 0.6 -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 25 -type = variant - -[values] -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = CC+ 0.6 -machine_nozzle_size = 0.6 -machine_nozzle_tip_outer_diameter = 1.2 -retraction_prime_speed = =retraction_speed -