JSON refactor: inherit_function ==> default for acceleration and jerk (CURA-1443)

This commit is contained in:
Tim Kuipers 2016-05-30 14:42:01 +02:00
parent 4f793d2fc5
commit 6b5e72de72

View File

@ -1331,7 +1331,7 @@
"minimum_value": "0.1", "minimum_value": "0.1",
"minimum_value_warning": "100", "minimum_value_warning": "100",
"maximum_value_warning": "10000", "maximum_value_warning": "10000",
"inherit_function": "acceleration_print if magic_spiralize else 5000", "default": "acceleration_print if magic_spiralize else 5000",
"global_only": true, "global_only": true,
"visible": true, "visible": true,
"enabled": "acceleration_enabled" "enabled": "acceleration_enabled"
@ -1358,7 +1358,7 @@
"minimum_value_warning": "100", "minimum_value_warning": "100",
"maximum_value_warning": "10000", "maximum_value_warning": "10000",
"visible": false, "visible": false,
"inherit_function": "acceleration_layer_0", "default": "acceleration_layer_0",
"global_only": true, "global_only": true,
"enabled": "acceleration_enabled" "enabled": "acceleration_enabled"
}, },
@ -1511,7 +1511,7 @@
"minimum_value": "0.1", "minimum_value": "0.1",
"minimum_value_warning": "5", "minimum_value_warning": "5",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"inherit_function": "jerk_print if magic_spiralize else 30", "default": "jerk_print if magic_spiralize else 30",
"global_only": true, "global_only": true,
"visible": true, "visible": true,
"enabled": "jerk_enabled" "enabled": "jerk_enabled"
@ -1538,7 +1538,7 @@
"minimum_value_warning": "5", "minimum_value_warning": "5",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"visible": false, "visible": false,
"inherit_function": "jerk_layer_0", "default": "jerk_layer_0",
"global_only": true, "global_only": true,
"enabled": "jerk_enabled" "enabled": "jerk_enabled"
} }
@ -2345,7 +2345,7 @@
"minimum_value": "0.1", "minimum_value": "0.1",
"minimum_value_warning": "100", "minimum_value_warning": "100",
"maximum_value_warning": "10000", "maximum_value_warning": "10000",
"inherit_function": "acceleration_print", "default": "acceleration_print",
"global_only": "True", "global_only": "True",
"visible": false, "visible": false,
"enabled": "adhesion_type == \"raft\" and acceleration_enabled", "enabled": "adhesion_type == \"raft\" and acceleration_enabled",
@ -2403,7 +2403,7 @@
"minimum_value": "0.1", "minimum_value": "0.1",
"minimum_value_warning": "5", "minimum_value_warning": "5",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"inherit_function": "jerk_print", "default": "jerk_print",
"global_only": "True", "global_only": "True",
"visible": false, "visible": false,
"enabled": "adhesion_type == \"raft\" and jerk_enabled", "enabled": "adhesion_type == \"raft\" and jerk_enabled",