3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master

Browse source
This commit is contained in:
Ghostkeeper 2021-06-02 15:24:23 +02:00
commit cc6191a141
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
210 changed files with 2040 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

32
resources/definitions/deltacomb_base.def.json Executable file → Normal file
View file

@ -13,7 +13,7 @@
"has_variants": true,
"variants_name": "Head",
"preferred_quality_type": "d",
"preferred_quality_type": "D020",
"preferred_material": "generic_pla",
"machine_extruder_trains": {
@ -29,7 +29,7 @@
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": true },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 Printing...\n;---------------------------------------"},
"machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nM420 S1; Bed Level Enable\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 In stampa...\nM140 S{print_bed_temperature} ;set the target bed temperature\n;---------------------------------------"},
"machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 F15000 X8.0 E-4.5 ;Wipe filament+material retraction\nG1 F15000 E4.0 Z1 ;Retraction compensation\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\n" },
"machine_shape": { "default_value": "elliptic" },
@ -60,25 +60,32 @@
"jerk_infill": { "value": "10" },
"jerk_travel": { "value": "10" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop": { "default_value": 0.5 },
"retraction_amount" : { "default_value": 3.5 },
"retraction_speed" : { "default_value": 70 },
"retraction_combing" : { "default_value": "noskin" },
"travel_avoid_distance": { "value": "1" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop": { "default_value": 1.0 },
"retraction_amount" : { "default_value": 3.5 },
"retraction_speed" : { "default_value": 40 },
"retraction_combing" : { "default_value": "noskin" },
"travel_avoid_distance": { "value": "1" },
"travel_avoid_supports": { "value": "True" },
"retraction_hop_only_when_collides": { "value": "1" },
"switch_extruder_retraction_amount": { "value": 10},
"switch_extruder_retraction_speeds": { "default_value": 70 },
"top_bottom_thickness": { "default_value": 0.8 },
"roofing_layer_count": { "value": "1" },
"roofing_line_width": { "value": "line_width * 0.75" },
"z_seam_corner": { "value": "'z_seam_corner_weighted'" },
"infill_sparse_density": { "default_value": 30 },
"infill_pattern": { "value": "'cubic'" },
"infill_before_walls": { "default_value": false },
"support_z_distance": { "value": "layer_height * 2" },
"support_z_distance": { "value": "layer_height" },
"support_bottom_distance": { "value": "layer_height" },
"support_use_towers" : { "default_value": false },
"support_bottom_enable" : { "value": "0" },
"support_use_towers": { "default_value": false },
"support_bottom_enable": { "value": false },
"support_wall_count": { "value": "1" },
"skirt_brim_speed": { "value": "speed_layer_0" },
"skirt_line_count": { "default_value": 3 },
@ -86,7 +93,8 @@
"brim_width": { "value": "3" },
"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_brim_enable": { "value": false },
"prime_tower_position_x": { "value": "prime_tower_size / 2" },
"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" }
}
}

0
resources/definitions/deltacomb_dc20.def.json Executable file → Normal file
View file

16
resources/definitions/deltacomb_dc20dual.def.json Executable file → Normal file
View file

@ -19,6 +19,20 @@
"machine_extruder_count": { "default_value": 2, "maximum_value": "2" },
"machine_width": { "default_value": 190 },
"machine_depth": { "default_value": 190 },
"machine_height": { "default_value": 250 }
"machine_height": { "default_value": 250 },
"machine_disallowed_areas":{ "default_value": [
[[ 53, 78], [ 63, 78], [ 73, 70], [ 62, 70]],
[[ 62, 70], [ 73, 70], [ 81, 61], [ 70, 61]],
[[ 70, 61], [ 81, 61], [ 88, 51], [ 76, 51]],
[[ 76, 51], [ 88, 51], [ 93, 40], [ 81, 40]],
[[ 81, 40], [ 93, 40], [ 97, 29], [ 85, 29]],
[[ 85, 29], [ 97, 29], [ 101, 17], [ 88, 17]],
[[-37, 78], [-47, 78], [-57, 70], [-46, 70]],
[[-46, 70], [-57, 70], [-69, 61], [-54, 61]],
[[-54, 61], [-69, 61], [-72, 51], [-60, 51]],
[[-60, 51], [-72, 51], [-77, 40], [-65, 40]],
[[-65, 40], [-77, 40], [-81, 29], [-69, 29]],
[[-69, 29], [-81, 29], [-85, 17], [-72, 17]]
]}
}
}

8
resources/definitions/deltacomb_dc20flux.def.json
View file

@ -22,8 +22,12 @@
"machine_depth": { "default_value": 190 },
"machine_height": { "default_value": 250 },
"machine_extruder_count": { "default_value": 2, "maximum_value": "4" },
"machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" },
"switch_extruder_retraction_amount": { "value": "0" },
"prime_tower_min_volume": { "value": "45" },
"prime_tower_enable": { "value": "1" }
"prime_tower_min_volume": { "value": "50" },
"prime_tower_enable": { "value": "1" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_standby_temperature": { "value": "material_print_temperature" }
}
}

0
resources/definitions/deltacomb_dc21.def.json Executable file → Normal file
View file

0
resources/definitions/deltacomb_dc21dual.def.json Executable file → Normal file
View file

12
resources/definitions/deltacomb_dc21flux.def.json
View file

@ -17,13 +17,17 @@
},
"overrides": {
"machine_name": { "default_value": "Deltacomb DC-20 FLUX" },
"machine_name": { "default_value": "Deltacomb DC-21 FLUX" },
"machine_width": { "default_value": 190 },
"machine_depth": { "default_value": 190 },
"machine_height": { "default_value": 400 },
"machine_extruder_count": { "default_value": 2, "maximum_value": "4" },
"machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" },
"switch_extruder_retraction_amount": { "value": "0" },
"prime_tower_min_volume": { "value": "45" },
"prime_tower_enable": { "value": "1" }
"prime_tower_min_volume": { "value": "50" },
"prime_tower_enable": { "value": "1" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_standby_temperature": { "value": "material_print_temperature" }
}
}
}

0
resources/definitions/deltacomb_dc30.def.json Executable file → Normal file
View file

0
resources/definitions/deltacomb_dc30dual.def.json Executable file → Normal file
View file

8
resources/definitions/deltacomb_dc30flux.def.json
View file

@ -22,8 +22,12 @@
"machine_depth": { "default_value": 290 },
"machine_height": { "default_value": 300 },
"machine_extruder_count": { "default_value": 2, "maximum_value": "4" },
"machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" },
"switch_extruder_retraction_amount": { "value": "0" },
"prime_tower_min_volume": { "value": "45" },
"prime_tower_enable": { "value": "1" }
"prime_tower_min_volume": { "value": "50" },
"prime_tower_enable": { "value": "1" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_standby_temperature": { "value": "material_print_temperature" }
}
}