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

Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack

Browse source
This commit is contained in:
Jaime van Kessel 2019-12-10 13:06:37 +01:00
commit f66b1e6fde
No known key found for this signature in database
GPG key ID: 3710727397403C91
23 changed files with 112 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/definitions/creality_ender3.def.json
View file

@ -9,9 +9,14 @@
},
"overrides": {
"machine_name": { "default_value": "Creality Ender-3" },
"machine_width": { "default_value": 220 },
"machine_depth": { "default_value": 220 },
"machine_width": { "default_value": 235 },
"machine_depth": { "default_value": 235 },
"machine_height": { "default_value": 250 },
"machine_disallowed_areas": {
"default_value": [
[[-117.5, 117.5], [-117.5, 108], [117.5, 108], [117.5, 117.5]],
[[-117.5, -108], [-117.5, -117.5], [117.5, -117.5], [117.5, -108]]
]},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],
@ -22,4 +27,4 @@
"gantry_height": { "value": 25 }
}
}
}

26
resources/definitions/fdmprinter.def.json
View file

@ -2337,6 +2337,20 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"material_break_preparation_temperature":
{
"label": "Break Preparation Temperature",
"description": "The temperature used to purge material, should be roughly equal to the highest possible printing temperature.",
"type": "float",
"unit": "°C",
"default_value": 50,
"value": "material_print_temperature",
"enabled": false,
"minimum_value": "-273.15",
"maximum_value_warning": "300",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"material_break_retracted_position":
{
"label": "Break Retracted Position",
@ -2695,7 +2709,6 @@
"minimum_value": "0",
"minimum_value_warning": "line_width * 1.5",
"maximum_value_warning": "10",
"enabled": false,
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -7123,6 +7136,17 @@
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
"bridge_sparse_infill_max_density":
{
"label": "Bridge Sparse Infill Max Density",
"description": "Maximum density of infill considered to be sparse. Skin over sparse infill is considered to be unsupported and so may be treated as a bridge skin.",
"unit": "%",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
"bridge_wall_coast":
{
"label": "Bridge Wall Coasting",

4
resources/definitions/vertex_k8400.def.json
View file

@ -50,10 +50,10 @@
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
"default_value": "M104 T0 S{material_print_temperature_layer_0}\nG28 ;Home extruder\nG90 ;Absolute positioning\nM82 ;Extruder in absolute mode\nG1 Z1 F100\nG92 E0 ;Reset extruder position\nM109 T0 S{material_print_temperature_layer_0}\nG1 E20 F100\nG92 E0 ;Reset extruder position"
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
"default_value": "G1 X0 Y0 Z130 ;Get extruder out of way\nM107 ;Turn off fan\n;Disable all extruders\nG91 ;Relative positioning\nT0\nG1 E-1 ;Reduce filament pressure\nM104 T0 S0\nG90 ;Absolute positioning\nG92 E0 ;Reset extruder position\nM140 S0 ;Disable heated bed\nM84 ;Turn steppers off"
}
}
}