From 36d5e75ed0e0a2f44445a982838217b404a0f1a0 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Thu, 26 Jan 2023 19:11:16 +0100 Subject: [PATCH 1/2] make S7 public PP-312 --- resources/definitions/ultimaker_s7.def.json | 59 + .../ultimaker_s7_extruder_left.def.json | 30 + .../ultimaker_s7_extruder_right.def.json | 30 + resources/images/UltimakerS7backplate.png | Bin 0 -> 10378 bytes resources/meshes/ultimaker_s7_platform.obj | 13023 ++++++++++++++++ .../variants/ultimaker_s7_aa0.25.inst.cfg | 33 + .../variants/ultimaker_s7_aa0.8.inst.cfg | 47 + resources/variants/ultimaker_s7_aa04.inst.cfg | 28 + .../variants/ultimaker_s7_bb0.8.inst.cfg | 49 + resources/variants/ultimaker_s7_bb04.inst.cfg | 28 + resources/variants/ultimaker_s7_cc04.inst.cfg | 31 + resources/variants/ultimaker_s7_cc06.inst.cfg | 31 + resources/variants/ultimaker_s7_dd04.inst.cfg | 16 + 13 files changed, 13405 insertions(+) create mode 100644 resources/definitions/ultimaker_s7.def.json create mode 100644 resources/extruders/ultimaker_s7_extruder_left.def.json create mode 100644 resources/extruders/ultimaker_s7_extruder_right.def.json create mode 100644 resources/images/UltimakerS7backplate.png create mode 100644 resources/meshes/ultimaker_s7_platform.obj create mode 100644 resources/variants/ultimaker_s7_aa0.25.inst.cfg create mode 100644 resources/variants/ultimaker_s7_aa0.8.inst.cfg create mode 100644 resources/variants/ultimaker_s7_aa04.inst.cfg create mode 100644 resources/variants/ultimaker_s7_bb0.8.inst.cfg create mode 100644 resources/variants/ultimaker_s7_bb04.inst.cfg create mode 100644 resources/variants/ultimaker_s7_cc04.inst.cfg create mode 100644 resources/variants/ultimaker_s7_cc06.inst.cfg create mode 100644 resources/variants/ultimaker_s7_dd04.inst.cfg diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json new file mode 100644 index 0000000000..0df14ead54 --- /dev/null +++ b/resources/definitions/ultimaker_s7.def.json @@ -0,0 +1,59 @@ +{ + "inherits": "ultimaker_s5", + "metadata": + { + "author": "Ultimaker", + "bom_numbers": [ + 5078167 + ], + "file_formats": "application/x-ufp;text/x-gcode", + "firmware_update_info": + { + "check_urls": [ + "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" + ], + "id": 5078167, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ + "DiscoverUM3Action" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_s7_extruder_left", + "1": "ultimaker_s7_extruder_right" + }, + "manufacturer": "Ultimaker B.V.", + "nozzle_offsetting_for_disallowed_areas": false, + "platform": "ultimaker_s7_platform.obj", + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "UltimakerS7backplate.png", + "preferred_variant_name": "AA 0.4", + "quality_definition": "ultimaker_s5", + "supported_actions": [ + "DiscoverUM3Action" + ], + "supports_material_export": true, + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Print core", + "visible": true, + "weight": -2 + }, + "name": "Ultimaker S7", + "overrides": + { + "machine_name": + { + "default_value": "Ultimaker S7" + } + }, + "version": 2 +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_s7_extruder_left.def.json b/resources/extruders/ultimaker_s7_extruder_left.def.json new file mode 100644 index 0000000000..e1b971a01d --- /dev/null +++ b/resources/extruders/ultimaker_s7_extruder_left.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker_s7", + "position": "0", + "quality_definition": "ultimaker_s5_extruder_left" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 330 }, + "machine_extruder_start_pos_y": { "default_value": 237 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 330 }, + "machine_extruder_end_pos_y": { "default_value": 237 }, + "machine_nozzle_head_distance": { "default_value": 2.7 }, + "extruder_prime_pos_x": { "default_value": -3 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 } + } +} diff --git a/resources/extruders/ultimaker_s7_extruder_right.def.json b/resources/extruders/ultimaker_s7_extruder_right.def.json new file mode 100644 index 0000000000..43c5bfd7ca --- /dev/null +++ b/resources/extruders/ultimaker_s7_extruder_right.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker_s7", + "position": "1", + "quality_definition": "ultimaker_s5_extruder_right" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 22 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 330 }, + "machine_extruder_start_pos_y": { "default_value": 219 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 330 }, + "machine_extruder_end_pos_y": { "default_value": 219 }, + "machine_nozzle_head_distance": { "default_value": 4.2 }, + "extruder_prime_pos_x": { "default_value": 333 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 } + } +} diff --git a/resources/images/UltimakerS7backplate.png b/resources/images/UltimakerS7backplate.png new file mode 100644 index 0000000000000000000000000000000000000000..c35f819d7da31cd264eb00bd5c18a8d2e4ce9b1f GIT binary patch literal 10378 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 80 else 'triangles' +infill_wipe_dist = 0 +jerk_print = 25 +layer_height = 0.2 +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +machine_nozzle_id = AA 0.8 +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 +material_initial_print_temperature = =material_print_temperature - 5 +multiple_mesh_overlap = 0 +prime_tower_enable = False +prime_tower_wipe_enabled = True +raft_surface_layers = 1 +retraction_amount = 6.5 +retraction_hop = 2 +retraction_hop_only_when_collides = True +retraction_min_travel = =line_width * 2 +retraction_speed = 25 +skin_overlap = 5 +speed_print = 35 +speed_topbottom = =math.ceil(speed_print * 25 / 35) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = 20 +switch_extruder_retraction_amount = 16.5 +top_bottom_thickness = 1.4 +wall_0_inset = 0 diff --git a/resources/variants/ultimaker_s7_aa04.inst.cfg b/resources/variants/ultimaker_s7_aa04.inst.cfg new file mode 100644 index 0000000000..876f413643 --- /dev/null +++ b/resources/variants/ultimaker_s7_aa04.inst.cfg @@ -0,0 +1,28 @@ +[general] +name = AA 0.4 +version = 4 +definition = ultimaker_s7 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +brim_width = 7 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = AA 0.4 +machine_nozzle_tip_outer_diameter = 1.0 +retraction_amount = 6.5 +retraction_min_travel = =line_width * 2 +skin_overlap = 15 +speed_print = 70 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = 1.2 diff --git a/resources/variants/ultimaker_s7_bb0.8.inst.cfg b/resources/variants/ultimaker_s7_bb0.8.inst.cfg new file mode 100644 index 0000000000..0d03e4edaa --- /dev/null +++ b/resources/variants/ultimaker_s7_bb0.8.inst.cfg @@ -0,0 +1,49 @@ +[general] +name = BB 0.8 +version = 4 +definition = ultimaker_s7 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) +acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +brim_width = 3 +cool_fan_speed = 50 +infill_overlap = 0 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_wipe_dist = 0 +jerk_print = 25 +layer_height = 0.2 +machine_min_cool_heat_time_window = 15 +machine_nozzle_heat_up_speed = 1.5 +machine_nozzle_id = BB 0.8 +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 2.0 +material_print_temperature = =default_material_print_temperature + 10 +multiple_mesh_overlap = 0 +prime_tower_enable = False +prime_tower_wipe_enabled = True +raft_surface_layers = 1 +retraction_amount = 4.5 +retraction_hop = 2 +retraction_hop_only_when_collides = True +retraction_min_travel = =line_width * 3 +skin_overlap = 5 +speed_print = 35 +speed_support = =math.ceil(speed_print * 25 / 35) +speed_support_interface = =math.ceil(speed_support * 20 / 25) +speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_prime_tower = =math.ceil(speed_print * 7 / 35) +support_angle = 60 +support_z_distance = 0 +switch_extruder_prime_speed = 15 +switch_extruder_retraction_amount = 12 +top_bottom_thickness = 1 +wall_0_inset = 0 diff --git a/resources/variants/ultimaker_s7_bb04.inst.cfg b/resources/variants/ultimaker_s7_bb04.inst.cfg new file mode 100644 index 0000000000..808004ad14 --- /dev/null +++ b/resources/variants/ultimaker_s7_bb04.inst.cfg @@ -0,0 +1,28 @@ +[general] +name = BB 0.4 +version = 4 +definition = ultimaker_s7 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) +acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +machine_nozzle_heat_up_speed = 1.5 +machine_nozzle_id = BB 0.4 +machine_nozzle_tip_outer_diameter = 1.0 +retraction_amount = 4.5 +retraction_min_travel = =3 * line_width +speed_prime_tower = =math.ceil(speed_print * 10 / 35) +speed_support = =math.ceil(speed_print * 25 / 35) +speed_support_interface = =math.ceil(speed_support * 20 / 25) +speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +support_bottom_height = =layer_height * 2 +support_interface_enable = True +switch_extruder_retraction_amount = 12 diff --git a/resources/variants/ultimaker_s7_cc04.inst.cfg b/resources/variants/ultimaker_s7_cc04.inst.cfg new file mode 100644 index 0000000000..b61fb8d9de --- /dev/null +++ b/resources/variants/ultimaker_s7_cc04.inst.cfg @@ -0,0 +1,31 @@ +[general] +name = CC 0.4 +version = 4 +definition = ultimaker_s7 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +brim_width = 7 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = CC 0.4 +machine_nozzle_size = 0.4 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +speed_infill = =speed_print +speed_print = 45 +speed_support = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_x = =speed_wall +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = =layer_height * 6 diff --git a/resources/variants/ultimaker_s7_cc06.inst.cfg b/resources/variants/ultimaker_s7_cc06.inst.cfg new file mode 100644 index 0000000000..f4a104a2bf --- /dev/null +++ b/resources/variants/ultimaker_s7_cc06.inst.cfg @@ -0,0 +1,31 @@ +[general] +name = CC 0.6 +version = 4 +definition = ultimaker_s7 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +brim_width = 7 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = CC 0.6 +machine_nozzle_size = 0.6 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +speed_infill = =speed_print +speed_print = 45 +speed_support = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_x = =speed_wall +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length +top_bottom_thickness = =layer_height * 6 diff --git a/resources/variants/ultimaker_s7_dd04.inst.cfg b/resources/variants/ultimaker_s7_dd04.inst.cfg new file mode 100644 index 0000000000..efca2b6a07 --- /dev/null +++ b/resources/variants/ultimaker_s7_dd04.inst.cfg @@ -0,0 +1,16 @@ +[general] +name = DD 0.4 +version = 4 +definition = ultimaker_s7 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = DD 0.4 +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.2 +retraction_prime_speed = =retraction_speed From 7e72a4ee7e0ee5b8bf863bd016f67ed50e476166 Mon Sep 17 00:00:00 2001 From: rijkvanmanen Date: Thu, 26 Jan 2023 18:12:32 +0000 Subject: [PATCH 2/2] Applied printer-linter format --- resources/definitions/ultimaker_s7.def.json | 31 +++++++------------ .../ultimaker_s7_extruder_left.def.json | 29 ++++++++--------- .../ultimaker_s7_extruder_right.def.json | 29 ++++++++--------- .../variants/ultimaker_s7_aa0.25.inst.cfg | 5 +-- .../variants/ultimaker_s7_aa0.8.inst.cfg | 5 +-- resources/variants/ultimaker_s7_aa04.inst.cfg | 5 +-- .../variants/ultimaker_s7_bb0.8.inst.cfg | 15 ++++----- resources/variants/ultimaker_s7_bb04.inst.cfg | 13 ++++---- resources/variants/ultimaker_s7_cc04.inst.cfg | 5 +-- resources/variants/ultimaker_s7_cc06.inst.cfg | 5 +-- resources/variants/ultimaker_s7_dd04.inst.cfg | 5 +-- 11 files changed, 74 insertions(+), 73 deletions(-) diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 0df14ead54..a996e00f72 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -1,23 +1,24 @@ { + "version": 2, + "name": "Ultimaker S7", "inherits": "ultimaker_s5", "metadata": { + "visible": true, "author": "Ultimaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-ufp;text/x-gcode", + "platform": "ultimaker_s7_platform.obj", "bom_numbers": [ 5078167 ], - "file_formats": "application/x-ufp;text/x-gcode", "firmware_update_info": { - "check_urls": [ - "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" - ], + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], "id": 5078167, "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" }, - "first_start_actions": [ - "DiscoverUM3Action" - ], + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, @@ -26,9 +27,7 @@ "0": "ultimaker_s7_extruder_left", "1": "ultimaker_s7_extruder_right" }, - "manufacturer": "Ultimaker B.V.", "nozzle_offsetting_for_disallowed_areas": false, - "platform": "ultimaker_s7_platform.obj", "platform_offset": [ 0, 0, @@ -37,23 +36,15 @@ "platform_texture": "UltimakerS7backplate.png", "preferred_variant_name": "AA 0.4", "quality_definition": "ultimaker_s5", - "supported_actions": [ - "DiscoverUM3Action" - ], + "supported_actions": [ "DiscoverUM3Action" ], "supports_material_export": true, "supports_network_connection": true, "supports_usb_connection": false, "variants_name": "Print core", - "visible": true, "weight": -2 }, - "name": "Ultimaker S7", "overrides": { - "machine_name": - { - "default_value": "Ultimaker S7" - } - }, - "version": 2 + "machine_name": { "default_value": "Ultimaker S7" } + } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_s7_extruder_left.def.json b/resources/extruders/ultimaker_s7_extruder_left.def.json index e1b971a01d..b085698c1d 100644 --- a/resources/extruders/ultimaker_s7_extruder_left.def.json +++ b/resources/extruders/ultimaker_s7_extruder_left.def.json @@ -2,29 +2,30 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_s7", "position": "0", "quality_definition": "ultimaker_s5_extruder_left" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 330 }, - "machine_extruder_start_pos_y": { "default_value": 237 }, + "extruder_prime_pos_x": { "default_value": -3 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 330 }, "machine_extruder_end_pos_y": { "default_value": 237 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 330 }, + "machine_extruder_start_pos_y": { "default_value": 237 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": -3 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_s7_extruder_right.def.json b/resources/extruders/ultimaker_s7_extruder_right.def.json index 43c5bfd7ca..0aa9a40b79 100644 --- a/resources/extruders/ultimaker_s7_extruder_right.def.json +++ b/resources/extruders/ultimaker_s7_extruder_right.def.json @@ -2,29 +2,30 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_s7", "position": "1", "quality_definition": "ultimaker_s5_extruder_right" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 22 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 330 }, - "machine_extruder_start_pos_y": { "default_value": 219 }, + "extruder_prime_pos_x": { "default_value": 333 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 330 }, "machine_extruder_end_pos_y": { "default_value": 219 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 330 }, + "machine_extruder_start_pos_y": { "default_value": 219 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 333 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 22 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/variants/ultimaker_s7_aa0.25.inst.cfg b/resources/variants/ultimaker_s7_aa0.25.inst.cfg index 6c8a121df8..70c6f43dca 100644 --- a/resources/variants/ultimaker_s7_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s7_aa0.25.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s7 name = AA 0.25 version = 4 -definition = ultimaker_s7 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -31,3 +31,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 + diff --git a/resources/variants/ultimaker_s7_aa0.8.inst.cfg b/resources/variants/ultimaker_s7_aa0.8.inst.cfg index e8ed046785..6a486930ba 100644 --- a/resources/variants/ultimaker_s7_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s7_aa0.8.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s7 name = AA 0.8 version = 4 -definition = ultimaker_s7 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -45,3 +45,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker_s7_aa04.inst.cfg b/resources/variants/ultimaker_s7_aa04.inst.cfg index 876f413643..26fc2a0be7 100644 --- a/resources/variants/ultimaker_s7_aa04.inst.cfg +++ b/resources/variants/ultimaker_s7_aa04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s7 name = AA 0.4 version = 4 -definition = ultimaker_s7 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -26,3 +26,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 + diff --git a/resources/variants/ultimaker_s7_bb0.8.inst.cfg b/resources/variants/ultimaker_s7_bb0.8.inst.cfg index 0d03e4edaa..91b781f4d1 100644 --- a/resources/variants/ultimaker_s7_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s7_bb0.8.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = ultimaker_s7 name = BB 0.8 version = 4 -definition = ultimaker_s7 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) -acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) brim_width = 3 cool_fan_speed = 50 infill_overlap = 0 @@ -35,15 +35,16 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 skin_overlap = 5 +speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) -speed_prime_tower = =math.ceil(speed_print * 7 / 35) support_angle = 60 support_z_distance = 0 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker_s7_bb04.inst.cfg b/resources/variants/ultimaker_s7_bb04.inst.cfg index 808004ad14..ece94bec7e 100644 --- a/resources/variants/ultimaker_s7_bb04.inst.cfg +++ b/resources/variants/ultimaker_s7_bb04.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = ultimaker_s7 name = BB 0.4 version = 4 -definition = ultimaker_s7 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) -acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 @@ -20,9 +20,10 @@ retraction_amount = 4.5 retraction_min_travel = =3 * line_width speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_interface_enable = True switch_extruder_retraction_amount = 12 + diff --git a/resources/variants/ultimaker_s7_cc04.inst.cfg b/resources/variants/ultimaker_s7_cc04.inst.cfg index b61fb8d9de..681da60134 100644 --- a/resources/variants/ultimaker_s7_cc04.inst.cfg +++ b/resources/variants/ultimaker_s7_cc04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s7 name = CC 0.4 version = 4 -definition = ultimaker_s7 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -29,3 +29,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = =layer_height * 6 + diff --git a/resources/variants/ultimaker_s7_cc06.inst.cfg b/resources/variants/ultimaker_s7_cc06.inst.cfg index f4a104a2bf..8dcffc16e6 100644 --- a/resources/variants/ultimaker_s7_cc06.inst.cfg +++ b/resources/variants/ultimaker_s7_cc06.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s7 name = CC 0.6 version = 4 -definition = ultimaker_s7 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -29,3 +29,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = =layer_height * 6 + diff --git a/resources/variants/ultimaker_s7_dd04.inst.cfg b/resources/variants/ultimaker_s7_dd04.inst.cfg index efca2b6a07..f3369fb8f5 100644 --- a/resources/variants/ultimaker_s7_dd04.inst.cfg +++ b/resources/variants/ultimaker_s7_dd04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s7 name = DD 0.4 version = 4 -definition = ultimaker_s7 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_cool_down_speed = 0.9 @@ -14,3 +14,4 @@ machine_nozzle_id = DD 0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.2 retraction_prime_speed = =retraction_speed +