3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-24 11:21:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'um-master' into gh-issue-980

Browse source 
Conflicts:
	resources/definitions/fdmprinter.def.json
This commit is contained in:
nickthetait 2016-10-13 08:01:00 -06:00
commit bf331f39af
220 changed files with 111349 additions and 168598 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/bq_hephestos.def.json
View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

2
resources/definitions/bq_hephestos_xl.def.json
View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

2
resources/definitions/bq_witbox.def.json
View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"layer_height": {
"default_value": 0.2

2
resources/definitions/bq_witbox_2.def.json
View file

@ -37,7 +37,7 @@
"default_value": false
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"material_print_temperature": {
"default_value": 210

6
resources/definitions/fdmextruder.def.json
View file

@ -177,7 +177,8 @@
"minimum_value_warning": "machine_nozzle_offset_x",
"maximum_value": "machine_width",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_extruder": true,
"enabled": false
},
"extruder_prime_pos_y":
{
@ -189,7 +190,8 @@
"minimum_value_warning": "machine_nozzle_offset_y",
"maximum_value_warning": "machine_depth",
"settable_per_mesh": false,
"settable_per_extruder": true
"settable_per_extruder": true,
"enabled": false
}
}
}

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

File diff suppressed because it is too large Load diff

67
resources/definitions/kossel_mini.def.json Normal file
View file

@ -0,0 +1,67 @@
{
"id": "kossel_mini",
"version": 2,
"name": "Kossel Mini",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Claudio Sampaio (Patola)",
"manufacturer": "Other",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "kossel_platform.stl"
},
"overrides": {
"machine_heated_bed": {
"default_value": true
},
"machine_width": {
"default_value": 170
},
"machine_height": {
"default_value": 200
},
"machine_depth": {
"default_value": 170
},
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"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 ;Home all axes (max 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\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning"
},
"machine_disallowed_areas": {
"default_value": [
[[-34, -85], [ -85, -85], [-70, -70]],
[[-85, -85], [-85, -34], [-70, -70]],
[[34, -85], [ 85, -85], [70, -70]],
[[85, -85], [85, -34], [70, -70]],
[[-34, 85], [ -85, 85], [-70, 70]],
[[-85, 85], [-85, 34], [-70, 70]],
[[34, 85], [ 85, 85], [70, 70]],
[[85, 85], [85, 34], [70, 70]]
]
}
}
}

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

@ -42,7 +42,7 @@
"default_value": 55
},
"machine_gcode_flavor": {
"default_value": "RepRap"
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_disallowed_areas": {
"default_value": []
@ -144,7 +144,7 @@
"default_value": 15
},
"adhesion_type": {
"default_value": "Raft"
"default_value": "raft"
},
"skirt_brim_minimal_length": {
"default_value": 100

9
resources/definitions/rigidbot.def.json
View file

@ -88,16 +88,13 @@
"default_value": 0
},
"skirt_line_count": {
"default_value": 3,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 3
},
"skirt_gap": {
"default_value": 4,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 4
},
"skirt_brim_minimal_length": {
"default_value": 200,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 200
}
}
}

9
resources/definitions/rigidbot_big.def.json
View file

@ -91,16 +91,13 @@
"default_value": 0
},
"skirt_line_count": {
"default_value": 3,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 3
},
"skirt_gap": {
"default_value": 4,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 4
},
"skirt_brim_minimal_length": {
"default_value": 200,
"enabled": "adhesion_type == \"Skirt\""
"default_value": 200
}
}
}

10
resources/definitions/ultimaker.def.json
View file

@ -20,6 +20,16 @@
},
"material_standby_temperature": {
"minimum_value": "0"
},
"extruder_prime_pos_y":
{
"minimum_value": "0",
"maximum_value": "machine_depth"
},
"extruder_prime_pos_x":
{
"minimum_value": "0",
"maximum_value": "machine_width"
}
}
}