GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 19:55:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

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-18 11:04:12 +02:00
commit 8cab9afe66
19 changed files with 319 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,8 @@
"manufacturer": "BQ",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "bq_witbox_platform.stl"
"platform": "bq_witbox_platform.stl",
"platform_offset": [0, -145, -38]
},
"overrides": {
@ -37,9 +38,6 @@
"machine_gcode_flavor": {
"default_value": "RepRap"
},
"machine_platform_offset": {
"default_value": [0, -145, -38]
},
"material_print_temperature": {
"default_value": 210
},

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

@ -9,7 +9,8 @@
"manufacturer": "Innovo",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "inventor_platform.stl"
"platform": "inventor_platform.stl",
"platform_offset": [-180, -0.25, 160]
},
"overrides": {
@ -61,9 +62,6 @@
"machine_end_gcode": {
"default_value": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors"
},
"machine_platform_offset": {
"default_value": [-180, -0.25, 160]
},
"layer_height": {
"default_value": 0.15
},

5
resources/definitions/maker_starter.def.json
View File

@ -4,9 +4,9 @@
"name": "3DMaker Starter",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "tvlgiao",
"manufacturer": "3DMaker",
"category": "Other",
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj",
"icon": "icon_ultimaker2.png",
"platform": "makerstarter_platform.stl"
@ -58,9 +58,6 @@
"machine_disallowed_areas": {
"default_value": []
},
"machine_platform_offset": {
"default_value": [0, 0, 0]
},
"machine_nozzle_tip_outer_diameter": {
"default_value": 1
},

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

@ -10,7 +10,8 @@
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png"
"platform_texture": "Ultimaker2backplate.png",
"platform_offset": [9, 0, 0]
},
"overrides": {
"machine_start_gcode" : {
@ -69,9 +70,6 @@
[[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]],
[[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]]
]},
"machine_platform_offset": {
"default_value": [9, 0, 0]
},
"machine_nozzle_tip_outer_diameter": {
"default_value": 1
},

21
resources/definitions/ultimaker2_extended.def.json Normal file
View File

@ -0,0 +1,21 @@
{
"id": "ultimaker2_extended",
"version": 2,
"name": "Ultimaker 2 Extended",
"inherits": "ultimaker2",
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"category": "Ultimaker",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Extendedbackplate.png"
},
"overrides": {
"machine_height": {
"default_value": 315
}
}
}

30
resources/definitions/ultimaker2_extended_plus.def.json Normal file
View File

@ -0,0 +1,30 @@
{
"id": "ultimaker2_extended_plus_base",
"version": 2,
"name": "Ultimaker 2 Extended+",
"inherits": "ultimaker2plus",
"visible": false,
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"category": "Ultimaker",
"file_formats": "text/x-gcode",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png"
},
"overrides": {
"machine_height": {
"default_value": 313
},
"machine_show_variants": {
"default_value": true
},
"machine_nozzle_head_distance": {
"default_value": 5
},
"machine_nozzle_expansion_angle": {
"default_value": 45
}
}
}

39
resources/definitions/ultimaker2_go.def.json Normal file
View File

@ -0,0 +1,39 @@
{
"id": "ultimaker2_go",
"version": 2,
"name": "Ultimaker 2 Go",
"inherits": "ultimaker2",
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"category": "Ultimaker",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2go_platform.obj",
"platform_texture": "Ultimaker2Gobackplate.png",
"platform_offset": [0, 0, 0]
},
"overrides": {
"machine_width": {
"default_value": 120
},
"machine_depth": {
"default_value": 120
},
"machine_height": {
"default_value": 115
},
"machine_heated_bed": {
"default_value": false
},
"machine_disallowed_areas": {
"default_value": [
[[-60, 60], [-33, 60], [-35, 52], [-60, 52]],
[[ 60, 60], [ 60, 52], [ 35, 52], [ 33, 60]],
[[-60, -60], [-60, -52], [-35, -52], [-33, -60]],
[[ 60, -60], [ 33, -60], [ 35, -52], [ 60, -52]]
]
},
}
}

71
resources/definitions/ultimaker2_plus.def.json Normal file
View File

@ -0,0 +1,71 @@
{
"id": "ultimaker2plus_base",
"version": 2,
"name": "Ultimaker 2+",
"inherits": "ultimaker2",
"visible": "false",
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"category": "Ultimaker",
"file_formats": "text/x-gcode",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Plusbackplate.png"
},
"overrides": {
"speed_infill": {
"value": "speed_print"
},
"speed_wall_x": {
"value": "speed_wall"
},
"layer_height_0": {
"value": "round(machine_nozzle_size / 1.5, 2)"
},
"line_width": {
"value": "round(machine_nozzle_size * 0.875, 2)"
},
"speed_layer_0": {
"default_value": 20
},
"speed_support": {
"value": "speed_wall_0"
},
"machine_height": {
"default_value": 203
},
"machine_show_variants": {
"default_value": true
},
"gantry_height": {
"default_value": 52
},
"machine_nozzle_head_distance": {
"default_value": 5
},
"machine_nozzle_expansion_angle": {
"default_value": 45
},
"machine_heat_zone_length": {
"default_value": 20
},
"machine_head_with_fans_polygon":
{
"default_value": [
[ -44, 14 ],
[ -44, -34 ],
[ 64, 14 ],
[ 64, -34 ]
]
},
"machine_disallowed_areas": {
"default_value": [
[[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]],
[[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]],
[[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]],
[[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]]
]
}
}
}

70
resources/definitions/ultimaker_original.def.json Normal file
View File

@ -0,0 +1,70 @@
{
"id": "ultimaker_original",
"version": 2,
"name": "Ultimaker Original",
"inherits": "ultimaker",
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker.png",
"platform": "ultimaker_platform.stl",
"pages": [
"SelectUpgradedParts",
"UpgradeFirmware",
"UltimakerCheckup",
"BedLeveling"
]
},
"overrides": {
"machine_width": {
"default_value": 205
},
"machine_height": {
"default_value": 200
},
"machine_depth": {
"default_value": 205
},
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_head_with_fans_polygon":
{
"default_value": [
[ -75, 35 ],
[ -75, -18 ],
[ 18, 35 ],
[ 18, -18 ]
]
},
"gantry_height": {
"default_value": 55
},
"machine_use_extruder_offset_to_offset_coords": {
"default_value": true
},
"machine_gcode_flavor": {
"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 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
},
"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
}
}
}

26
resources/definitions/ultimaker_original_plus.def.json Normal file
View File

@ -0,0 +1,26 @@
{
"id": "ultimaker_original_plus",
"version": 2,
"name": "Ultimaker Original+",
"inherits": "ultimaker_original",
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"category": "Ultimaker",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "UltimakerPlusbackplate.png",
"pages": [
"UpgradeFirmware",
"UltimakerCheckup",
"BedLeveling"
]
},
"overrides": {
"machine_heated_bed": {
"default_value": true
}
}
}

55
resources/definitions/uniqbot_one.def.json Normal file
View File

@ -0,0 +1,55 @@
{
"id": "uniqbot_one",
"version": 2,
"name": "Uniqbot",
"inherits": "fdmprinter",
"metadata": {
"author": "Unimatech",
"manufacturer": "Unimatech",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png"
},
"overrides": {
"machine_heated_bed": {
"default_value": false
},
"machine_width": {
"default_value": 140
},
"machine_height": {
"default_value": 120
},
"machine_depth": {
"default_value": 160
},
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.5
},
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_nozzle_gantry_distance": {
"default_value": 55
},
"machine_gcode_flavor": {
"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..."
},
"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+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"
}
}
}

9
resources/machines/fdmprinter.json
View File

@ -121,15 +121,6 @@
"default": [],
"global_only": true
},
"machine_platform_offset": {
"description": "Where to display the platform mesh.",
"default": [
0,
0,
0
],
"global_only": true
},
"machine_head_polygon": {
"description": "A 2D silhouette of the print head (fan caps excluded).",
"type": "polygon",

16
resources/machines/ultimaker2_extended.json
View File

@ -1,16 +0,0 @@
{
"id": "ultimaker2_extended",
"version": 1,
"name": "Ultimaker 2 Extended",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Extendedbackplate.png",
"file_formats": "text/x-gcode",
"inherits": "ultimaker2.json",
"machine_settings": {
"machine_height": { "default": 315 }
}
}

19
resources/machines/ultimaker2_extended_plus.json
View File

@ -1,19 +0,0 @@
{
"id": "ultimaker2_extended_plus_base",
"version": 1,
"name": "Ultimaker 2 Extended+",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2plus.json",
"machine_settings": {
"machine_height": { "default": 313 },
"machine_show_variants": { "default": true },
"machine_nozzle_head_distance": { "default": 5 },
"machine_nozzle_expansion_angle": { "default": 45 }
}
}

26
resources/machines/ultimaker2_go.json
View File

@ -1,26 +0,0 @@
{
"id": "ultimaker2_go",
"version": 1,
"name": "Ultimaker 2 Go",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2go_platform.obj",
"platform_texture": "Ultimaker2Gobackplate.png",
"file_formats": "text/x-gcode",
"inherits": "ultimaker2.json",
"overrides": {
"machine_width": { "default": 120 },
"machine_depth": { "default": 120 },
"machine_height": { "default": 115 },
"machine_heated_bed": { "default": false },
"machine_disallowed_areas": { "default": [
[[-60.0, 60.0], [-33.0, 60.0], [-35.0, 52.0], [-60.0, 52.0]],
[[ 60.0, 60.0], [ 60.0, 52.0], [ 35.0, 52.0], [ 33.0, 60.0]],
[[-60.0, -60.0], [-60.0, -52.0], [-35.0, -52.0], [-33.0, -60.0]],
[[ 60.0, -60.0], [ 33.0, -60.0], [ 35.0, -52.0], [ 60.0, -52.0]]
]},
"machine_platform_offset": { "default": [0.0, 0.0, 0.0] }
}
}

54
resources/machines/ultimaker2plus.json
View File

@ -1,54 +0,0 @@
{
"id": "ultimaker2plus_base",
"version": 1,
"name": "Ultimaker 2+",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Plusbackplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2.json",
"overrides": {
"speed_infill": { "inherit_function": "speed_print" },
"speed_wall_x": { "inherit_function": "speed_wall" },
"layer_height_0": { "inherit_function": "round(machine_nozzle_size / 1.5, 2)" },
"line_width": { "inherit_function": "round(machine_nozzle_size * 0.875, 2)" },
"speed_layer_0": { "default": "20" },
"speed_support": { "inherit_function": "speed_wall_0" },
"machine_height": { "default": 203 },
"machine_show_variants": { "default": true },
"gantry_height": { "default": 52 },
"machine_nozzle_head_distance": { "default": 5 },
"machine_nozzle_expansion_angle": { "default": 45 },
"machine_heat_zone_length": { "default": 20 },
"machine_head_with_fans_polygon":
{
"default": [
[
-44,
14
],
[
-44,
-34
],
[
64,
14
],
[
64,
-34
]
]
},
"machine_disallowed_areas": { "default": [
[[-115.0, 112.5], [ -78.0, 112.5], [ -80.0, 102.5], [-115.0, 102.5]],
[[ 115.0, 112.5], [ 115.0, 102.5], [ 105.0, 102.5], [ 103.0, 112.5]],
[[-115.0, -112.5], [-115.0, -104.5], [ -84.0, -104.5], [ -82.0, -112.5]],
[[ 115.0, -112.5], [ 108.0, -112.5], [ 110.0, -104.5], [ 115.0, -104.5]]
]}
}
}

83
resources/machines/ultimaker_original.json
View File

@ -1,83 +0,0 @@
{
"id": "ultimaker_original",
"version": 1,
"name": "Ultimaker Original",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"icon": "icon_ultimaker.png",
"platform": "ultimaker_platform.stl",
"file_formats": "text/x-gcode",
"inherits": "ultimaker.json",
"pages": [
"SelectUpgradedParts",
"UpgradeFirmware",
"UltimakerCheckup",
"BedLeveling"
],
"machine_extruder_trains": {
"0": {
"machine_nozzle_heat_up_speed": {
"default": 2.0
},
"machine_nozzle_cool_down_speed": {
"default": 2.0
},
"machine_nozzle_tip_outer_diameter": {
"default": 1
},
"machine_nozzle_head_distance": {
"default": 3
},
"machine_nozzle_expansion_angle": {
"default": 45
},
"machine_heat_zone_length": {
"default": 16
}
}
},
"overrides": {
"machine_width": { "default": 205 },
"machine_height": { "default": 200 },
"machine_depth": { "default": 205 },
"machine_center_is_zero": { "default": false },
"machine_nozzle_size": { "default": 0.4 },
"machine_nozzle_heat_up_speed": { "default": 2.0 },
"machine_nozzle_cool_down_speed": { "default": 2.0 },
"machine_head_with_fans_polygon":
{
"default": [
[
-75,
35
],
[
-75,
-18
],
[
18,
35
],
[
18,
-18
]
]
},
"gantry_height": { "default": 55 },
"machine_use_extruder_offset_to_offset_coords": { "default": true },
"machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": {
"default": "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 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
},
"machine_end_gcode": {
"default": "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": false }
}
}

22
resources/machines/ultimaker_original_plus.json
View File

@ -1,22 +0,0 @@
{
"id": "ultimaker_original_plus",
"version": 1,
"name": "Ultimaker Original+",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"icon": "icon_ultimaker.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "UltimakerPlusbackplate.png",
"file_formats": "text/x-gcode",
"inherits": "ultimaker_original.json",
"pages": [
"UpgradeFirmware",
"UltimakerCheckup",
"BedLeveling"
],
"overrides": {
"machine_heated_bed": { "default": true }
}
}

31
resources/machines/uniqbot_one.json
View File

@ -1,31 +0,0 @@
{
"id": "uniqbot_one",
"version": 1,
"name": "Uniqbot",
"manufacturer": "Unimatech",
"author": "Unimatech",
"icon": "icon_ultimaker2.png",
"file_formats": "text/x-gcode",
"inherits": "fdmprinter.json",
"overrides": {
"machine_heated_bed": { "default": false },
"machine_width": { "default": 140 },
"machine_height": { "default": 120 },
"machine_depth": { "default": 160 },
"machine_center_is_zero": { "default": false },
"machine_nozzle_size": { "default": 0.5 },
"material_diameter": { "default": 1.75 },
"machine_nozzle_heat_up_speed": { "default": 2.0 },
"machine_nozzle_cool_down_speed": { "default": 2.0 },
"machine_nozzle_gantry_distance": { "default": 55 },
"machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": {
"default": "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..."
},
"machine_end_gcode": {
"default": "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+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"
}
}
}