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

Applied printer-linter format

Browse Source
This commit is contained in:
pkuiper-ultimaker 2023-10-31 16:11:56 +00:00 committed by github-actions[bot]
parent 4c575908fc
commit 8fa6cd2f77
17 changed files with 636 additions and 899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1127
resources/definitions/ultimaker_method_base.def.json
View File

File diff suppressed because it is too large Load Diff

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

@ -1,88 +1,88 @@
{ {
"version": 2, "version": 2,
"name": "Makerbot Method X", "name": "Makerbot Method X",
"inherits": "ultimaker_method_base", "inherits": "ultimaker_method_base",
"metadata": { "metadata":
"visible": true,
"author": "Ultimaker",
"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",
"ultimaker_sr30_175",
"generic_tpu_175",
"goofoo_",
"ideagen3D_",
"imade3d_",
"innofill_",
"layer_one_",
"leapfrog_",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_",
"tizyx_",
"verbatim_",
"Vertex_",
"volumic_",
"xyzprinting_",
"zyyx_pro_",
"octofiber_",
"fiberlogy_"
],
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot",
"platform": "ultimaker_method_platform.stl",
"has_machine_materials": true,
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains":
{ {
"0": "ultimaker_methodx_extruder_left", "visible": true,
"1": "ultimaker_methodx_extruder_right" "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",
"ultimaker_sr30_175",
"generic_tpu_175",
"goofoo_",
"ideagen3D_",
"imade3d_",
"innofill_",
"layer_one_",
"leapfrog_",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_",
"tizyx_",
"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_methodx_extruder_left",
"1": "ultimaker_methodx_extruder_right"
},
"platform_offset": [
0,
0,
0
],
"platform_texture": "MakerbotMethod.png",
"preferred_material": "ultimaker_absr_175",
"preferred_quality_type": "draft",
"preferred_variant_name": "1XA",
"supports_network_connection": true,
"supports_usb_connection": false,
"variant_definition": "ultimaker_methodx",
"variants_name": "Extruder",
"weight": -1
}, },
"platform_offset": [ "overrides":
0, {
0, "machine_name": { "default_value": "Makerbot Method X" }
0
],
"platform_texture": "MakerbotMethod.png",
"preferred_quality_type": "draft",
"preferred_variant_name": "1XA",
"preferred_material": "ultimaker_absr_175",
"supports_network_connection": true,
"supports_usb_connection": false,
"variants_name": "Extruder",
"variant_definition": "ultimaker_methodx",
"weight": -1
},
"overrides": {
"machine_name": {
"default_value": "Makerbot Method X"
} }
}
} }

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

@ -1,55 +1,43 @@
{ {
"version": 2, "version": 2,
"name": "Makerbot Method XL", "name": "Makerbot Method XL",
"inherits": "ultimaker_methodx", "inherits": "ultimaker_methodx",
"metadata": { "metadata":
"visible": true,
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot",
"platform": "ultimaker_method_xl_platform.stl",
"has_machine_materials": true,
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains":
{ {
"0": "ultimaker_methodxl_extruder_left", "visible": true,
"1": "ultimaker_methodxl_extruder_right" "author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot",
"platform": "ultimaker_method_xl_platform.stl",
"has_machine_materials": true,
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains":
{
"0": "ultimaker_methodxl_extruder_left",
"1": "ultimaker_methodxl_extruder_right"
},
"platform_offset": [
0,
0,
0
],
"platform_texture": "MakerbotMethod.png",
"preferred_quality_type": "draft",
"supports_network_connection": true,
"supports_usb_connection": false,
"variants_name": "Extruder",
"weight": -1
}, },
"platform_offset": [ "overrides":
0, {
0, "machine_depth": { "default_value": 305 },
0 "machine_heated_bed": { "default_value": true },
], "machine_height": { "default_value": 317 },
"platform_texture": "MakerbotMethod.png", "machine_name": { "default_value": "Makerbot Method XL" },
"preferred_quality_type": "draft", "machine_width": { "default_value": 305 },
"supports_network_connection": true, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" },
"supports_usb_connection": false, "speed_travel": { "value": 500 }
"variants_name": "Extruder",
"weight": -1
},
"overrides": {
"machine_depth": {
"default_value": 305
},
"machine_heated_bed": {
"default_value": true
},
"machine_height": {
"default_value": 317
},
"machine_width": {
"default_value": 305
},
"machine_name": {
"default_value": "Makerbot Method XL"
},
"material_shrinkage_percentage_z": {
"resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))"
},
"speed_travel": {
"value": 500
} }
}
} }

24
resources/extruders/ultimaker_methodx_extruder_left.def.json
View File

@ -2,25 +2,23 @@
"version": 2, "version": 2,
"name": "Extruder 1", "name": "Extruder 1",
"inherits": "fdmextruder", "inherits": "fdmextruder",
"metadata": { "metadata":
{
"machine": "ultimaker_methodx", "machine": "ultimaker_methodx",
"position": "0" "position": "0"
}, },
"overrides":
"overrides": { {
"extruder_nr": { "extruder_nr":
{
"default_value": 0, "default_value": 0,
"maximum_value": "1" "maximum_value": "1"
}, },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
"machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_code": { "machine_nozzle_size": { "default_value": 0.4 },
"default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000"
}
} }
} }

24
resources/extruders/ultimaker_methodx_extruder_right.def.json
View File

@ -2,25 +2,23 @@
"version": 2, "version": 2,
"name": "Extruder 2", "name": "Extruder 2",
"inherits": "fdmextruder", "inherits": "fdmextruder",
"metadata": { "metadata":
{
"machine": "ultimaker_methodx", "machine": "ultimaker_methodx",
"position": "1" "position": "1"
}, },
"overrides":
"overrides": { {
"extruder_nr": { "extruder_nr":
{
"default_value": 1, "default_value": 1,
"maximum_value": "1" "maximum_value": "1"
}, },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
"machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_code": { "machine_nozzle_size": { "default_value": 0.4 },
"default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000"
}
} }
} }

24
resources/extruders/ultimaker_methodxl_extruder_left.def.json
View File

@ -2,25 +2,23 @@
"version": 2, "version": 2,
"name": "Extruder 1", "name": "Extruder 1",
"inherits": "fdmextruder", "inherits": "fdmextruder",
"metadata": { "metadata":
{
"machine": "ultimaker_methodxl", "machine": "ultimaker_methodxl",
"position": "0" "position": "0"
}, },
"overrides":
"overrides": { {
"extruder_nr": { "extruder_nr":
{
"default_value": 0, "default_value": 0,
"maximum_value": "1" "maximum_value": "1"
}, },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
"machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_code": { "machine_nozzle_size": { "default_value": 0.4 },
"default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000"
}
} }
} }

24
resources/extruders/ultimaker_methodxl_extruder_right.def.json
View File

@ -2,25 +2,23 @@
"version": 2, "version": 2,
"name": "Extruder 2", "name": "Extruder 2",
"inherits": "fdmextruder", "inherits": "fdmextruder",
"metadata": { "metadata":
{
"machine": "ultimaker_methodxl", "machine": "ultimaker_methodxl",
"position": "1" "position": "1"
}, },
"overrides":
"overrides": { {
"extruder_nr": { "extruder_nr":
{
"default_value": 1, "default_value": 1,
"maximum_value": "1" "maximum_value": "1"
}, },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
"material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" },
"machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_code": { "machine_nozzle_size": { "default_value": 0.4 },
"default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM109 S{material_final_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed*255/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S255\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000"
}
} }
} }

9
resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg
View File

@ -1,14 +1,15 @@
[general] [general]
version = 4
name = Fast
definition = ultimaker_methodx definition = ultimaker_methodx
name = Fast
version = 4
[metadata] [metadata]
global_quality = True
quality_type = draft
setting_version = 22 setting_version = 22
type = quality type = quality
quality_type = draft
weight = -2 weight = -2
global_quality = True
[values] [values]
layer_height = 0.2 ## in reality this is 0.203, compensate this in the z scaling factor of the extruder layer_height = 0.2 ## in reality this is 0.203, compensate this in the z scaling factor of the extruder

9
resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg
View File

@ -1,14 +1,15 @@
[general] [general]
version = 4
name = Fast
definition = ultimaker_methodxl definition = ultimaker_methodxl
name = Fast
version = 4
[metadata] [metadata]
global_quality = True
quality_type = draft
setting_version = 22 setting_version = 22
type = quality type = quality
quality_type = draft
weight = -2 weight = -2
global_quality = True
[values] [values]
layer_height = 0.2 layer_height = 0.2

5
resources/variants/ultimaker_methodx_1C.inst.cfg
View File

@ -1,13 +1,14 @@
[general] [general]
definition = ultimaker_methodx
name = 1C name = 1C
version = 4 version = 4
definition = ultimaker_methodx
[metadata] [metadata]
hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 1C machine_nozzle_id = 1C
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4

5
resources/variants/ultimaker_methodx_1XA.inst.cfg
View File

@ -1,13 +1,14 @@
[general] [general]
definition = ultimaker_methodx
name = 1XA name = 1XA
version = 4 version = 4
definition = ultimaker_methodx
[metadata] [metadata]
hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 1XA machine_nozzle_id = 1XA
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4

5
resources/variants/ultimaker_methodx_2XA.inst.cfg
View File

@ -1,13 +1,14 @@
[general] [general]
definition = ultimaker_methodx
name = 2XA name = 2XA
version = 4 version = 4
definition = ultimaker_methodx
[metadata] [metadata]
hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 2XA machine_nozzle_id = 2XA
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4

5
resources/variants/ultimaker_methodx_LAB.inst.cfg
View File

@ -1,13 +1,14 @@
[general] [general]
definition = ultimaker_methodx
name = Lab name = Lab
version = 4 version = 4
definition = ultimaker_methodx
[metadata] [metadata]
hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant
hardware_type = nozzle
[values] [values]
machine_nozzle_id = Lab machine_nozzle_id = Lab
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4

5
resources/variants/ultimaker_methodxl_1C.inst.cfg
View File

@ -1,13 +1,14 @@
[general] [general]
definition = ultimaker_methodxl
name = 1C name = 1C
version = 4 version = 4
definition = ultimaker_methodxl
[metadata] [metadata]
hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 1C machine_nozzle_id = 1C
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4

5
resources/variants/ultimaker_methodxl_1XA.inst.cfg
View File

@ -1,13 +1,14 @@
[general] [general]
definition = ultimaker_methodxl
name = 1XA name = 1XA
version = 4 version = 4
definition = ultimaker_methodxl
[metadata] [metadata]
hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 1XA machine_nozzle_id = 1XA
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4

5
resources/variants/ultimaker_methodxl_2XA.inst.cfg
View File

@ -1,13 +1,14 @@
[general] [general]
definition = ultimaker_methodxl
name = 2XA name = 2XA
version = 4 version = 4
definition = ultimaker_methodxl
[metadata] [metadata]
hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 2XA machine_nozzle_id = 2XA
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4

5
resources/variants/ultimaker_methodxl_LAB.inst.cfg
View File

@ -1,13 +1,14 @@
[general] [general]
definition = ultimaker_methodxl
name = Lab name = Lab
version = 4 version = 4
definition = ultimaker_methodxl
[metadata] [metadata]
hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant
hardware_type = nozzle
[values] [values]
machine_nozzle_id = Lab machine_nozzle_id = Lab
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4