GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 04:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Applied printer-linter format

Browse Source
This commit is contained in:
alanbjorklund 2024-07-10 21:04:05 +00:00 committed by github-actions[bot]
parent 742ed89e4e
commit 76cbf90aca
14 changed files with 527 additions and 843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/definitions/ultimaker_method.def.json
View File

@ -97,9 +97,7 @@
}, },
"overrides": "overrides":
{ {
"build_volume_temperature": { "build_volume_temperature": { "maximum_value_warning": "67" },
"maximum_value_warning": "67"
},
"machine_depth": { "default_value": 236.48 }, "machine_depth": { "default_value": 236.48 },
"machine_disallowed_areas": "machine_disallowed_areas":
{ {

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

File diff suppressed because it is too large Load Diff

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

@ -71,9 +71,7 @@
}, },
"overrides": "overrides":
{ {
"build_volume_temperature": { "build_volume_temperature": { "maximum_value_warning": "107" },
"maximum_value_warning": "107"
},
"machine_depth": { "default_value": 236.48 }, "machine_depth": { "default_value": 236.48 },
"machine_disallowed_areas": "machine_disallowed_areas":
{ {

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

@ -27,9 +27,7 @@
}, },
"overrides": "overrides":
{ {
"build_volume_temperature": { "build_volume_temperature": { "maximum_value_warning": "100" },
"maximum_value_warning": "100"
},
"machine_depth": { "default_value": 320 }, "machine_depth": { "default_value": 320 },
"machine_disallowed_areas": "machine_disallowed_areas":
{ {

28
resources/extruders/ultimaker_method_extruder_left.def.json
View File

@ -2,29 +2,25 @@
"version": 2, "version": 2,
"name": "Extruder 1", "name": "Extruder 1",
"inherits": "fdmextruder", "inherits": "fdmextruder",
"metadata": { "metadata":
{
"machine": "ultimaker_method", "machine": "ultimaker_method",
"position": "0" "position": "0"
}, },
"overrides":
"overrides": { {
"extruder_nr": { "extruder_nr":
{
"default_value": 0, "default_value": 0,
"maximum_value": 1 "maximum_value": 1
}, },
"machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_cooling_fan_number": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\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\nM104 S{material_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_0/100}" },
"machine_extruder_start_code_duration": { "default_value": 8 },
"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\nM104 S{material_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_0/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S1.0\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"
},
"machine_extruder_start_code_duration": {
"default_value":8
}
} }
} }

28
resources/extruders/ultimaker_method_extruder_right.def.json
View File

@ -2,29 +2,25 @@
"version": 2, "version": 2,
"name": "Extruder 2", "name": "Extruder 2",
"inherits": "fdmextruder", "inherits": "fdmextruder",
"metadata": { "metadata":
{
"machine": "ultimaker_method", "machine": "ultimaker_method",
"position": "1" "position": "1"
}, },
"overrides":
"overrides": { {
"extruder_nr": { "extruder_nr":
{
"default_value": 1, "default_value": 1,
"maximum_value": 1 "maximum_value": 1
}, },
"machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_cooling_fan_number": { "default_value": 1 },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\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\nM104 S{material_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_0/100}" },
"machine_extruder_start_code_duration": { "default_value": 8 },
"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\nM104 S{material_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_0/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S1.0\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"
},
"machine_extruder_start_code_duration": {
"default_value":8
}
} }
} }

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

@ -2,29 +2,25 @@
"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_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_cooling_fan_number": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\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\nM104 S{material_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_0/100}" },
"machine_extruder_start_code_duration": { "default_value": 8 },
"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\nM104 S{material_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_0/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S1.0\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"
},
"machine_extruder_start_code_duration": {
"default_value":8
}
} }
} }

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

@ -2,29 +2,25 @@
"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_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_cooling_fan_number": { "default_value": 1 },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\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\nM104 S{material_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_0/100}" },
"machine_extruder_start_code_duration": { "default_value": 8 },
"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\nM104 S{material_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_0/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S1.0\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"
},
"machine_extruder_start_code_duration": {
"default_value":8
}
} }
} }

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

@ -2,29 +2,25 @@
"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_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_cooling_fan_number": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\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\nM104 S{material_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_0/100}" },
"machine_extruder_start_code_duration": { "default_value": 10 },
"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\nM104 S{material_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_0/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S1.0\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"
},
"machine_extruder_start_code_duration": {
"default_value":10
}
} }
} }

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

@ -2,29 +2,25 @@
"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_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_cooling_fan_number": { "default_value": 1 },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\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\nM104 S{material_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_0/100}" },
"machine_extruder_start_code_duration": { "default_value": 10 },
"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\nM104 S{material_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_0/100}" "material_diameter": { "default_value": 1.75 }
},
"machine_extruder_end_code": {
"default_value": "M106 P{extruder_nr} S1.0\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"
},
"machine_extruder_start_code_duration": {
"default_value":10
}
} }
} }

6
resources/variants/ultimaker_method_1A.inst.cfg
View File

@ -1,13 +1,13 @@
[general] [general]
definition = ultimaker_method
name = 1A name = 1A
version = 4 version = 4
definition = ultimaker_method
[metadata] [metadata]
hardware_type = nozzle
reference_extruder_id = mk14
setting_version = 23 setting_version = 23
type = variant type = variant
reference_extruder_id = mk14
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 1A machine_nozzle_id = 1A

6
resources/variants/ultimaker_method_1C.inst.cfg
View File

@ -1,13 +1,13 @@
[general] [general]
definition = ultimaker_method
name = 1C name = 1C
version = 4 version = 4
definition = ultimaker_method
[metadata] [metadata]
hardware_type = nozzle
reference_extruder_id = mk14_c
setting_version = 23 setting_version = 23
type = variant type = variant
reference_extruder_id = mk14_c
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 1C machine_nozzle_id = 1C

6
resources/variants/ultimaker_method_2A.inst.cfg
View File

@ -1,13 +1,13 @@
[general] [general]
definition = ultimaker_method
name = 2A name = 2A
version = 4 version = 4
definition = ultimaker_method
[metadata] [metadata]
hardware_type = nozzle
reference_extruder_id = mk14_s
setting_version = 23 setting_version = 23
type = variant type = variant
reference_extruder_id = mk14_s
hardware_type = nozzle
[values] [values]
machine_nozzle_id = 2A machine_nozzle_id = 2A

6
resources/variants/ultimaker_method_LABS.inst.cfg
View File

@ -1,13 +1,13 @@
[general] [general]
definition = ultimaker_method
name = LABS name = LABS
version = 4 version = 4
definition = ultimaker_method
[metadata] [metadata]
hardware_type = nozzle
reference_extruder_id = mk14_e
setting_version = 23 setting_version = 23
type = variant type = variant
reference_extruder_id = mk14_e
hardware_type = nozzle
[values] [values]
machine_nozzle_id = LABS machine_nozzle_id = LABS