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 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework

Browse source
This commit is contained in:
Jaime van Kessel 2016-05-20 14:10:44 +02:00
commit 846dbc881e
4 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -327,6 +327,13 @@
"unit": "mm",
"default_value": 0,
"global_only": "True"
},
"machine_use_extruder_offset_to_offset_coords":
{
"label": "Offset With Extruder",
"description": "Apply the extruder offset to the coordinate system.",
"type": "bool",
"default_value": true
}
}
},

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

@ -43,10 +43,10 @@
"gantry_height": {
"default_value": 82.3
},
"machine_nozzle_offset_x_1": {
"machine_nozzle_offset_x": {
"default_value": 0
},
"machine_nozzle_offset_y_1": {
"machine_nozzle_offset_y": {
"default_value": 15
},
"machine_gcode_flavor": {

1
resources/definitions/ultimaker2.def.json
View file

@ -7,6 +7,7 @@
"visible": true,
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"category": "Ultimaker",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2_platform.obj",

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

@ -6,6 +6,7 @@
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"category": "Ultimaker",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker.png",
"platform": "ultimaker_platform.stl",
@ -17,6 +18,14 @@
]
},
"settings": {
"machine_extruder_drive_upgrade": {
"label": "Extruder Drive Upgrade",
"description": "This machine has the extruder drive upgrade.",
"type": "bool",
"default_value": false
}
},
"overrides": {
"machine_width": {
"default_value": 205
@ -62,9 +71,6 @@
},
"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"
},
"machine_extruder_drive_upgrade": {
"default_value": false
}
}
}