Move platform offset to metadata

Also removed the setting from fdmprinter just to be clear.

Contributes to issue CURA-1278.
This commit is contained in:
Ghostkeeper 2016-05-18 10:34:28 +02:00
parent 64c15eb876
commit 4e3e466a11
No known key found for this signature in database
GPG Key ID: 701948C5954A7385
6 changed files with 9 additions and 29 deletions

View File

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

View File

@ -9,7 +9,8 @@
"manufacturer": "Innovo", "manufacturer": "Innovo",
"category": "Other", "category": "Other",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "inventor_platform.stl" "platform": "inventor_platform.stl",
"platform_offset": [-180, -0.25, 160]
}, },
"overrides": { "overrides": {
@ -61,9 +62,6 @@
"machine_end_gcode": { "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" "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": { "layer_height": {
"default_value": 0.15 "default_value": 0.15
}, },

View File

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

View File

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

View File

@ -10,7 +10,8 @@
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png", "icon": "icon_ultimaker2.png",
"platform": "ultimaker2go_platform.obj", "platform": "ultimaker2go_platform.obj",
"platform_texture": "Ultimaker2Gobackplate.png" "platform_texture": "Ultimaker2Gobackplate.png",
"platform_offset": [0, 0, 0]
}, },
"overrides": { "overrides": {
@ -34,8 +35,5 @@
[[ 60, -60], [ 33, -60], [ 35, -52], [ 60, -52]] [[ 60, -60], [ 33, -60], [ 35, -52], [ 60, -52]]
] ]
}, },
"machine_platform_offset": {
"default_value": [0, 0, 0]
}
} }
} }

View File

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