-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into PP-490-Method-Self-Su…
…pport
- Loading branch information
Showing
118 changed files
with
2,686 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| { | ||
| "version": 2, | ||
| "name": "UltiMaker Method", | ||
| "inherits": "ultimaker_method_base", | ||
| "metadata": | ||
| { | ||
| "visible": true, | ||
| "author": "UltiMaker", | ||
| "manufacturer": "Ultimaker B.V.", | ||
| "file_formats": "application/x-makerbot", | ||
| "platform": "ultimaker_method_platform.stl", | ||
| "exclude_materials": [ | ||
| "dsm_", | ||
| "Essentium_", | ||
| "imade3d_", | ||
| "chromatik_", | ||
| "3D-Fuel_", | ||
| "bestfilament_", | ||
| "emotiontech_", | ||
| "eryone_", | ||
| "eSUN_", | ||
| "Extrudr_", | ||
| "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", | ||
| "goofoo_", | ||
| "ideagen3D_", | ||
| "imade3d_", | ||
| "innofill_", | ||
| "layer_one_", | ||
| "leapfrog_", | ||
| "polyflex_pla", | ||
| "polymax_pla", | ||
| "polyplus_pla", | ||
| "polywood_pla", | ||
| "redd_", | ||
| "tizyx_", | ||
| "ultimaker_asa_175", | ||
| "ultimaker_abs_175", | ||
| "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", | ||
| "verbatim_", | ||
| "Vertex_", | ||
| "volumic_", | ||
| "xyzprinting_", | ||
| "zyyx_pro_", | ||
| "octofiber_", | ||
| "fiberlogy_" | ||
| ], | ||
| "has_machine_materials": true, | ||
| "has_machine_quality": true, | ||
| "has_materials": true, | ||
| "has_variants": true, | ||
| "machine_extruder_trains": | ||
| { | ||
| "0": "ultimaker_method_extruder_left", | ||
| "1": "ultimaker_method_extruder_right" | ||
| }, | ||
| "platform_offset": [ | ||
| 0, | ||
| 0, | ||
| 16 | ||
| ], | ||
| "preferred_material": "ultimaker_pla_175", | ||
| "preferred_quality_type": "draft", | ||
| "preferred_variant_name": "1A", | ||
| "reference_machine_id": "fire_e", | ||
| "supports_network_connection": true, | ||
| "supports_usb_connection": false, | ||
| "variant_definition": "ultimaker_method", | ||
| "variants_name": "Extruder", | ||
| "weight": -1 | ||
| }, | ||
| "overrides": | ||
| { | ||
| "machine_depth": { "default_value": 236.48 }, | ||
| "machine_disallowed_areas": | ||
| { | ||
| "default_value": [ | ||
| [ | ||
| [-141.65, -118.11], | ||
| [141.65, -118.11], | ||
| [141.65, -94], | ||
| [-141.65, -94] | ||
| ], | ||
| [ | ||
| [-141.65, 118.37], | ||
| [141.65, 118.37], | ||
| [141.65, 94], | ||
| [-141.65, 94] | ||
| ], | ||
| [ | ||
| [-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": "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)" } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "version": 2, | ||
| "name": "Voron2 StealthChanger 250", | ||
| "inherits": "voron2_stealthchanger_base", | ||
| "metadata": | ||
| { | ||
| "visible": true, | ||
| "platform": "voron2_250_bed.3mf", | ||
| "quality_definition": "voron2_base" | ||
| }, | ||
| "overrides": | ||
| { | ||
| "machine_depth": { "default_value": 250 }, | ||
| "machine_height": { "default_value": 250 }, | ||
| "machine_name": { "default_value": "VORON2 StealthChanger 250" }, | ||
| "machine_width": { "default_value": 250 } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "version": 2, | ||
| "name": "Voron2 StealthChanger 300", | ||
| "inherits": "voron2_stealthchanger_base", | ||
| "metadata": | ||
| { | ||
| "visible": true, | ||
| "platform": "voron2_300_bed.3mf", | ||
| "quality_definition": "voron2_base" | ||
| }, | ||
| "overrides": | ||
| { | ||
| "machine_depth": { "default_value": 300 }, | ||
| "machine_height": { "default_value": 300 }, | ||
| "machine_name": { "default_value": "VORON2 StealthChanger 300" }, | ||
| "machine_width": { "default_value": 300 } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "version": 2, | ||
| "name": "Voron2 StealthChanger 350", | ||
| "inherits": "voron2_stealthchanger_base", | ||
| "metadata": | ||
| { | ||
| "visible": true, | ||
| "platform": "voron2_350_bed.3mf", | ||
| "quality_definition": "voron2_base" | ||
| }, | ||
| "overrides": | ||
| { | ||
| "machine_depth": { "default_value": 350 }, | ||
| "machine_height": { "default_value": 350 }, | ||
| "machine_name": { "default_value": "VORON2 StealthChanger 350" }, | ||
| "machine_width": { "default_value": 350 } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "version": 2, | ||
| "name": "Voron2 StealthChanger Base", | ||
| "inherits": "voron2_base", | ||
| "metadata": | ||
| { | ||
| "visible": false, | ||
| "author": "Thessien", | ||
| "manufacturer": "DraftShift Design", | ||
| "machine_extruder_trains": | ||
| { | ||
| "0": "voron2_stealthchanger_extruder_0", | ||
| "1": "voron2_stealthchanger_extruder_1", | ||
| "2": "voron2_stealthchanger_extruder_2", | ||
| "3": "voron2_stealthchanger_extruder_3", | ||
| "4": "voron2_stealthchanger_extruder_4", | ||
| "5": "voron2_stealthchanger_extruder_5", | ||
| "6": "voron2_stealthchanger_extruder_6", | ||
| "7": "voron2_stealthchanger_extruder_7" | ||
| } | ||
| }, | ||
| "overrides": | ||
| { | ||
| "machine_end_gcode": { "default_value": "PRINT_END" }, | ||
| "machine_extruder_count": { "default_value": 1 }, | ||
| "machine_name": { "default_value": "VORON2 StealthChanger" }, | ||
| "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" } | ||
| } | ||
| } |
Oops, something went wrong.