From 7e72a4ee7e0ee5b8bf863bd016f67ed50e476166 Mon Sep 17 00:00:00 2001 From: rijkvanmanen Date: Thu, 26 Jan 2023 18:12:32 +0000 Subject: [PATCH] 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 +