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

Fix saving Gcode for UM2 with Olsson printers

Browse Source 
Add file_format parameter to ultimaker2 with olsson block machine definitions. Also removes some machine overrides that were also removed from um2+ profiles.

Fixes CURA-980
This commit is contained in:
fieldOfView 2016-03-01 18:08:06 +01:00
parent bec897843d
commit 5cd1a760e7
10 changed files with 22 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/machines/ultimaker2_extended_olsson.json
View File

@ -1,12 +1,13 @@
{
"id": "ultimaker2_extended_olsson_base",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended with Olsson Block",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2.json",
"machine_settings": {

3
resources/machines/ultimaker2_extended_olsson_025.json
View File

@ -1,12 +1,13 @@
{
"id": "ultimaker2_extended_olsson",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended with Olsson Block",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2_extended_olsson.json",
"variant": "0.25 mm",
"profiles_machine": "ultimaker2_olsson",

4
resources/machines/ultimaker2_extended_olsson_040.json
View File

@ -1,13 +1,15 @@
{
"id": "ultimaker2_extended_olsson",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended with Olsson Block",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2_extended_olsson.json",
"variant": "0.4 mm",
"profiles_machine": "ultimaker2_olsson",
"machine_settings": {

4
resources/machines/ultimaker2_extended_olsson_060.json
View File

@ -1,13 +1,15 @@
{
"id": "ultimaker2_extended_olsson",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended with Olsson Block",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2_extended_olsson.json",
"variant": "0.6 mm",
"profiles_machine": "ultimaker2_olsson",
"machine_settings": {

4
resources/machines/ultimaker2_extended_olsson_080.json
View File

@ -1,13 +1,15 @@
{
"id": "ultimaker2_extended_olsson",
"version": 1,
"version": 1,
"name": "Ultimaker 2 Extended with Olsson Block",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"file_formats": "text/x-gcode",
"visible": false,
"inherits": "ultimaker2_extended_olsson.json",
"variant": "0.8 mm",
"profiles_machine": "ultimaker2_olsson",
"machine_settings": {

29
resources/machines/ultimaker2_olsson.json
View File

@ -1,39 +1,16 @@
{
"id": "ultimaker2_olsson_base",
"version": 1,
"version": 1,
"name": "Ultimaker 2 with Olsson Block",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2.json",
"overrides": {
"machine_show_variants": { "default": true },
"shell_thickness": { "default": 1.2 },
"top_bottom_thickness": { "inherit_function": "(parent_value / 3) * 2" },
"travel_compensate_overlapping_walls_enabled": { "default": true },
"skin_alternate_rotation": { "default": true },
"skin_outline_count": { "default": 2 },
"infill_sparse_density": { "default": 10 },
"infill_overlap": { "default": 14, "inherit_function": "14 if infill_sparse_density < 95 else 0" },
"infill_wipe_dist": { "default": 0.35, "inherit_function": "wall_line_width_0" },
"retraction_amount": { "default": 6 },
"retraction_min_travel": { "default": 4.5 },
"retraction_count_max": { "default": 6 },
"retraction_extrusion_window": { "default": 6.0 },
"speed_print": { "default": 50 },
"speed_wall": { "inherit_function": "parent_value / 50 * 30" },
"speed_wall_x": { "inherit_function": "speed_print / 50 * 40" },
"speed_topbottom": { "inherit_function": "parent_value / 50 * 20" },
"speed_layer_0": { "default": 20 },
"skirt_speed": { "default": 20 },
"travel_avoid_distance": { "default": 1.0 },
"coasting_enable": { "default": true },
"coasting_volume": { "default": 0.4 },
"support_angle": { "default": 50 },
"adhesion_type": { "default": "brim" }
"machine_show_variants": { "default": true }
}
}

13
resources/machines/ultimaker2_olsson_025.json
View File

@ -1,13 +1,13 @@
{
"id": "ultimaker2_olsson",
"version": 1,
"version": 1,
"name": "Ultimaker 2 with Olsson Block",
"manufacturer": "Ultimaker",
"author": "Ultimaker",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2_olsson.json",
"variant": "0.25 mm",
@ -15,15 +15,6 @@
"overrides": {
"machine_nozzle_size": { "default": 0.25 },
"layer_height": { "default": 0.06 },
"layer_height_0": { "default": 0.15 },
"infill_sparse_density": { "default": 12 },
"speed_print": { "default": 30 },
"speed_wall": { "inherit_function": "parent_value / 30 * 20" },
"speed_wall_x": { "inherit_function": "speed_print / 30 * 25" },
"speed_topbottom": { "inherit_function": "parent_value / 30 * 20" },
"coasting_volume": { "default": 0.1 },
"coasting_min_volume": { "default": 0.17 }
}

7
resources/machines/ultimaker2_olsson_040.json
View File

@ -7,15 +7,12 @@
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2_olsson.json",
"variant": "0.4 mm",
"overrides": {
"machine_nozzle_size": { "default": 0.40 },
"wall_line_width_0": { "inherit_function": "parent_value * 0.875" },
"skin_line_width": { "inherit_function": "parent_value * 0.875" }
"machine_nozzle_size": { "default": 0.40 }
}
}

14
resources/machines/ultimaker2_olsson_060.json
View File

@ -7,25 +7,13 @@
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2_olsson.json",
"variant": "0.6 mm",
"overrides": {
"machine_nozzle_size": { "default": 0.60 },
"layer_height": { "default": 0.15 },
"layer_height_0": { "default": 0.4 },
"shell_thickness": { "default": 1.8 },
"infill_sparse_density": { "default": 15 },
"speed_print": { "default": 55 },
"speed_wall": { "inherit_function": "parent_value / 55 * 25" },
"speed_wall_x": { "inherit_function": "speed_print / 55 * 40" },
"speed_topbottom": { "inherit_function": "parent_value / 55 * 20" },
"coasting_volume": { "default": 1.36 }
}
}

15
resources/machines/ultimaker2_olsson_080.json
View File

@ -7,26 +7,13 @@
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"visible": false,
"file_formats": "text/x-gcode",
"inherits": "ultimaker2_olsson.json",
"variant": "0.8 mm",
"overrides": {
"machine_nozzle_size": { "default": 0.80 },
"layer_height": { "default": 0.2 },
"layer_height_0": { "default": 0.5 },
"shell_thickness": { "default": 2.4 },
"top_bottom_thickness": { "inherit_function": "parent_value / 2" },
"infill_sparse_density": { "default": 16 },
"speed_print": { "default": 40 },
"speed_wall": { "inherit_function": "parent_value / 40 * 20" },
"speed_wall_x": { "inherit_function": "speed_print / 40 * 30" },
"speed_topbottom": { "inherit_function": "parent_value / 40 * 20" },
"coasting_volume": { "default": 3.22 }
}
}