From 00305f1c53c4763f2d3146caeadca8466f0d3457 Mon Sep 17 00:00:00 2001 From: Tom Heijmans Date: Fri, 15 Apr 2016 13:35:25 +0200 Subject: [PATCH] Updated inheritance functions for um2+ --- resources/machines/ultimaker2plus.json | 6 ++++++ resources/machines/ultimaker2plus_025.json | 4 ++++ resources/machines/ultimaker2plus_040.json | 4 ++++ resources/machines/ultimaker2plus_060.json | 4 ++++ resources/machines/ultimaker2plus_080.json | 4 ++++ 5 files changed, 22 insertions(+) diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index a3441a8dd4..c1c581618f 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -11,6 +11,12 @@ "inherits": "ultimaker2.json", "overrides": { + "speed_infill": { "inherit_function": "speed_print" }, + "layer_height_0": { "inherit_function": "round(machine_nozzle_size / 1.5, 2)" }, + "retraction_min_travel": { "inherit_function": "machine_nozzle_size * 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 }, diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json index 22bb33cb55..d3aea61e86 100644 --- a/resources/machines/ultimaker2plus_025.json +++ b/resources/machines/ultimaker2plus_025.json @@ -12,6 +12,10 @@ "variant": "0.25 mm", "overrides": { + "speed_wall": { "inherit_function": "round(speed_print / 1.2, 0)" }, + "speed_wall_x": { "inherit_function": "speed_wall" }, + "speed_wall_0": { "inherit_function": "speed_wall - 5" }, + "speed_topbottom": { "inherit_function": "round(speed_print / 1.5, 0)" }, "machine_nozzle_size": { "default": 0.25 }, "machine_nozzle_tip_outer_diameter": { "default": 0.8 }, "coasting_volume": { "default": 0.1 }, diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json index 29fc1a75f3..ce7f8514fc 100644 --- a/resources/machines/ultimaker2plus_040.json +++ b/resources/machines/ultimaker2plus_040.json @@ -12,6 +12,10 @@ "variant": "0.4 mm", "overrides": { + "speed_wall": { "inherit_function": "round(speed_print / 1.25, 0)" }, + "speed_wall_x": { "inherit_function": "speed_wall" }, + "speed_wall_0": { "inherit_function": "speed_wall - 10" }, + "speed_topbottom": { "inherit_function": "round(speed_print / 2.25, 0)" }, "machine_nozzle_size": { "default": 0.40 }, "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json index cfcc2ab4f2..a167907d9c 100644 --- a/resources/machines/ultimaker2plus_060.json +++ b/resources/machines/ultimaker2plus_060.json @@ -12,6 +12,10 @@ "variant": "0.6 mm", "overrides": { + "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 0)" }, + "speed_wall_x": { "inherit_function": "speed_wall" }, + "speed_wall_0": { "inherit_function": "speed_wall - 10" }, + "speed_topbottom": { "inherit_function": "round(speed_print / 2, 0)" }, "machine_nozzle_size": { "default": 0.60 }, "machine_nozzle_tip_outer_diameter": { "default": 1.25 }, "coasting_volume": { "default": 1.36 } diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json index 2f2cd2571c..b39da3f46b 100644 --- a/resources/machines/ultimaker2plus_080.json +++ b/resources/machines/ultimaker2plus_080.json @@ -12,6 +12,10 @@ "variant": "0.8 mm", "overrides": { + "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 0)" }, + "speed_wall_x": { "inherit_function": "speed_wall" }, + "speed_wall_0": { "inherit_function": "speed_wall - 10" }, + "speed_topbottom": { "inherit_function": "round(speed_print / 2, 0)" }, "machine_nozzle_size": { "default": 0.80 }, "machine_nozzle_tip_outer_diameter": { "default": 1.35 }, "coasting_volume": { "default": 3.22 }