From 6b5e72de72e33b7c1c259a4d19061682ea3a1dbc Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 30 May 2016 14:42:01 +0200 Subject: [PATCH] JSON refactor: inherit_function ==> default for acceleration and jerk (CURA-1443) --- resources/definitions/fdmprinter.def.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2e11f20b48..06c9c50e20 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1331,7 +1331,7 @@ "minimum_value": "0.1", "minimum_value_warning": "100", "maximum_value_warning": "10000", - "inherit_function": "acceleration_print if magic_spiralize else 5000", + "default": "acceleration_print if magic_spiralize else 5000", "global_only": true, "visible": true, "enabled": "acceleration_enabled" @@ -1358,7 +1358,7 @@ "minimum_value_warning": "100", "maximum_value_warning": "10000", "visible": false, - "inherit_function": "acceleration_layer_0", + "default": "acceleration_layer_0", "global_only": true, "enabled": "acceleration_enabled" }, @@ -1511,7 +1511,7 @@ "minimum_value": "0.1", "minimum_value_warning": "5", "maximum_value_warning": "50", - "inherit_function": "jerk_print if magic_spiralize else 30", + "default": "jerk_print if magic_spiralize else 30", "global_only": true, "visible": true, "enabled": "jerk_enabled" @@ -1538,7 +1538,7 @@ "minimum_value_warning": "5", "maximum_value_warning": "50", "visible": false, - "inherit_function": "jerk_layer_0", + "default": "jerk_layer_0", "global_only": true, "enabled": "jerk_enabled" } @@ -2345,7 +2345,7 @@ "minimum_value": "0.1", "minimum_value_warning": "100", "maximum_value_warning": "10000", - "inherit_function": "acceleration_print", + "default": "acceleration_print", "global_only": "True", "visible": false, "enabled": "adhesion_type == \"raft\" and acceleration_enabled", @@ -2403,7 +2403,7 @@ "minimum_value": "0.1", "minimum_value_warning": "5", "maximum_value_warning": "50", - "inherit_function": "jerk_print", + "default": "jerk_print", "global_only": "True", "visible": false, "enabled": "adhesion_type == \"raft\" and jerk_enabled",