GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-10 12:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Applied printer-linter format

Browse Source
This commit is contained in:
casperlamboo 2023-11-10 17:43:23 +00:00 committed by github-actions[bot]
parent 2569c4c3d1
commit 0196334c81
2 changed files with 57 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
resources/definitions/ultimaker_methodx.def.json
View File

@ -83,100 +83,40 @@
}, },
"overrides": "overrides":
{ {
"machine_depth": { "machine_depth": { "default_value": 236.48 },
"default_value": 236.48 "machine_disallowed_areas":
}, {
"machine_disallowed_areas": {
"default_value": [ "default_value": [
[ [
[ [-141.65, -118.11],
-141.65, [141.65, -118.11],
-118.11 [141.65, -95],
[-141.65, -95]
], ],
[ [
141.65, [-141.65, 118.37],
-118.11 [141.65, 118.37],
[141.65, 95],
[-141.65, 95]
], ],
[ [
141.65, [-141.65, -118.11],
-95 [-75, -118.11],
[-75, 118.37],
[-141.65, 118.37]
], ],
[ [
-141.65, [75, -118.11],
-95 [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": { "machine_height": { "default_value": 196 },
"default_value": 196 "machine_name": { "default_value": "UltiMaker Method X" },
}, "machine_width": { "default_value": 283.3 },
"machine_name": { "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)" },
"default_value": "Makerbot Method X" "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_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" }
} }
} }

99
resources/definitions/ultimaker_methodxl.def.json
View File

@ -32,98 +32,43 @@
}, },
"overrides": "overrides":
{ {
"machine_depth": { "machine_depth": { "default_value": 320 },
"default_value": 320 "machine_disallowed_areas":
}, {
"machine_disallowed_areas": {
"default_value": [ "default_value": [
[ [
[ [-204, -160],
-204, [204, -160],
-160 [204, -152.5],
[-204, -152.5]
], ],
[ [
204, [-204, 160],
-160 [204, 160],
[204, 152.5],
[-204, 152.5]
], ],
[ [
204, [-205, -160],
-152.5 [-152.5, -160],
[-152.5, 160],
[-205, 160]
], ],
[ [
-204, [152.5, -160],
-152.5 [205, -160],
] [205, 160],
], [152.5, 160]
[
[
-204,
160
],
[
204,
160
],
[
204,
152.5
],
[
-204,
152.5
]
],
[
[
-205,
-160
],
[
-152.5,
-160
],
[
-152.5,
160
],
[
-205,
160
]
],
[
[
152.5,
-160
],
[
205,
-160
],
[
205,
160
],
[
152.5,
160
]
] ]
] ]
}, },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 317 }, "machine_height": { "default_value": 317 },
"machine_name": { "default_value": "UltiMaker Method XL" }, "machine_name": { "default_value": "UltiMaker Method XL" },
"machine_width": { "machine_width": { "default_value": 410 },
"default_value": 410
},
"material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" },
"prime_tower_position_x": { "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)" },
"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_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 } "speed_travel": { "value": 500 }
} }
} }