Merge branch 'CURA-8212_Add_version_upgrader_for_two_trees_definitions'

This commit is contained in:
Ghostkeeper 2021-05-17 09:55:56 +02:00
commit 28a7facd1b
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
3325 changed files with 3540 additions and 3392 deletions

View file

@ -4,7 +4,7 @@
"inherits": "blv_mgn_cube_base",
"metadata": {
"visible": true,
"setting_version": 16,
"setting_version": 17,
"author": "wolfgangmauer",
"manufacturer": "BLV",
"file_formats": "text/x-gcode",

View file

@ -4,7 +4,7 @@
"inherits": "blv_mgn_cube_base",
"metadata": {
"visible": true,
"setting_version": 16,
"setting_version": 17,
"author": "wolfgangmauer",
"manufacturer": "BLV",
"file_formats": "text/x-gcode",

View file

@ -6,7 +6,7 @@
"type": "extruder",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 16,
"setting_version": 17,
"visible": false,
"position": "0"
},

View file

@ -6,7 +6,7 @@
"type": "machine",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 16,
"setting_version": 17,
"file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,

View file

@ -1,36 +0,0 @@
{
"version": 2,
"name": "TwoTrees Bluer",
"inherits": "fdmprinter",
"metadata":
{
"visible": true,
"author": "Washington C. Correa Jr.",
"manufacturer": "TwoTrees",
"file_formats": "text/x-gcode",
"platform": "twotrees_platform.stl",
"machine_extruder_trains":
{
"0": "twotrees_bluer_extruder_0",
"1": "twotrees_bluer_extruder_1"
}
},
"overrides":
{
"machine_name": { "default_value": "Two Trees Bluer" },
"machine_heated_bed": { "default_value": true },
"machine_width": { "default_value": 235 },
"machine_depth": { "default_value": 235 },
"machine_height": { "default_value": 280 },
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[32, -32],
[32, 34]
]
},
"machine_start_gcode": { "default_value": "; Two Trees Bluer Custom Start G-code\nG28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG1 E10 F1500 ;Purge a bit\nG1 X10.1 Y20 Z0.2 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.2 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.2 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.2 F1500.0 E20 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z3.0 X20 Y20 F3000 ;Move Z Axis up\nG1 E3 F2700 ;Purge a bit" },
"machine_end_gcode": { "default_value": "; Two Trees Bluer Custom End G-code\nG91 ;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\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" },
"gantry_height": { "value": 25 }
}
}