From 2aac62f55b6c0f10e677cb38850308091e90a3ef Mon Sep 17 00:00:00 2001
From: Ghostkeeper <ghost_keeper+github@hotmail.com>
Date: Mon, 22 Feb 2016 14:20:35 +0100
Subject: [PATCH] Remove variant setting overrides from machine settings

These will be implemented by the new profiles.

Contributes to issue CURA-892.
---
 resources/machines/ultimaker2plus_025.json | 10 ----------
 resources/machines/ultimaker2plus_040.json |  5 +----
 resources/machines/ultimaker2plus_060.json | 12 ------------
 resources/machines/ultimaker2plus_080.json | 13 -------------
 4 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json
index b51af3cafc..d4ce8c9b4f 100644
--- a/resources/machines/ultimaker2plus_025.json
+++ b/resources/machines/ultimaker2plus_025.json
@@ -13,16 +13,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 }
     }
diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json
index 1cb7383b18..33afefed12 100644
--- a/resources/machines/ultimaker2plus_040.json
+++ b/resources/machines/ultimaker2plus_040.json
@@ -12,9 +12,6 @@
     "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 }
     }
 }
diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json
index 132fcfff45..4a4c8c8dd1 100644
--- a/resources/machines/ultimaker2plus_060.json
+++ b/resources/machines/ultimaker2plus_060.json
@@ -13,18 +13,6 @@
 
     "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 }
     }
 }
diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json
index 02d5607552..48a0f75d02 100644
--- a/resources/machines/ultimaker2plus_080.json
+++ b/resources/machines/ultimaker2plus_080.json
@@ -13,19 +13,6 @@
 
     "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 }
     }
 }