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

New Machines Fixes (2)

Browse Source
This commit is contained in:
Deltacomb 2020-03-26 10:04:33 +01:00
parent 9012dd7c52
commit f81889a3bc
23 changed files with 196 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/definitions/deltacomb_base.def.json
View File

@ -15,7 +15,14 @@
"variants_name": "Head",
"preferred_quality_type": "fast",
"preferred_material": "generic_pla"
"preferred_material": "generic_pla",
"machine_extruder_trains": {
"0": "deltacomb_base_extruder_0",
"1": "deltacomb_base_extruder_1",
"2": "deltacomb_base_extruder_2",
"3": "deltacomb_base_extruder_3"
}
},
"overrides": {
@ -62,7 +69,7 @@
"travel_avoid_distance": { "default_value": 1, "value": "1" },
"top_bottom_thickness": { "default_value": 0.8 },
"roofing_layer_count": { "default_value": 1, "value": "1" },
"roofing_layer_count": { "value": "1" },
"roofing_line_width": { "value": "line_width * 0.75" },
"infill_sparse_density": { "default_value": 30 },
@ -81,8 +88,6 @@
"prime_tower_size": { "value": "math.sqrt(extruders_enabled_count * prime_tower_min_volume / layer_height / math.pi) * 2"},
"prime_tower_position_x": { "value": "prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0)" },
"prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" },
"infill_before_walls": { "value": "1 if resolveOrValue('prime_tower_enable') else 0"}
"prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }
}
}

8
resources/definitions/deltacomb_dc20.def.json
View File

@ -7,13 +7,7 @@
"visible": true,
"platform": "deltacomb_dc20.stl",
"quality_definition": "deltacomb_base",
"preferred_variant_name": "FBE 0.40mm",
"machine_extruder_trains": {
"0": "deltacomb_base_extruder_0",
"1": "deltacomb_base_extruder_1",
"2": "deltacomb_base_extruder_2",
"3": "deltacomb_base_extruder_3"
}
"preferred_variant_name": "FBE 0.40mm"
},
"overrides": {

3
resources/definitions/deltacomb_dc20flux.def.json
View File

@ -23,6 +23,7 @@
"machine_height": { "default_value": 250 },
"machine_extruder_count": { "default_value": 2, "maximum_value": "4" },
"switch_extruder_retraction_amount": { "value": "0" },
"prime_tower_min_volume": { "value": "45" }
"prime_tower_min_volume": { "value": "45" },
"prime_tower_enable": { "value": "1" }
}
}

8
resources/definitions/deltacomb_dc21.def.json
View File

@ -7,13 +7,7 @@
"visible": true,
"platform": "deltacomb_dc20.stl",
"quality_definition": "deltacomb_base",
"preferred_variant_name": "FBE 0.40mm",
"machine_extruder_trains": {
"0": "deltacomb_base_extruder_0",
"1": "deltacomb_base_extruder_1",
"2": "deltacomb_base_extruder_2",
"3": "deltacomb_base_extruder_3"
}
"preferred_variant_name": "FBE 0.40mm"
},
"overrides": {

6
resources/definitions/deltacomb_dc21flux.def.json
View File

@ -22,8 +22,8 @@
"machine_depth": { "default_value": 190 },
"machine_height": { "default_value": 400 },
"machine_extruder_count": { "default_value": 2, "maximum_value": "4" },
"switch_extruder_retraction_amount" : { "default_value": 0 },
"prime_tower_size": { "value": "30"},
"prime_tower_min_volume": { "value": "45" }
"switch_extruder_retraction_amount": { "value": "0" },
"prime_tower_min_volume": { "value": "45" },
"prime_tower_enable": { "value": "1" }
}
}

8
resources/definitions/deltacomb_dc30.def.json → resources/definitions/deltacomb_dc30.def copy.json
View File

@ -7,13 +7,7 @@
"visible": true,
"platform": "deltacomb_dc30.stl",
"quality_definition": "deltacomb_base",
"preferred_variant_name": "FBE 0.40mm",
"machine_extruder_trains": {
"0": "deltacomb_base_extruder_0",
"1": "deltacomb_base_extruder_1",
"2": "deltacomb_base_extruder_2",
"3": "deltacomb_base_extruder_3"
}
"preferred_variant_name": "FBE 0.40mm"
},
"overrides": {

24
resources/definitions/deltacomb_dc30dual.def.json Executable file
View File

@ -0,0 +1,24 @@
{
"version": 2,
"name": "Deltacomb DC-30 DUAL",
"inherits": "deltacomb_base",
"metadata": {
"visible": true,
"platform": "deltacomb_dc30.stl",
"quality_definition": "deltacomb_base",
"preferred_variant_name": "DBE 0.40mm",
"machine_extruder_trains": {
"0": "deltacomb_dc30dual_extruder_0",
"1": "deltacomb_dc30dual_extruder_1"
}
},
"overrides": {
"machine_name": { "default_value": "Deltacomb DC-30 DUAL" },
"machine_width": { "default_value": 290 },
"machine_depth": { "default_value": 290 },
"machine_height": { "default_value": 300 },
"machine_extruder_count": { "default_value": 2, "maximum_value": "2" }
}
}

29
resources/definitions/deltacomb_dc30flux.def.json Normal file
View File

@ -0,0 +1,29 @@
{
"version": 2,
"name": "Deltacomb DC-30 FLUX",
"inherits": "deltacomb_base",
"metadata": {
"visible": true,
"platform": "deltacomb_dc30.stl",
"quality_definition": "deltacomb_base",
"preferred_variant_name": "FBE 0.40mm",
"machine_extruder_trains": {
"0": "deltacomb_dc30flux_extruder_0",
"1": "deltacomb_dc30flux_extruder_1",
"2": "deltacomb_dc30flux_extruder_2",
"3": "deltacomb_dc30flux_extruder_3"
}
},
"overrides": {
"machine_name": { "default_value": "Deltacomb DC-30 FLUX" },
"machine_width": { "default_value": 290 },
"machine_depth": { "default_value": 290 },
"machine_height": { "default_value": 300 },
"machine_extruder_count": { "default_value": 2, "maximum_value": "4" },
"switch_extruder_retraction_amount": { "value": "0" },
"prime_tower_min_volume": { "value": "45" },
"prime_tower_enable": { "value": "1" }
}
}

2
resources/extruders/deltacomb_dc20dual_extruder_0.def.json
View File

@ -8,7 +8,7 @@
},
"overrides": {
"extruder_nr": { "default_value": 0, "maximum_value": "1" },
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },

4
resources/extruders/deltacomb_dc20dual_extruder_1.def.json
View File

@ -4,11 +4,11 @@
"inherits": "fdmextruder",
"metadata": {
"machine": "deltacomb_dc20dual",
"position": "2"
"position": "1"
},
"overrides": {
"extruder_nr": { "default_value": 0, "maximum_value": "1" },
"extruder_nr": { "default_value": 1 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 19 },

2
resources/extruders/deltacomb_dc20flux_extruder_0.def.json
View File

@ -9,7 +9,7 @@
"overrides": {
"extruder_nr": { "default_value": 0, "maximum_value": "3" },
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },

2
resources/extruders/deltacomb_dc20flux_extruder_1.def.json
View File

@ -9,7 +9,7 @@
"overrides": {
"extruder_nr": { "default_value": 1, "maximum_value": "3" },
"extruder_nr": { "default_value": 1 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },

2
resources/extruders/deltacomb_dc20flux_extruder_2.def.json
View File

@ -9,7 +9,7 @@
"overrides": {
"extruder_nr": { "default_value": 2, "maximum_value": "3" },
"extruder_nr": { "default_value": 2 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },

2
resources/extruders/deltacomb_dc20flux_extruder_3.def.json
View File

@ -9,7 +9,7 @@
"overrides": {
"extruder_nr": { "default_value": 3, "maximum_value": "3" },
"extruder_nr": { "default_value": 3 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },

19
resources/extruders/deltacomb_dc30dual_extruder_0.def.json Executable file
View File

@ -0,0 +1,19 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "deltacomb_dc30dual",
"position": "0"
},
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"},
"machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"}
}
}

19
resources/extruders/deltacomb_dc30dual_extruder_1.def.json Executable file
View File

@ -0,0 +1,19 @@
{
"version": 2,
"name": "Extruder 2",
"inherits": "fdmextruder",
"metadata": {
"machine": "deltacomb_dc30dual",
"position": "1"
},
"overrides": {
"extruder_nr": { "default_value": 1 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 19 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"},
"machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"}
}
}

19
resources/extruders/deltacomb_dc30flux_extruder_0.def.json Executable file
View File

@ -0,0 +1,19 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "deltacomb_dc30flux",
"position": "0"
},
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 1 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"},
"machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 1 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}
}
}

20
resources/extruders/deltacomb_dc30flux_extruder_1.def.json Executable file
View File

@ -0,0 +1,20 @@
{
"version": 2,
"name": "Extruder 2",
"inherits": "fdmextruder",
"metadata": {
"machine": "deltacomb_dc30flux",
"position": "1"
},
"overrides": {
"extruder_nr": { "default_value": 1 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 2 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"},
"machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 2 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"},
"prime_tower_flow": { "value": "200" }
}
}

20
resources/extruders/deltacomb_dc30flux_extruder_2.def.json Executable file
View File

@ -0,0 +1,20 @@
{
"version": 2,
"name": "Extruder 3",
"inherits": "fdmextruder",
"metadata": {
"machine": "deltacomb_dc30flux",
"position": "2"
},
"overrides": {
"extruder_nr": { "default_value": 2 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 3 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"},
"machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 3 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"},
"prime_tower_flow": { "value": "200" }
}
}

20
resources/extruders/deltacomb_dc30flux_extruder_4.def.json Executable file
View File

@ -0,0 +1,20 @@
{
"version": 2,
"name": "Extruder 4",
"inherits": "fdmextruder",
"metadata": {
"machine": "deltacomb_dc30flux",
"position": "3"
},
"overrides": {
"extruder_nr": { "default_value": 3 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 4 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"},
"machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 4 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"},
"prime_tower_flow": { "value": "200" }
}
}

13
resources/variants/deltacomb_025_e3d.inst.cfg
View File

@ -1,13 +0,0 @@
[general]
name = E3D 0.25mm
version = 4
definition = deltacomb
[metadata]
author = Deltacomb 3D
setting_version = 11
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.25

13
resources/variants/deltacomb_040_e3d.inst.cfg
View File

@ -1,13 +0,0 @@
[general]
name = E3D 0.40mm
version = 4
definition = deltacomb
[metadata]
author = Deltacomb 3D
setting_version = 11
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.4

13
resources/variants/deltacomb_080_e3d.inst.cfg
View File

@ -1,13 +0,0 @@
[general]
name = E3D 0.80mm
version = 4
definition = deltacomb
[metadata]
author = Deltacomb 3D
setting_version = 11
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.8