mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-08 06:23:59 -06:00
Merge branch 'master' into PP-1-Improved_print_profiles
This commit is contained in:
commit
7af71f5b36
170 changed files with 2811 additions and 3493 deletions
29
resources/definitions/atomstack_cambrian_base.def.json
Normal file
29
resources/definitions/atomstack_cambrian_base.def.json
Normal file
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "AtomStack Cambrian Base Printer",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata": {
|
||||
"visible": false,
|
||||
"author": "AtomStack",
|
||||
"manufacturer": "AtomStack",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_materials": true,
|
||||
"machine_extruder_trains": {
|
||||
"0": "atomstack_cambrianmaxe175_extruder_0"
|
||||
}
|
||||
},
|
||||
"overrides": {
|
||||
"machine_heated_bed": {
|
||||
"default_value": true
|
||||
},
|
||||
"machine_extruder_count": {
|
||||
"default_value": 1
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": "; AtomStack Cambrian Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.9 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.9 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG1 E29 ;Retract the filament\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish"
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"default_value": "; AtomStack Cambrian End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute position\n\nG1 X0 Y210 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off nozzle\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z"
|
||||
}
|
||||
}
|
||||
}
|
29
resources/definitions/atomstack_cambrianmaxe175.def.json
Normal file
29
resources/definitions/atomstack_cambrianmaxe175.def.json
Normal file
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Cambrian Max E175",
|
||||
"inherits": "atomstack_cambrian_base",
|
||||
"metadata": {
|
||||
"visible": true,
|
||||
"author": "AtomStack",
|
||||
"manufacturer": "AtomStack",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_materials": true,
|
||||
"machine_extruder_trains": {
|
||||
"0": "atomstack_cambrianmaxe175_extruder_0"
|
||||
}
|
||||
},
|
||||
"overrides": {
|
||||
"machine_name": {
|
||||
"default_value": "Cambrian MAX E175"
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 320
|
||||
},
|
||||
"machine_height": {
|
||||
"default_value": 380
|
||||
},
|
||||
"machine_depth": {
|
||||
"default_value": 330
|
||||
}
|
||||
}
|
||||
}
|
29
resources/definitions/atomstack_cambrianmaxe285.def.json
Normal file
29
resources/definitions/atomstack_cambrianmaxe285.def.json
Normal file
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Cambrian Max E285",
|
||||
"inherits": "atomstack_cambrian_base",
|
||||
"metadata": {
|
||||
"visible": true,
|
||||
"author": "AtomStack",
|
||||
"manufacturer": "AtomStack",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_materials": true,
|
||||
"machine_extruder_trains": {
|
||||
"0": "atomstack_cambrianmaxe285_extruder_0"
|
||||
}
|
||||
},
|
||||
"overrides": {
|
||||
"machine_name": {
|
||||
"default_value": "Cambrian MAX E285"
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 320
|
||||
},
|
||||
"machine_height": {
|
||||
"default_value": 380
|
||||
},
|
||||
"machine_depth": {
|
||||
"default_value": 330
|
||||
}
|
||||
}
|
||||
}
|
29
resources/definitions/atomstack_cambrianproe175.def.json
Normal file
29
resources/definitions/atomstack_cambrianproe175.def.json
Normal file
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Cambrian Pro E175",
|
||||
"inherits": "atomstack_cambrian_base",
|
||||
"metadata": {
|
||||
"visible": true,
|
||||
"author": "AtomStack",
|
||||
"manufacturer": "AtomStack",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_materials": true,
|
||||
"machine_extruder_trains": {
|
||||
"0": "atomstack_cambrianproe175_extruder_0"
|
||||
}
|
||||
},
|
||||
"overrides": {
|
||||
"machine_name": {
|
||||
"default_value": "Cambrian Pro E175"
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 235
|
||||
},
|
||||
"machine_height": {
|
||||
"default_value": 250
|
||||
},
|
||||
"machine_depth": {
|
||||
"default_value": 235
|
||||
}
|
||||
}
|
||||
}
|
29
resources/definitions/atomstack_cambrianproe285.def.json
Normal file
29
resources/definitions/atomstack_cambrianproe285.def.json
Normal file
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Cambrian Pro E285",
|
||||
"inherits": "atomstack_cambrian_base",
|
||||
"metadata": {
|
||||
"visible": true,
|
||||
"author": "AtomStack",
|
||||
"manufacturer": "AtomStack",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_materials": true,
|
||||
"machine_extruder_trains": {
|
||||
"0": "atomstack_cambrianproe285_extruder_0"
|
||||
}
|
||||
},
|
||||
"overrides": {
|
||||
"machine_name": {
|
||||
"default_value": "Cambrian Pro E285"
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 235
|
||||
},
|
||||
"machine_height": {
|
||||
"default_value": 250
|
||||
},
|
||||
"machine_depth": {
|
||||
"default_value": 235
|
||||
}
|
||||
}
|
||||
}
|
41
resources/definitions/creality_ender6.def.json
Normal file
41
resources/definitions/creality_ender6.def.json
Normal file
|
@ -0,0 +1,41 @@
|
|||
{
|
||||
"name": "Creality Ender-6",
|
||||
"version": 2,
|
||||
"inherits": "creality_base",
|
||||
"overrides": {
|
||||
"machine_name": { "default_value": "Creality Ender-6" },
|
||||
"machine_start_gcode": { "default_value": "\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
|
||||
"machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X Y ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
|
||||
"machine_width": { "default_value": 260 },
|
||||
"machine_depth": { "default_value": 260 },
|
||||
"machine_height": { "default_value": 400 },
|
||||
"z_seam_type": { "value": "'sharpest_corner'"},
|
||||
"z_seam_corner": { "value": "'z_seam_corner_inner'"},
|
||||
"infill_sparse_density": { "value": "10"},
|
||||
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'"},
|
||||
"infill_overlap":{"value": 10},
|
||||
"material_print_temperature":{"value": 220},
|
||||
"material_bed_temperature":{"value": 50},
|
||||
"retraction_amount":{"value": 10},
|
||||
"speed_travel": { "value": 80.0 },
|
||||
"coasting_enable": { "value": true},
|
||||
"coasting_min_volume": { "value": 0.5},
|
||||
"machine_head_with_fans_polygon": { "default_value": [
|
||||
[-26, 34],
|
||||
[-26, -32],
|
||||
[32, -32],
|
||||
[32, 34]
|
||||
]
|
||||
},
|
||||
|
||||
"gantry_height": { "value": 25 },
|
||||
|
||||
"speed_print": { "value": 50.0 },
|
||||
"speed_wall": { "value": 30.0 }
|
||||
|
||||
},
|
||||
"metadata": {
|
||||
"quality_definition": "creality_base",
|
||||
"visible": true
|
||||
}
|
||||
}
|
|
@ -1909,7 +1909,7 @@
|
|||
"gyroid": "Gyroid"
|
||||
},
|
||||
"default_value": "grid",
|
||||
"enabled": "infill_sparse_density > 0",
|
||||
"enabled": "infill_line_distance > 0",
|
||||
"value": "'lines' if infill_sparse_density > 25 else 'grid'",
|
||||
"limit_to_extruder": "infill_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
|
@ -6249,7 +6249,7 @@
|
|||
"mold_width":
|
||||
{
|
||||
"label": "Minimal Mold Width",
|
||||
"description": "The minimal distance between the ouside of the mold and the outside of the model.",
|
||||
"description": "The minimal distance between the outside of the mold and the outside of the model.",
|
||||
"unit": "mm",
|
||||
"type": "float",
|
||||
"minimum_value_warning": "wall_line_width_0 * 2",
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
},
|
||||
"overrides": {
|
||||
|
||||
"machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },
|
||||
"machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },
|
||||
|
||||
"machine_max_feedrate_x": { "value": 500 },
|
||||
"machine_max_feedrate_y": { "value": 500 },
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
[30, 40]
|
||||
]
|
||||
},
|
||||
"machine_start_gcode": { "default_value": ";Start GCode by ideagen3D\n\nG1 Z15.0 F6000 ;Move the platform down 15mm\n\n;Initialize Temperature\nM140 S{material_bed_temperature_layer_0} ;heat bed and continue\nM104 S{material_print_temperature_layer_0} ;heat nozzle and continue\nM190 S{material_bed_temperature_layer_0} ;wait for bed temperature to reach inital layer temperature\nM109 S{material_print_temperature_layer_0} ;wait for hot end temperature to reach inital layer temperature\n\nG28 M420 S1 ; Home & Enable Bed Levelling\n\n;Prime the extruder\nG92 E0\nG1 X1 Y280 Z0.2 ;Prepare to Purge\nG1 Y20 Z0.2 F1500.0 E15 ;Purge line\nG92 E0" },
|
||||
"machine_start_gcode": { "default_value": ";Start GCode by ideagen3D\n\nG1 Z15.0 F6000 ;Move the platform down 15mm\n\n;Initialize Temperature\nM140 S{material_bed_temperature_layer_0} ;heat bed and continue\nM104 S{material_print_temperature_layer_0} ;heat nozzle and continue\nM190 S{material_bed_temperature_layer_0} ;wait for bed temperature to reach initial layer temperature\nM109 S{material_print_temperature_layer_0} ;wait for hot end temperature to reach initial layer temperature\n\nG28 M420 S1 ; Home & Enable Bed Levelling\n\n;Prime the extruder\nG92 E0\nG1 X1 Y280 Z0.2 ;Prepare to Purge\nG1 Y20 Z0.2 F1500.0 E15 ;Purge line\nG92 E0" },
|
||||
"machine_end_gcode": { "default_value": ";End GCode by ideagen3D\n\nM104 S0 ;Set nozzle temperature to 0\nM140 S0 ;Set Bed temperature to 0\n\nG92 E1 ;Prepare to retract filament\nG1 E-1 F300 ;Retract filament\nG28 X0 Y0 ;Home X and Y\nM84 ;Disable Steppers" },
|
||||
"gantry_height": { "value": 65 }
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
"overrides": {
|
||||
"machine_name": { "default_value": "Two Trees Base Printer" },
|
||||
"machine_start_gcode": { "default_value": "G28 ;Home\nM420 S1 ;Enable ABL using saved Mesh and Fade Height\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Bed up" },
|
||||
"machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
|
||||
"machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
|
||||
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue