From 0196334c812e7f7735494360ea2e446363ca453c Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 10 Nov 2023 17:43:23 +0000 Subject: [PATCH] Applied printer-linter format --- .../definitions/ultimaker_methodx.def.json | 130 +++++------------- .../definitions/ultimaker_methodxl.def.json | 99 +++---------- 2 files changed, 57 insertions(+), 172 deletions(-) diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 17466130fa..0bdc8cdb9c 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -69,7 +69,7 @@ "platform_offset": [ 0, 0, - 16 + 16 ], "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", @@ -83,100 +83,40 @@ }, "overrides": { - "machine_depth": { - "default_value": 236.48 - }, - "machine_disallowed_areas": { - "default_value": [ - [ - [ - -141.65, - -118.11 - ], - [ - 141.65, - -118.11 - ], - [ - 141.65, - -95 - ], - [ - -141.65, - -95 + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -95], + [-141.65, -95] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 95], + [-141.65, 95] + ], + [ + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] + ], + [ + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] + ] ] - ], - [ - [ - -141.65, - 118.37 - ], - [ - 141.65, - 118.37 - ], - [ - 141.65, - 95 - ], - [ - -141.65, - 95 - ] - ], - [ - [ - -141.65, - -118.11 - ], - [ - -75, - -118.11 - ], - [ - -75, - 118.37 - ], - [ - -141.65, - 118.37 - ] - ], - [ - [ - 75, - -118.11 - ], - [ - 141.65, - -118.11 - ], - [ - 141.65, - 118.37 - ], - [ - 75, - 118.37 - ] - ] - ] - }, - "machine_height": { - "default_value": 196 - }, - "machine_name": { - "default_value": "Makerbot Method X" - }, - "machine_width": { - "default_value": 283.3 - }, - "prime_tower_position_x": { - "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" - }, - "prime_tower_position_y": { - "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" - }, - "machine_name": { "default_value": "UltiMaker Method X" } + }, + "machine_height": { "default_value": 196 }, + "machine_name": { "default_value": "UltiMaker Method X" }, + "machine_width": { "default_value": 283.3 }, + "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, + "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index c7f13f7071..c03eae2ae3 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,98 +32,43 @@ }, "overrides": { - "machine_depth": { - "default_value": 320 - }, - "machine_disallowed_areas": { + "machine_depth": { "default_value": 320 }, + "machine_disallowed_areas": + { "default_value": [ [ - [ - -204, - -160 - ], - [ - 204, - -160 - ], - [ - 204, - -152.5 - ], - [ - -204, - -152.5 - ] + [-204, -160], + [204, -160], + [204, -152.5], + [-204, -152.5] ], [ - [ - -204, - 160 - ], - [ - 204, - 160 - ], - [ - 204, - 152.5 - ], - [ - -204, - 152.5 - ] + [-204, 160], + [204, 160], + [204, 152.5], + [-204, 152.5] ], [ - [ - -205, - -160 - ], - [ - -152.5, - -160 - ], - [ - -152.5, - 160 - ], - [ - -205, - 160 - ] + [-205, -160], + [-152.5, -160], + [-152.5, 160], + [-205, 160] ], [ - [ - 152.5, - -160 - ], - [ - 205, - -160 - ], - [ - 205, - 160 - ], - [ - 152.5, - 160 - ] + [152.5, -160], + [205, -160], + [205, 160], + [152.5, 160] ] ] }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "UltiMaker Method XL" }, - "machine_width": { - "default_value": 410 - }, + "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, - "prime_tower_position_x": { - "value": "(305 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (305 / 2)" - }, - "prime_tower_position_y": { - "value": "305 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (305 / 2)" - }, + "prime_tower_position_x": { "value": "(305 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (305 / 2)" }, + "prime_tower_position_y": { "value": "305 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (305 / 2)" }, "speed_travel": { "value": 500 } } } \ No newline at end of file