Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Method(s) updates for 5.9 #19691

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
35ccd63
Method printers: Adding new materials (Tough PLA, PETG, NylonCF, ABS)…
alanbjorklund Sep 26, 2024
e3f822b
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Sep 27, 2024
df5c502
Applied printer-linter format
alanbjorklund Sep 27, 2024
077a922
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Sep 27, 2024
ab44d87
Applied printer-linter format
alanbjorklund Sep 27, 2024
d095634
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Sep 27, 2024
fd29ed6
Applied printer-linter format
alanbjorklund Sep 27, 2024
9a5e544
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Sep 27, 2024
531c85f
Applied printer-linter format
alanbjorklund Sep 27, 2024
3557154
Corrected a typo in solid intent files, and removed redundant values …
alanbjorklund Sep 27, 2024
89066d1
removed more redundant values
alanbjorklund Sep 27, 2024
e086772
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Sep 27, 2024
fb95341
Applied printer-linter format
alanbjorklund Sep 27, 2024
d5779ae
update GUIDs in FormatMaps.py
alanbjorklund Sep 27, 2024
bb9a4f8
Merge remote-tracking branch 'origin/PP-511-Method-5-9-Rebased' into …
alanbjorklund Sep 27, 2024
2532945
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Sep 27, 2024
5577553
Applied printer-linter format
alanbjorklund Sep 27, 2024
5232149
remove redundant values from Tough PLA 175 quality file, standardize …
alanbjorklund Sep 27, 2024
64b21e1
Merge branch 'main' into PP-511-Method-5-9-Rebased
wawanbreton Sep 30, 2024
4f0c77e
Fix disallowed areas definition conflict
wawanbreton Oct 1, 2024
8e5a766
Applied printer-linter format
wawanbreton Oct 1, 2024
acd477d
Adjust Method XL build area
wawanbreton Oct 1, 2024
8e4b85e
Applied printer-linter format
wawanbreton Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions resources/definitions/ultimaker_method.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,7 @@
"fabtotum_",
"fdplast_",
"filo3d_",
"generic_asa_175",
"generic_abs_175",
"generic_bvoh_175",
"generic_petg_175",
"generic_pla_175",
"generic_tough_pla_175",
"generic_pva_175",
"generic_cffpa_175",
"generic_cpe_175",
"generic_nylon_175",
"generic_hips_175",
"generic_pc_175",
"generic_tpu_175",
"generic_",
"goofoo_",
"ideagen3D_",
"imade3d_",
Expand All @@ -53,23 +41,22 @@
"ultimaker_absr_175",
"ultimaker_abscf_175",
"ultimaker_bvoh_175",
"ultimaker_petg_175",
"ultimaker_cffpa_175",
"ultimaker_cpe_175",
"ultimaker_nylon_175",
"ultimaker_hips_175",
"ultimaker_pc_175",
"ultimaker_tpu_175",
"ultimaker_tough_pla_175",
"ultimaker_rapidrinse_175",
"ultimaker_sr30",
"ultimaker_metallic_pla_175",
"verbatim_",
"Vertex_",
"volumic_",
"xyzprinting_",
"zyyx_pro_",
"octofiber_",
"fiberlogy_"
"fiberlogy_",
"ultimaker_metallic_pla_175"
],
"has_machine_materials": true,
"has_machine_quality": true,
Expand Down Expand Up @@ -98,7 +85,6 @@
"overrides":
{
"build_volume_temperature": { "maximum_value": "67" },
"machine_depth": { "default_value": 236.48 },
"machine_disallowed_areas":
{
"default_value": [
Expand Down Expand Up @@ -128,9 +114,7 @@
]
]
},
"machine_height": { "default_value": 196 },
"machine_name": { "default_value": "UltiMaker Method" },
"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)" }
}
Expand Down
Loading
Loading